From cb6d4a3805f4e60de5031381f6eebe14e82db61d Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Mon, 19 Feb 2007 06:28:03 +0000
Subject: EncapPackages: Version Upgrades

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2841 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/bcfg2-0.9.2.ep           |   2 +-
 encap/src/encap-profiles/bcfg2-gamin-0.1.8.ep     |   2 +-
 encap/src/encap-profiles/bcfg2-glib-2.12.9.ep     |   2 +-
 encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep     |   2 +-
 encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep  |   2 +-
 encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep  |   2 +-
 encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep      | 104 ----------------------
 encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep      | 104 ++++++++++++++++++++++
 encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep  |   2 +-
 encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep |  81 -----------------
 encap/src/encap-profiles/bcfg2-pkg-config-0.21.ep |  81 +++++++++++++++++
 encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep   |   2 +-
 encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep   |  95 --------------------
 encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep  |  95 ++++++++++++++++++++
 encap/src/encap-profiles/bcfg2-python-2.4.4.ep    |   2 +-
 encap/src/encap-profiles/bcfg2-readline-5.1.ep    |   2 +-
 16 files changed, 290 insertions(+), 290 deletions(-)
 delete mode 100644 encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
 create mode 100644 encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep
 delete mode 100644 encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
 create mode 100644 encap/src/encap-profiles/bcfg2-pkg-config-0.21.ep
 delete mode 100644 encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
 create mode 100644 encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep

(limited to 'encap')

diff --git a/encap/src/encap-profiles/bcfg2-0.9.2.ep b/encap/src/encap-profiles/bcfg2-0.9.2.ep
index 5808cfd38..aa61bee46 100644
--- a/encap/src/encap-profiles/bcfg2-0.9.2.ep
+++ b/encap/src/encap-profiles/bcfg2-0.9.2.ep
@@ -15,7 +15,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="patch-2.5.9" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-pyopenssl-0.6" />
 <prereq package="bcfg2-elementtree-1.2.6" />
diff --git a/encap/src/encap-profiles/bcfg2-gamin-0.1.8.ep b/encap/src/encap-profiles/bcfg2-gamin-0.1.8.ep
index df6a63ac8..43ae61f18 100644
--- a/encap/src/encap-profiles/bcfg2-gamin-0.1.8.ep
+++ b/encap/src/encap-profiles/bcfg2-gamin-0.1.8.ep
@@ -8,7 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-glib-2.12.9" />
 
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 602d89f9b..c57b9518c 100644
--- a/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep
+++ b/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-libxml2-2.6.27" />
 <prereq package="bcfg2-libxslt-1.1.20" />
diff --git a/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep b/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
index 0abb8668e..f7d14a402 100644
--- a/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
+++ b/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="patch-2.5.9" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep b/encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep
index 34afd5f3e..2e38053b1 100644
--- a/encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep
+++ b/encap/src/encap-profiles/bcfg2-libxml2-2.6.27.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-python-2.4.4" />
 
 <environment
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 c75851f03..80a3a0f2c 100644
--- a/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep
+++ b/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-python-2.4.4" />
 <prereq package="bcfg2-libxml2-2.6.27" />
 
diff --git a/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep b/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
deleted file mode 100644
index 21b934a2b..000000000
--- a/encap/src/encap-profiles/bcfg2-lxml-1.1.1.ep
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-lxml-1.1.1"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.20" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-pyrex-0.9.4.1" />
-<prereq package="bcfg2-libxml2-2.6.27" />
-<prereq package="bcfg2-libxslt-1.1.20" />
-
-<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 -lexslt -L/usr/local/lib/bcfg2/lib/python2.4/site-packages -Wl,-rpath,/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib/python2.4/site-packages -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/lib:/lib"
-PLATFORM_ELSE_IF_MATCH(aix)
-        value="-L/usr/local/lib/bcfg2/lib -lexslt -L/usr/local/lib/bcfg2/lib/python2.4/site-packages -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/lib"
-PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -lexslt -L/usr/local/lib/bcfg2/lib/python2.4/site-packages -R/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/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/lxml/lxml-1.1.1.tgz
-     http://mirror.opensysadmin.com/lxml/lxml-1.1.1.tgz
-     http://codespeak.net/lxml/lxml-1.1.1.tgz"
->
-
-<configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
--I/usr/local/lib/bcfg2/include \
--L/usr/local/lib/bcfg2/lib \
--lexslt \
--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
-make clean
-</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 lxml - A Pythonic binding for the libxml2 and libxslt libraries
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep b/encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep
new file mode 100644
index 000000000..3ae3c2af4
--- /dev/null
+++ b/encap/src/encap-profiles/bcfg2-lxml-1.1.2.ep
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-lxml-1.1.2"
+>
+
+<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" />
+<prereq package="bcfg2-pyrex-0.9.5.1a" />
+<prereq package="bcfg2-libxml2-2.6.27" />
+<prereq package="bcfg2-libxslt-1.1.20" />
+
+<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 -lexslt -L/usr/local/lib/bcfg2/lib/python2.4/site-packages -Wl,-rpath,/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib/python2.4/site-packages -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/lib:/lib"
+PLATFORM_ELSE_IF_MATCH(aix)
+        value="-L/usr/local/lib/bcfg2/lib -lexslt -L/usr/local/lib/bcfg2/lib/python2.4/site-packages -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/lib"
+PLATFORM_ELSE_IF_MATCH(solaris)
+        value="-L/usr/local/lib/bcfg2/lib -lexslt -L/usr/local/lib/bcfg2/lib/python2.4/site-packages -R/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/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/lxml/lxml-1.1.2.tgz
+     http://mirror.opensysadmin.com/lxml/lxml-1.1.2.tgz
+     http://codespeak.net/lxml/lxml-1.1.2.tgz"
+>
+
+<configure>
+/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+-I/usr/local/lib/bcfg2/include \
+-L/usr/local/lib/bcfg2/lib \
+-lexslt \
+-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
+make clean
+</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 lxml - A Pythonic binding for the libxml2 and libxslt libraries
+</encapinfo>
+
+</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep b/encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep
index e4fcebf15..fa57375a2 100644
--- a/encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep
+++ b/encap/src/encap-profiles/bcfg2-openssl-0.9.8d.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 
 <environment
         variable="CC"
