4 files changed, 25 insertions, 18 deletions
diff --git a/encap/Makefile b/encap/Makefile
index ec95085f9..345cd026f 100644
--- a/encap/Makefile
+++ b/encap/Makefile
@@ -17,7 +17,7 @@ ZLIB = bcfg2-zlib-1.2.3
 LIBICONV = bcfg2-libiconv-1.9.2
 GETTEXT = bcfg2-gettext-0.14.5
 PKG-CONFIG = bcfg2-pkg-config-0.20
-PATCH = patch-2.5.9
+PATCH = bcfg2-patch-2.5.9
 OPENSSL = bcfg2-openssl-0.9.8b
 LIBSTDCXX = bcfg2-libstdc++-0.1
 LIBGCC = bcfg2-libgcc-0.1
diff --git a/encap/bcfg2-0.8.2pre10.profile b/encap/bcfg2-0.8.2pre10.profile
index 49c6a5773..673390675 100644
--- a/encap/bcfg2-0.8.2pre10.profile
+++ b/encap/bcfg2-0.8.2pre10.profile
@@ -57,7 +57,7 @@ from_dir="src/sbin"
 />
 
 <patch
-url="http://trac.mcs.anl.gov/projects/bcfg2/browser/trunk/bcfg2/encap/patches/usr-local.diff?rev=1959&amp;format=raw"
+url="http://trac.mcs.anl.gov/projects/bcfg2/browser/trunk/bcfg2/encap/patches/usr-local.diff?rev=1960&amp;format=raw"
 options="-p0"
 />
 
diff --git a/encap/patch-2.5.9.profile b/encap/bcfg2-patch-2.5.9.profile
index e357bd028..b41e3bf14 100644
--- a/encap/patch-2.5.9.profile
+++ b/encap/bcfg2-patch-2.5.9.profile
@@ -4,7 +4,7 @@
 
 <encap_profile
 	profile_ver="1.0"
-	pkgspec="patch-2.5.9"
+	pkgspec="bcfg2-patch-2.5.9"
 >
 
 <environment
@@ -15,7 +15,7 @@
 
 <environment
         variable="PATH"
-        value="/usr/local/bin:"
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
         type="prepend"
 />
 
@@ -28,6 +28,24 @@ PLATFORM_ELSE
 />
 PLATFORM_ENDIF
 
+<environment
+        variable="LDFLAGS"
+PLATFORM_IF_MATCH(linux)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+PLATFORM_ELSE_IF_MATCH(aix)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/li\
+b:/usr/lib"
+PLATFORM_ELSE
+PLATFORM_ENDIF
+        type="set"
+/>
+
+<environment
+        variable="CPPFLAGS"
+        value="-I/usr/local/lib/bcfg2/include"
+        type="set"
+/>
+
 <source
 	url="http://www.pobox.com/users/dclark/mirror/patch-2.5.9.tar.gz
 	     ftp://alpha.gnu.org/gnu/diffutils/patch-2.5.9.tar.gz"
@@ -36,6 +54,8 @@ PLATFORM_ENDIF
 </source>
 
 <prepackage type="set">
+mkdir bin 2>/dev/null || exit 0
+ln -sf ../lib/bcfg2/bin/patch bin/b2patch
 mkdir var 2>/dev/null || exit 0
 mkdir var/encap 2>/dev/null || exit 0
 touch var/encap/${ENCAP_PKGNAME}
diff --git a/encap/patches/usr-local.diff b/encap/patches/usr-local.diff
index 969841d0f..2110ccf6f 100644
--- a/encap/patches/usr-local.diff
+++ b/encap/patches/usr-local.diff
@@ -1,16 +1,3 @@
-Index: encap/bcfg2-0.8.2pre10.profile
-===================================================================
---- encap/bcfg2-0.8.2pre10.profile	(revision 1958)
-+++ encap/bcfg2-0.8.2pre10.profile	(working copy)
-@@ -57,7 +57,7 @@
- />
- 
- <patch
--url="http://trac.mcs.anl.gov/projects/bcfg2/browser/trunk/bcfg2/encap/patches/usr-local.diff?rev=1956&amp;format=raw"
-+url="http://trac.mcs.anl.gov/projects/bcfg2/browser/trunk/bcfg2/encap/patches/usr-local.diff?rev=1959&amp;format=raw"
- options="-p0"
- />
- 
 Index: src/lib/Options.py
 ===================================================================
 --- src/lib/Options.py	(revision 1957)
@@ -33,7 +20,7 @@ Index: src/lib/Server/Plugins/Cfg.py
                  dfile.write(delta.data)
                  dfile.close()
 -                ret = os.system("patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name))
-+                ret = os.system("/usr/local/bin/patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name))
++                ret = os.system("/usr/local/bin/b2patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name))
                  output = open(basefile.name, 'r').read()
                  [os.unlink(fname) for fname in [basefile.name, dfile.name]]
                  if ret >> 8 != 0: