diff options
author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-08-04 00:31:01 +0000 |
---|---|---|
committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-08-04 00:31:01 +0000 |
commit | 1883f2eb1b3f801e93f8f1064bf4794a31f61594 (patch) | |
tree | f50f9b124c3119c1832c038e74a882415cc49dc0 /encap/tools | |
parent | 902c3519f67eaa7119c02bd78b65bf97f28103be (diff) | |
download | bcfg2-1883f2eb1b3f801e93f8f1064bf4794a31f61594.tar.gz bcfg2-1883f2eb1b3f801e93f8f1064bf4794a31f61594.tar.bz2 bcfg2-1883f2eb1b3f801e93f8f1064bf4794a31f61594.zip |
* Replace ugly, brittle patch to fix paths for the encap packages
to an ugly, hopefully less brittle search-and-replace function
(this also removes the dependancy on GNU patch; patch is also
called from the Server code, but the server should only be run
on GNU/Linux anyway)
* daemontools is still dependant on GNU patch, so moved that to
a non-bcfg2-specific built-time prereq for daemontools.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2039 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'encap/tools')
-rw-r--r-- | encap/tools/daemontools/daemontools-0.76.ep | 2 | ||||
-rw-r--r-- | encap/tools/daemontools/patch-2.5.9.ep | 52 |
2 files changed, 54 insertions, 0 deletions
diff --git a/encap/tools/daemontools/daemontools-0.76.ep b/encap/tools/daemontools/daemontools-0.76.ep index 58ec6988f..86f42bb78 100644 --- a/encap/tools/daemontools/daemontools-0.76.ep +++ b/encap/tools/daemontools/daemontools-0.76.ep @@ -7,6 +7,8 @@ pkgspec="daemontools-0.76" > +<prereq package="patch-2.5.9" /> + <environment variable="CC" value="gcc" diff --git a/encap/tools/daemontools/patch-2.5.9.ep b/encap/tools/daemontools/patch-2.5.9.ep new file mode 100644 index 000000000..3707a4c1f --- /dev/null +++ b/encap/tools/daemontools/patch-2.5.9.ep @@ -0,0 +1,52 @@ +<?xml version="1.0"?> + +<!-- $Id$ --> + +<encap_profile + profile_ver="1.0" + pkgspec="patch-2.5.9" +> + +<environment + variable="CC" + value="gcc" + type="set" +/> + +<environment + variable="PATH" +PLATFORM_IF_MATCH(solaris) + value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:" +PLATFORM_ELSE + value="/usr/local/lib/bcfg2/bin:/usr/local/bin:" +PLATFORM_ENDIF + type="prepend" +/> + +PLATFORM_IF_MATCH(linux) +PLATFORM_ELSE +<environment + variable="MAKE" + value="gmake" + type="set" +/> +PLATFORM_ENDIF + +<source + url="http://www.pobox.com/users/dclark/mirror/patch/patch-2.5.9.tar.gz + ftp://alpha.gnu.org/gnu/diffutils/patch-2.5.9.tar.gz" +> + +</source> + +<prepackage type="set"> +mkdir var 2>/dev/null || exit 0 +mkdir var/encap 2>/dev/null || exit 0 +touch var/encap/${ENCAP_PKGNAME} +</prepackage> + +<encapinfo> +description patch - Apply a diff file to an original +</encapinfo> + +</encap_profile> |