diff --git a/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep b/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
deleted file mode 100644
index 728005b63..000000000
--- a/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-pkg-config-0.20"
->
-
-<prereq package="m4-1.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/pkg-config/pkg-config-0.20.tar.gz
-     http://mirror.opensysadmin.com/pkg-config/pkg-config-0.20.tar.gz
-     http://pkgconfig.freedesktop.org/releases/pkg-config-0.20.tar.gz"
->
-
-<configure>
-./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-	--with-pc-path=/usr/local/lib/bcfg2/lib/pkgconfig
-</configure>
-
-</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 pkg-config - application and library compilation helper tool
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-pkg-config-0.21.ep b/encap/src/encap-profiles/bcfg2-pkg-config-0.21.ep
new file mode 100644
index 000000000..e87d3523b
--- /dev/null
+++ b/encap/src/encap-profiles/bcfg2-pkg-config-0.21.ep
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-pkg-config-0.21"
+>
+
+<prereq package="m4-1.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/pkg-config/pkg-config-0.21.tar.gz
+     http://mirror.opensysadmin.com/pkg-config/pkg-config-0.21.tar.gz
+     http://pkgconfig.freedesktop.org/releases/pkg-config-0.21.tar.gz"
+>
+
+<configure>
+./configure \
+	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
+	--with-pc-path=/usr/local/lib/bcfg2/lib/pkgconfig
+</configure>
+
+</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 pkg-config - application and library compilation helper tool
+</encapinfo>
+
+</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
index 9c715b735..a5a993205 100644
--- a/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
+++ b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
@@ -9,7 +9,7 @@
 
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-openssl-0.9.8d" />
 <prereq package="bcfg2-python-2.4.4" />
 
diff --git a/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep b/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
deleted file mode 100644
index d17b934c0..000000000
--- a/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-pyrex-0.9.4.1"
->
-
-<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/pyrex/Pyrex-0.9.4.1.tar.gz
-     http://mirror.opensysadmin.com/pyrex/Pyrex-0.9.4.1.tar.gz
-     http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.4.1.tar.gz"
->
-
-<configure>
-:
-</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
-</clean>
-
-</source>
-
-<prepackage type="set">
-chmod -R o+r lib/bcfg2
-# 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 pyrex - a language for writing python extension modules
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep b/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep
new file mode 100644
index 000000000..61fa558ba
--- /dev/null
+++ b/encap/src/encap-profiles/bcfg2-pyrex-0.9.5.1a.ep
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-pyrex-0.9.5.1a"
+>
+
+<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/pyrex/Pyrex-0.9.5.1a.tar.gz
+     http://mirror.opensysadmin.com/pyrex/Pyrex-0.9.5.1a.tar.gz
+     http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-0.9.5.1a.tar.gz"
+>
+
+<configure>
+:
+</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
+</clean>
+
+</source>
+
+<prepackage type="set">
+chmod -R o+r lib/bcfg2
+# 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 pyrex - a language for writing python extension modules
+</encapinfo>
+
+</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
index 5066f2687..7f450b565 100644
--- a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
@@ -10,7 +10,7 @@
 <prereq package="m4-1.4.4" />
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-gzip-1.2.4b" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 <prereq package="bcfg2-readline-5.1" />
 <prereq package="bcfg2-openssl-0.9.8d" />
 
diff --git a/encap/src/encap-profiles/bcfg2-readline-5.1.ep b/encap/src/encap-profiles/bcfg2-readline-5.1.ep
index 77610e990..7459258c7 100644
--- a/encap/src/encap-profiles/bcfg2-readline-5.1.ep
+++ b/encap/src/encap-profiles/bcfg2-readline-5.1.ep
@@ -8,7 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
-<prereq package="bcfg2-pkg-config-0.20" />
+<prereq package="bcfg2-pkg-config-0.21" />
 
 <environment
         variable="CC"
-- 
cgit v1.2.3-1-g7c22