From b1a362970592ef5b1df40dd80bcec0b82a2aec18 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Mon, 17 Jul 2006 01:50:47 +0000
Subject: Adding a dependancy on GNU patch, which is used by encap and bcfg2
 Cfg.py

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1958 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/Makefile                     |  7 ++++--
 encap/bcfg2-0.8.2pre10.profile     |  1 +
 encap/bcfg2-libxml2-2.6.26.profile |  2 ++
 encap/patch-2.5.9.profile          | 48 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 encap/patch-2.5.9.profile

(limited to 'encap')

diff --git a/encap/Makefile b/encap/Makefile
index 6afa7b461..ec95085f9 100644
--- a/encap/Makefile
+++ b/encap/Makefile
@@ -17,6 +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
 OPENSSL = bcfg2-openssl-0.9.8b
 LIBSTDCXX = bcfg2-libstdc++-0.1
 LIBGCC = bcfg2-libgcc-0.1
@@ -87,7 +88,8 @@ ${ZLIB}.e : ${M4}.e
 ${LIBICONV}.e : ${ZLIB}.e
 ${GETTEXT}.e : ${LIBICONV}.e
 ${PKG-CONFIG}.e : ${GETTEXT}.e
-${OPENSSL}.e : ${PKG-CONFIG}.e
+${PATCH}.e : ${PKG-CONFIG}.e
+${OPENSSL}.e : ${PATCH}.e
 ${LIBSTDCXX}.e : ${OPENSSL}.e
 ${LIBGCC}.e : ${LIBSTDCXX}.e
 ${PYTHON}.e : ${LIBGCC}.e
@@ -100,7 +102,8 @@ ${BCFG2}.e : ${LXML}.e
 
 ${LIBICONV}.ep : ${ZLIB}.ep
 ${GETTEXT}.ep : ${LIBICONV}.ep
-${OPENSSL}.ep : ${GETTEXT}.ep
+${PATCH}.ep : ${GETTEXT}.ep
+${OPENSSL}.ep : ${PATCH}.ep
 ${LIBSTDCXX}.ep : ${OPENSSL}.ep
 ${LIBGCC}.ep : ${LIBSTDCXX}.ep
 ${PYTHON}.ep : ${LIBGCC}.ep
diff --git a/encap/bcfg2-0.8.2pre10.profile b/encap/bcfg2-0.8.2pre10.profile
index bc10f39d1..e21c9f27d 100644
--- a/encap/bcfg2-0.8.2pre10.profile
+++ b/encap/bcfg2-0.8.2pre10.profile
@@ -103,6 +103,7 @@ description Bcfg2 - Provides a declarative interface to system configuration
 prereq pkgspec >= bcfg2-zlib-1.2.3
 prereq pkgspec >= bcfg2-libiconv-1.9.2
 prereq pkgspec >= bcfg2-gettext-0.14.5
+prereq pkgspec >= patch-2.5.9
 prereq pkgspec >= bcfg2-openssl-0.9.8b
 prereq pkgspec >= bcfg2-libstdc++-0.1
 prereq pkgspec >= bcfg2-libgcc-0.1
diff --git a/encap/bcfg2-libxml2-2.6.26.profile b/encap/bcfg2-libxml2-2.6.26.profile
index ac8dae36c..9d476292c 100644
--- a/encap/bcfg2-libxml2-2.6.26.profile
+++ b/encap/bcfg2-libxml2-2.6.26.profile
@@ -66,6 +66,8 @@ PLATFORM_ENDIF
 </source>
 
 <prepackage type="set">
+mkdir bin 2>/dev/null || exit 0
+ln -sf ../lib/bcfg2/bin/xmllint bin/b2xmllint
 mkdir var 2>/dev/null || exit 0
 mkdir var/encap 2>/dev/null || exit 0
 touch var/encap/${ENCAP_PKGNAME}
diff --git a/encap/patch-2.5.9.profile b/encap/patch-2.5.9.profile
new file mode 100644
index 000000000..e357bd028
--- /dev/null
+++ b/encap/patch-2.5.9.profile
@@ -0,0 +1,48 @@
+<?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"
+        value="/usr/local/bin:"
+        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-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>
-- 
cgit v1.2.3-1-g7c22