From 835d959fa15cd695f69011a1b0b45363ff1de262 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Thu, 21 Jun 2007 22:35:02 +0000
Subject: EncapPackages: Updating dep versions

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3325 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep | 97 -----------------------
 encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep | 97 +++++++++++++++++++++++
 encap/src/encap-profiles/bcfg2-glib-2.12.9.ep    |  2 +-
 encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep | 98 ------------------------
 encap/src/encap-profiles/bcfg2-libxml2-2.6.29.ep | 98 ++++++++++++++++++++++++
 encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep |  2 +-
 encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep     |  2 +-
 7 files changed, 198 insertions(+), 198 deletions(-)
 delete mode 100644 encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
 create mode 100644 encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
 delete mode 100644 encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep
 create mode 100644 encap/src/encap-profiles/bcfg2-libxml2-2.6.29.ep

(limited to 'encap')

diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
deleted file mode 100644
index 6c8fa0a36..000000000
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-cheetah-2.0rc7"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.4" />
-
-<environment
-        variable="CC"
-        value="gcc -static-libgcc"
-        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
-
-<environment
-        variable="LDFLAGS"
-PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
-PLATFORM_ELSE_IF_MATCH(aix)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE
-PLATFORM_ENDIF
-        type="set"
-/>
-
-<environment
-        variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include"
-        type="set"
-/>
-
-<source
-url="http://encapsrcdist/mirror/cheetah/Cheetah-2.0rc7.tar.gz
-http://mirror.opensysadmin.com/cheetah/Cheetah-2.0rc7.tar.gz
-http://umn.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-2.0rc7.tar.gz"
->
-
-<configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
--I/usr/local/lib/bcfg2/include \
--L/usr/local/lib/bcfg2/lib \
--L/usr/local/lib/bcfg2/lib/python2.4/site-packages
-</configure>
-
-<build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-/usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install> 
-
-<clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean --all
-</clean>
-
-</source>
-
-<prepackage type="set">
-# Make "this encap is installed" sentinal file available in /usr/local/var/encap
-test -d var || mkdir var
-test -d var/encap || mkdir var/encap
-touch var/encap/${ENCAP_PKGNAME}
-</prepackage>
-
-<encapinfo>
-description cheetah - the python-powered template engine
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
new file mode 100644
index 000000000..3f54018c2
--- /dev/null
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-cheetah-2.0rc8"
+>
+
+<prereq package="m4-1.4.4" />
+<prereq package="bcfg2-python-2.4.4" />
+
+<environment
+        variable="CC"
+        value="gcc -static-libgcc"
+        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
+
+<environment
+        variable="LDFLAGS"
+PLATFORM_IF_MATCH(linux)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
+PLATFORM_ELSE_IF_MATCH(aix)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE_IF_MATCH(solaris)
+        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE
+PLATFORM_ENDIF
+        type="set"
+/>
+
+<environment
+        variable="CPPFLAGS"
+        value="-I/usr/local/lib/bcfg2/include"
+        type="set"
+/>
+
+<source
+url="http://encapsrcdist/mirror/cheetah/Cheetah-2.0rc8.tar.gz
+http://mirror.opensysadmin.com/cheetah/Cheetah-2.0rc8.tar.gz
+http://umn.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-2.0rc8.tar.gz"
+>
+
+<configure>
+/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+-I/usr/local/lib/bcfg2/include \
+-L/usr/local/lib/bcfg2/lib \
+-L/usr/local/lib/bcfg2/lib/python2.4/site-packages
+</configure>
+
+<build>
+/usr/local/lib/bcfg2/bin/python setup.py build \
+--build-base=${builddir}/build
+</build>
+
+<install>
+/usr/local/lib/bcfg2/bin/python setup.py install \
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
+</install> 
+
+<clean>
+/usr/local/lib/bcfg2/bin/python setup.py clean --all
+</clean>
+
+</source>
+
+<prepackage type="set">
+# Make "this encap is installed" sentinal file available in /usr/local/var/encap
+test -d var || mkdir var
+test -d var/encap || mkdir var/encap
+touch var/encap/${ENCAP_PKGNAME}
+</prepackage>
+
+<encapinfo>
+description cheetah - the python-powered template engine
+</encapinfo>
+
+</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep b/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep
index 85c2c9330..4585ed687 100644
--- a/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep
+++ b/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep
@@ -11,7 +11,7 @@
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-libxml2-2.6.27" />
+<prereq package="bcfg2-libxml2-2.6.29" />
 <prereq package="bcfg2-libxslt-1.1.20" />
 
 <environment
