From 3eb10f956a06772aa8722be1abeb014ef2520ccf Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Mon, 25 Jun 2007 01:24:35 +0000
Subject: EncapPackages: ...

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3351 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/bcfg2-0.9.4.ep                      | 4 +---
 encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep             | 4 +---
 encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep          | 4 +---
 encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep          | 4 +---
 encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep | 4 +---
 encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep          | 4 +---
 encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep           | 4 +---
 encap/src/encap-profiles/server/Makefile                     | 2 +-
 encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep        | 3 +--
 encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep      | 4 +---
 10 files changed, 10 insertions(+), 27 deletions(-)

(limited to 'encap/src')

diff --git a/encap/src/encap-profiles/bcfg2-0.9.4.ep b/encap/src/encap-profiles/bcfg2-0.9.4.ep
index a11101a39..2d1a1a04c 100644
--- a/encap/src/encap-profiles/bcfg2-0.9.4.ep
+++ b/encap/src/encap-profiles/bcfg2-0.9.4.ep
@@ -124,9 +124,7 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
 PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
 <clean>
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
index 406d5b37b..297578dd9 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
@@ -82,9 +82,7 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
 PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
diff --git a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
index 4c83e0a2c..7c9479c8e 100644
--- a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
+++ b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
@@ -52,9 +52,7 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
 PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
 <clean>
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
index 7d79159af..18aaff1da 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
@@ -83,9 +83,7 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
 PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
index dbdae2e83..dbe44a3c9 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
@@ -83,9 +83,7 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
 PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
index fb14a30b2..3638b412f 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
@@ -83,9 +83,7 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
 PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
diff --git a/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep b/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
index dd1ffaac3..3678a8dd5 100644
--- a/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
+++ b/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
@@ -83,9 +83,7 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
 PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
 <clean>
diff --git a/encap/src/encap-profiles/server/Makefile b/encap/src/encap-profiles/server/Makefile
index 45344f4f7..35c5cc752 100644
--- a/encap/src/encap-profiles/server/Makefile
+++ b/encap/src/encap-profiles/server/Makefile
@@ -47,7 +47,7 @@ sources := $(BCFG2_CHEETAH_DOC) $(BCFG2_GAMIN) $(BCFG2_GLIB) $(BCFG2_LIBXML2) $(
 
 %.d : %.ep # Create dependancy files from .ep files
 	@printf "***** START .d.ep for |$*| ***** \n"
-	chmod 755 $(EP2TARGET) && $(EP2TARGET) $< > $@
+	$(EP2TARGET) $< > $@
 	@printf "***** STOP .d.ep for |$*| ***** \n"
 
 log :
diff --git a/encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep b/encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep
index 4c62d99f2..0d6f8cfa4 100644
--- a/encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep
+++ b/encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep
@@ -67,8 +67,7 @@ url="http://encapsrcdist/mirror/glib/glib-2.12.12.tar.gz
 
 <configure>
 ./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-	--with-libiconv=gnu
+	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2"
 </configure>
 
 </source>
diff --git a/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep b/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep
index 7a319d0ac..3037e9e5e 100644
--- a/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep
+++ b/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep
@@ -79,9 +79,7 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
 PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
 <clean>
-- 
cgit v1.2.3-1-g7c22