diff --git a/encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep b/encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep
deleted file mode 100644
index 2e38053b1..000000000
--- a/encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-libxml2-2.6.27"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.21" />
-<prereq package="bcfg2-python-2.4.4" />
-
-<environment
-        variable="CC"
-        value="gcc -static-libgcc"
-        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
-
-<environment
-        variable="LDFLAGS"
-PLATFORM_IF_MATCH(linux)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
-PLATFORM_ELSE_IF_MATCH(aix)
-        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
-PLATFORM_ELSE
-PLATFORM_ENDIF
-        type="set"
-/>
-
-<environment
-        variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include"
-        type="set"
-/>
-
-<source
-url="http://encapsrcdist/mirror/libxml2/libxml2-sources-2.6.27.tar.gz
-     http://mirror.opensysadmin.com/libxml2/libxml2-sources-2.6.27.tar.gz
-     ftp://xmlsoft.org/libxml2/libxml2-sources-2.6.27.tar.gz"
-subdir="libxml2-2.6.27"
->
-
-<configure>
-./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-	--without-iconv \
-PLATFORM_IF_MATCH(aix)
-PLATFORM_ELSE
-	--enable-shared \
-PLATFORM_ENDIF
-	--enable-ipv6=no \
-	--with-python=/usr/local/lib/bcfg2 \
-	--with-zlib=/usr/local/lib/bcfg2
-</configure>
-
-</source>
-
-<prepackage type="set">
-# Remove doc - it's big  # not any more, since it's server-only
-#if [ -d lib/bcfg2/share/doc ]; then rm -rf lib/bcfg2/share/doc; fi
-#if [ -d lib/bcfg2/share/gtk-doc ]; then rm -rf lib/bcfg2/share/gtk-doc; fi
-# Make convieniance links
-test -d bin || mkdir bin
-ln -sf ../lib/bcfg2/bin/xmllint bin/b2-xmllint
-# Make "this encap is installed" sentinal file available in /usr/local/var/encap
-test -d var || mkdir var
-test -d var/encap || mkdir var/encap
-touch var/encap/${ENCAP_PKGNAME}
-</prepackage>
-
-<encapinfo>
-description libxml2 - XML C library for the Gnome project
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-libxml2-2.6.29.ep b/encap/src/encap-profiles/bcfg2-libxml2-2.6.29.ep
new file mode 100644
index 000000000..65e138f5c
--- /dev/null
+++ b/encap/src/encap-profiles/bcfg2-libxml2-2.6.29.ep
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-libxml2-2.6.29"
+>
+
+<prereq package="m4-1.4.4" />
+<prereq package="bcfg2-zlib-1.2.3" />
+<prereq package="bcfg2-pkg-config-0.21" />
+<prereq package="bcfg2-python-2.4.4" />
+
+<environment
+        variable="CC"
+        value="gcc -static-libgcc"
+        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
+
+<environment
+        variable="LDFLAGS"
+PLATFORM_IF_MATCH(linux)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib:/lib"
+PLATFORM_ELSE_IF_MATCH(aix)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE_IF_MATCH(solaris)
+        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE
+PLATFORM_ENDIF
+        type="set"
+/>
+
+<environment
+        variable="CPPFLAGS"
+        value="-I/usr/local/lib/bcfg2/include"
+        type="set"
+/>
+
+<source
+url="http://encapsrcdist/mirror/libxml2/libxml2-sources-2.6.29.tar.gz
+     http://mirror.opensysadmin.com/libxml2/libxml2-sources-2.6.29.tar.gz
+     ftp://xmlsoft.org/libxml2/libxml2-sources-2.6.29.tar.gz"
+subdir="libxml2-2.6.29"
+>
+
+<configure>
+./configure \
+	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
+	--without-iconv \
+PLATFORM_IF_MATCH(aix)
+PLATFORM_ELSE
+	--enable-shared \
+PLATFORM_ENDIF
+	--enable-ipv6=no \
+	--with-python=/usr/local/lib/bcfg2 \
+	--with-zlib=/usr/local/lib/bcfg2
+</configure>
+
+</source>
+
+<prepackage type="set">
+# Remove doc - it's big  # not any more, since it's server-only
+#if [ -d lib/bcfg2/share/doc ]; then rm -rf lib/bcfg2/share/doc; fi
+#if [ -d lib/bcfg2/share/gtk-doc ]; then rm -rf lib/bcfg2/share/gtk-doc; fi
+# Make convieniance links
+test -d bin || mkdir bin
+ln -sf ../lib/bcfg2/bin/xmllint bin/b2-xmllint
+# Make "this encap is installed" sentinal file available in /usr/local/var/encap
+test -d var || mkdir var
+test -d var/encap || mkdir var/encap
+touch var/encap/${ENCAP_PKGNAME}
+</prepackage>
+
+<encapinfo>
+description libxml2 - XML C library for the Gnome project
+</encapinfo>
+
+</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep b/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep
index bff46e550..4f8ff480d 100644
--- a/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep
+++ b/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep
@@ -11,7 +11,7 @@
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-libxml2-2.6.27" />
+<prereq package="bcfg2-libxml2-2.6.29" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep b/encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep
index 3ae3c2af4..173b3e4fb 100644
--- a/encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep
+++ b/encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep
@@ -12,7 +12,7 @@
 <prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-pyrex-0.9.5.1a" />
-<prereq package="bcfg2-libxml2-2.6.27" />
+<prereq package="bcfg2-libxml2-2.6.29" />
 <prereq package="bcfg2-libxslt-1.1.20" />
 
 <environment
-- 
cgit v1.2.3-1-g7c22