EncapPackages: Restructuring directory layout

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2102 ce84e21b-d406-0410-9b95-82705330c041

35 files changed, 1 insertions, 468 deletions

diff --git a/encap/tools/bcfg2-client/bcfg2-0.8.2.ep b/encap/src/encap-profiles/bcfg2-0.8.2.ep
index cb8b99ecf..cb8b99ecf 100644
--- a/encap/tools/bcfg2-client/bcfg2-0.8.2.ep
+++ b/encap/src/encap-profiles/bcfg2-0.8.2.ep
diff --git a/encap/tools/bcfg2-server/bcfg2-cheetah-2.0rc7.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
index ba77108f3..ba77108f3 100644
--- a/encap/tools/bcfg2-server/bcfg2-cheetah-2.0rc7.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc7.ep
diff --git a/encap/tools/bcfg2-server/bcfg2-cheetah-doc-0.9.16a1.ep b/encap/src/encap-profiles/bcfg2-cheetah-doc-0.9.16a1.ep
index 023e0bf21..023e0bf21 100644
--- a/encap/tools/bcfg2-server/bcfg2-cheetah-doc-0.9.16a1.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-doc-0.9.16a1.ep
diff --git a/encap/tools/bcfg2-server/bcfg2-gamin-0.1.7.ep b/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
index db2c2037d..db2c2037d 100644
--- a/encap/tools/bcfg2-server/bcfg2-gamin-0.1.7.ep
+++ b/encap/src/encap-profiles/bcfg2-gamin-0.1.7.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-gettext-0.14.5.ep b/encap/src/encap-profiles/bcfg2-gettext-0.14.5.ep
index eaf6b01e1..eaf6b01e1 100644
--- a/encap/tools/bcfg2-client/bcfg2-gettext-0.14.5.ep
+++ b/encap/src/encap-profiles/bcfg2-gettext-0.14.5.ep
diff --git a/encap/tools/bcfg2-server/bcfg2-glib-2.8.6.ep b/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
index 3c0103706..3c0103706 100644
--- a/encap/tools/bcfg2-server/bcfg2-glib-2.8.6.ep
+++ b/encap/src/encap-profiles/bcfg2-glib-2.8.6.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-libgcc-0.1.sh b/encap/src/encap-profiles/bcfg2-libgcc-0.1.sh
index d6de6c471..d6de6c471 100755
--- a/encap/tools/bcfg2-client/bcfg2-libgcc-0.1.sh
+++ b/encap/src/encap-profiles/bcfg2-libgcc-0.1.sh
diff --git a/encap/tools/bcfg2-client/bcfg2-libiconv-1.9.2.ep b/encap/src/encap-profiles/bcfg2-libiconv-1.9.2.ep
index b25f7090b..b25f7090b 100644
--- a/encap/tools/bcfg2-client/bcfg2-libiconv-1.9.2.ep
+++ b/encap/src/encap-profiles/bcfg2-libiconv-1.9.2.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-libstdc++-0.1.sh b/encap/src/encap-profiles/bcfg2-libstdc++-0.1.sh
index 6b3fe4a98..6b3fe4a98 100755
--- a/encap/tools/bcfg2-client/bcfg2-libstdc++-0.1.sh
+++ b/encap/src/encap-profiles/bcfg2-libstdc++-0.1.sh
diff --git a/encap/tools/bcfg2-client/bcfg2-libxml2-2.6.26.ep b/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
index 318f90787..318f90787 100644
--- a/encap/tools/bcfg2-client/bcfg2-libxml2-2.6.26.ep
+++ b/encap/src/encap-profiles/bcfg2-libxml2-2.6.26.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-libxslt-1.1.17.ep b/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
index 8845c4a4f..8845c4a4f 100644
--- a/encap/tools/bcfg2-client/bcfg2-libxslt-1.1.17.ep
+++ b/encap/src/encap-profiles/bcfg2-libxslt-1.1.17.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-lxml-1.0.1.ep b/encap/src/encap-profiles/bcfg2-lxml-1.0.1.ep
index aa8e009e1..aa8e009e1 100644
--- a/encap/tools/bcfg2-client/bcfg2-lxml-1.0.1.ep
+++ b/encap/src/encap-profiles/bcfg2-lxml-1.0.1.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-openssl-0.9.8b.ep b/encap/src/encap-profiles/bcfg2-openssl-0.9.8b.ep
index 2fa76160b..2fa76160b 100644
--- a/encap/tools/bcfg2-client/bcfg2-openssl-0.9.8b.ep
+++ b/encap/src/encap-profiles/bcfg2-openssl-0.9.8b.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-pkg-config-0.20.ep b/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
index 62db17661..62db17661 100644
--- a/encap/tools/bcfg2-client/bcfg2-pkg-config-0.20.ep
+++ b/encap/src/encap-profiles/bcfg2-pkg-config-0.20.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-pyopenssl-0.6.ep b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
index 7f9fa97f6..7f9fa97f6 100644
--- a/encap/tools/bcfg2-client/bcfg2-pyopenssl-0.6.ep
+++ b/encap/src/encap-profiles/bcfg2-pyopenssl-0.6.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-pyrex-0.9.4.1.ep b/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
index 8fcc80449..8fcc80449 100644
--- a/encap/tools/bcfg2-client/bcfg2-pyrex-0.9.4.1.ep
+++ b/encap/src/encap-profiles/bcfg2-pyrex-0.9.4.1.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-python-2.4.3.ep b/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
index f62184a08..f62184a08 100644
--- a/encap/tools/bcfg2-client/bcfg2-python-2.4.3.ep
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
diff --git a/encap/tools/bcfg2-python-apt/bcfg2-python-apt-0.5.10.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
index 57ce35310..57ce35310 100644
--- a/encap/tools/bcfg2-python-apt/bcfg2-python-apt-0.5.10.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
diff --git a/encap/tools/bcfg2-python-apt/bcfg2-python-apt-0.6.16.2ubuntu8.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
index 4a2f11428..4336827ae 100644
--- a/encap/tools/bcfg2-python-apt/bcfg2-python-apt-0.6.16.2ubuntu8.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!-- $Id:$ -->
+<!-- $Id$ -->
 
 <encap_profile
 	profile_ver="1.0"
diff --git a/encap/tools/bcfg2-python-apt/bcfg2-python-apt-0.6.19.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
index 448d04351..448d04351 100644
--- a/encap/tools/bcfg2-python-apt/bcfg2-python-apt-0.6.19.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
diff --git a/encap/tools/bcfg2-client/bcfg2-zlib-1.2.3.ep b/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
index cba36bfb3..cba36bfb3 100644
--- a/encap/tools/bcfg2-client/bcfg2-zlib-1.2.3.ep
+++ b/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
diff --git a/encap/tools/daemontools/daemontools-0.76.ep b/encap/src/encap-profiles/daemontools-0.76.ep
index c09b67a72..c09b67a72 100644
--- a/encap/tools/daemontools/daemontools-0.76.ep
+++ b/encap/src/encap-profiles/daemontools-0.76.ep
diff --git a/encap/tools/daemontools/daemontools-doc-20060731.ep b/encap/src/encap-profiles/daemontools-doc-20060731.ep
index dee918647..dee918647 100644
--- a/encap/tools/daemontools/daemontools-doc-20060731.ep
+++ b/encap/src/encap-profiles/daemontools-doc-20060731.ep
diff --git a/encap/tools/bcfg2-client/m4-1.4.4.sh b/encap/src/encap-profiles/m4-1.4.4.sh
index b424007eb..b424007eb 100755
--- a/encap/tools/bcfg2-client/m4-1.4.4.sh
+++ b/encap/src/encap-profiles/m4-1.4.4.sh
diff --git a/encap/tools/makeself/makeself-2.1.4.ep b/encap/src/encap-profiles/makeself-2.1.4.ep
index 8e8c5f2b5..8e8c5f2b5 100644
--- a/encap/tools/makeself/makeself-2.1.4.ep
+++ b/encap/src/encap-profiles/makeself-2.1.4.ep
diff --git a/encap/tools/ostiary/ostiary-3.4.ep b/encap/src/encap-profiles/ostiary-3.4.ep
index be0c4fbdb..be0c4fbdb 100644
--- a/encap/tools/ostiary/ostiary-3.4.ep
+++ b/encap/src/encap-profiles/ostiary-3.4.ep
diff --git a/encap/tools/ostiary/ostiary-doc-20060801.ep b/encap/src/encap-profiles/ostiary-doc-20060801.ep
index 3b0251f2e..3b0251f2e 100644
--- a/encap/tools/ostiary/ostiary-doc-20060801.ep
+++ b/encap/src/encap-profiles/ostiary-doc-20060801.ep
diff --git a/encap/tools/daemontools/patch-2.5.9.ep b/encap/src/encap-profiles/patch-2.5.9.ep
index c6e2f6b69..c6e2f6b69 100644
--- a/encap/tools/daemontools/patch-2.5.9.ep
+++ b/encap/src/encap-profiles/patch-2.5.9.ep
diff --git a/encap/tools/bcfg2-client/Makefile b/encap/tools/bcfg2-client/Makefile
deleted file mode 100644
index 45de670d0..000000000
--- a/encap/tools/bcfg2-client/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id$
-
-.PHONY : all install clean uninstall encaps rename bcfg2only
-.SUFFIXES : 
-.SUFFIXES : .ep .sh .installed .packaged
-
-BASEDIR = /usr/local
-ENCAPDIR = ${BASEDIR}/encap
-export ENCAPDIR
-EPKG = ${BASEDIR}/bin/epkg
-export EPKG
-MKENCAP = ${BASEDIR}/bin/mkencap
-export MKENCAP
-
-M4 = m4-1.4.4
-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
-OPENSSL = bcfg2-openssl-0.9.8b
-LIBSTDCXX = bcfg2-libstdc++-0.1
-LIBGCC = bcfg2-libgcc-0.1
-PYTHON = bcfg2-python-2.4.3
-PYREX = bcfg2-pyrex-0.9.4.1
-PYOPENSSL = bcfg2-pyopenssl-0.6
-LIBXML2 = bcfg2-libxml2-2.6.26
-LIBXSLT = bcfg2-libxslt-1.1.17
-LXML = bcfg2-lxml-1.0.1
-BCFG2 = bcfg2-0.8.2
-
-.ep.installed : # Clean, compile and install an encap package
-	@printf "***** START .ep.installed for |$*| ***** \n"
-	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
-	( rm -rf ${ENCAPDIR}/$* || true )
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.ep || true ) > $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.ep || true ) >> $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.ep ) >> $*.log 2>&1
-	${EPKG} -q -i ${ENCAPDIR}/$*
-	test -h ${BASEDIR}/var/encap/$*
-	touch $*.installed
-	@printf "***** STOP .ep.installed for |$*| ***** \n"
-
-.sh.installed : # Create and install a "fake" encap package
-	@printf "***** START .sh.installed for |$*| ***** \n"
-	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
-	( rm -rf ${ENCAPDIR}/$* || true )
-	chmod 755 ./$*.sh
-	./$*.sh
-	${EPKG} -q -i ${ENCAPDIR}/$*
-	test -h ${BASEDIR}/var/encap/$*
-	touch $*.installed
-	@printf "***** STOP .sh.installed for |$*| ***** \n"
-
-.installed.packaged : # Create .tar.gz encap packages for distribution
-	@printf "***** START .installed.packaged for |$*| ***** \n"
-	( rm ${ENCAPDIR}/$*-*.tar.gz || true )
-	( cd ${ENCAPDIR} && ${MKENCAP} -e $* || true )
-	cd ${ENCAPDIR} && ${MKENCAP} -c $*
-	mv ${ENCAPDIR}/$*-encap-*.tar.gz .
-	touch $*.packaged
-	@printf "***** STOP .installed.packaged for |$*| ***** \n"
-
-all :
-	( $(MAKE) install > make.log 2>&1 && $(MAKE) encaps >> make.log 2>&1 ) &
-
-install : ${EPKG} ${MKENCAP} ${BCFG2}.installed
-
-encaps : ${EPKG} ${MKENCAP} ${BCFG2}.packaged
-
-rename : encaps
-	test "$${OS}x" != "x"
-	for EARCHIVE in `ls *-encap-*.tar.gz`; do \
-		mv $${EARCHIVE} `printf $${EARCHIVE} | awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' | sed s:\ :-:g | sed s:OSDIST:\$${OS}:g` ; \
-	done
-
-clean : 
-	( rm *.log || true )
-	( rm *.packaged || true )
-	( rm *.gz || true )
-	( rm *~ || true )
-
-uninstall : clean
-	( rm *.installed || true )
-	( ${EPKG} -q -r ${ENCAPDIR}/bcfg2-* || true )
-	( rm -rf ${ENCAPDIR}/bcfg2-* || true )
-	( rm -rf ${BASEDIR}/lib/bcfg2 || true )
-
-bcfg2only :
-	$(MAKE) -t; sleep 2; touch $(BCFG2).ep; $(MAKE)
-
-${ZLIB}.installed : ${M4}.installed
-${LIBICONV}.installed : ${ZLIB}.installed
-${GETTEXT}.installed : ${LIBICONV}.installed
-${PKG-CONFIG}.installed : ${GETTEXT}.installed
-${OPENSSL}.installed : ${PKG-CONFIG}.installed
-${LIBSTDCXX}.installed : ${OPENSSL}.installed
-${LIBGCC}.installed : ${LIBSTDCXX}.installed
-${PYTHON}.installed : ${LIBGCC}.installed
-${PYREX}.installed : ${PYTHON}.installed
-${PYOPENSSL}.installed : ${PYREX}.installed
-${LIBXML2}.installed : ${PYOPENSSL}.installed	
-${LIBXSLT}.installed : ${LIBXML2}.installed
-${LXML}.installed : ${LIBXSLT}.installed
-${BCFG2}.installed : ${LXML}.installed
-
-${LIBICONV}.packaged : ${ZLIB}.packaged
-${GETTEXT}.packaged : ${LIBICONV}.packaged
-${OPENSSL}.packaged : ${GETTEXT}.packaged
-${LIBSTDCXX}.packaged : ${OPENSSL}.packaged
-${LIBGCC}.packaged : ${LIBSTDCXX}.packaged
-${PYTHON}.packaged : ${LIBGCC}.packaged
-${PYOPENSSL}.packaged : ${PYTHON}.packaged
-${LIBXML2}.packaged : ${PYOPENSSL}.packaged
-${LIBXSLT}.packaged : ${LIBXML2}.packaged
-${LXML}.packaged : ${LIBXSLT}.packaged
-${BCFG2}.packaged : ${LXML}.packaged
diff --git a/encap/tools/bcfg2-python-apt/Makefile b/encap/tools/bcfg2-python-apt/Makefile
deleted file mode 100644
index 2fa3a66d6..000000000
--- a/encap/tools/bcfg2-python-apt/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id$
-
-.PHONY : all install clean uninstall encaps rename
-.SUFFIXES : 
-.SUFFIXES : .ep .installed .packaged
-
-BASEDIR = /usr/local
-ENCAPDIR = ${BASEDIR}/encap
-export ENCAPDIR
-EPKG = ${BASEDIR}/bin/epkg
-export EPKG
-MKENCAP = ${BASEDIR}/bin/mkencap
-export MKENCAP
-
-DISTRO := $(shell cat /etc/issue | head -1)
-
-ifeq ($(DISTRO),Debian GNU/Linux 3.1 \n \l)
-PYTHON-APT = bcfg2-python-apt-0.5.10
-endif
-
-ifeq ($(DISTRO),Debian GNU/Linux testing/unstable \n \l)
-PYTHON-APT = bcfg2-python-apt-0.6.19
-endif
-
-ifeq ($(DISTRO),Ubuntu 6.06.1 LTS \n \l)
-PYTHON-APT = bcfg2-python-apt-0.6.16.2ubuntu8
-endif
-
-.ep.installed : # Clean, compile and install an encap package
-	@printf "***** START .ep.installed for |$*| ***** \n"
-	( apt-get install libapt-pkg-dev || true )
-	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
-	( rm -rf ${ENCAPDIR}/$* || true )
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.ep || true ) > $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.ep || true ) >> $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.ep ) >> $*.log 2>&1
-	${EPKG} -q -i ${ENCAPDIR}/$*
-	test -h ${BASEDIR}/var/encap/$*
-	touch $*.installed
-	@printf "***** STOP .ep.installed for |$*| ***** \n"
-
-.installed.packaged : # Create .tar.gz encap packages for distribution
-	@printf "***** START .installed.packaged for |$*| ***** \n"
-	( rm ${ENCAPDIR}/$*-*.tar.gz || true )
-	( cd ${ENCAPDIR} && ${MKENCAP} -e $* || true )
-	cd ${ENCAPDIR} && ${MKENCAP} -c $*
-	mv ${ENCAPDIR}/$*-encap-*.tar.gz .
-	touch $*.packaged
-	@printf "***** STOP .installed.packaged for |$*| ***** \n"
-
-all :
-	( $(MAKE) install > make.log 2>&1 && $(MAKE) encaps >> make.log 2>&1 ) &
-
-install : ${EPKG} ${MKENCAP} ${PYTHON-APT}.installed
-
-encaps : ${EPKG} ${MKENCAP} ${PYTHON-APT}.packaged
-
-rename : encaps
-	test "$${OS}x" != "x"
-	for EARCHIVE in `ls *-encap-*.tar.gz`; do \
-		mv $${EARCHIVE} `printf $${EARCHIVE} | awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' | sed s:\ :-:g | sed s:OSDIST:\$${OS}:g` ; \
-	done
-
-clean : 
-	( rm *.log || true )
-	( rm *.packaged || true )
-	( rm *.gz || true )
-	( rm *~ || true )
-
-uninstall : clean
-	( rm *.installed || true )
-	( ${EPKG} -q -r ${ENCAPDIR}/bcfg2-python-apt* || true )
-	( rm -rf ${ENCAPDIR}/bcfg2-python-apt* || true )
diff --git a/encap/tools/bcfg2-python-apt/README b/encap/tools/bcfg2-python-apt/README
deleted file mode 100644
index d95e472f2..000000000
--- a/encap/tools/bcfg2-python-apt/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Before building this, make sure that you have these libraries installed:
- * /usr/lib/libapt-pkg* (Part of the "apt" package on Debian)
- * /usr/lib/libapt-inst* (Part of the "apt-utils" package on Debian)
-
-You also must have the "libapt-pkg-dev" package installed.
-
-To see if your Debian variant is supported, do "grep ifeq Makefile" and see if
-any of those strings match "cat /etc/issue".
-
-It should be pretty trivial to add new Debian platforms; if you have any
-issues, mail the bcfg2-dev list or open a ticket.
diff --git a/encap/tools/bcfg2-server/Makefile b/encap/tools/bcfg2-server/Makefile
deleted file mode 100644
index 454897400..000000000
--- a/encap/tools/bcfg2-server/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id$
-
-.PHONY : all install clean uninstall encaps rename
-.SUFFIXES : 
-.SUFFIXES : .ep .installed .packaged
-
-BASEDIR = /usr/local
-ENCAPDIR = ${BASEDIR}/encap
-export ENCAPDIR
-EPKG = ${BASEDIR}/bin/epkg
-export EPKG
-MKENCAP = ${BASEDIR}/bin/mkencap
-export MKENCAP
-
-GLIB = bcfg2-glib-2.8.6
-GAMIN = bcfg2-gamin-0.1.7
-CHEETAH = bcfg2-cheetah-2.0rc7
-CHEETAH-DOC = bcfg2-cheetah-doc-0.9.16a1
-
-.ep.installed : # Clean, compile and install an encap package
-	@printf "***** START .ep.installed for |$*| ***** \n"
-	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
-	( rm -rf ${ENCAPDIR}/$* || true )
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.ep || true ) > $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.ep || true ) >> $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.ep ) >> $*.log 2>&1
-	${EPKG} -q -i ${ENCAPDIR}/$*
-	test -h ${BASEDIR}/var/encap/$*
-	touch $*.installed
-	@printf "***** STOP .ep.installed for |$*| ***** \n"
-
-.installed.packaged : # Create .tar.gz encap packages for distribution
-	@printf "***** START .installed.packaged for |$*| ***** \n"
-	( rm ${ENCAPDIR}/$*-*.tar.gz || true )
-	( cd ${ENCAPDIR} && ${MKENCAP} -e $* || true )
-	cd ${ENCAPDIR} && ${MKENCAP} -c $*
-	mv ${ENCAPDIR}/$*-encap-*.tar.gz .
-	touch $*.packaged
-	@printf "***** STOP .installed.packaged for |$*| ***** \n"
-
-all :
-	( $(MAKE) install > make.log 2>&1 && $(MAKE) encaps >> make.log 2>&1 ) &
-
-install : ${EPKG} ${MKENCAP} ${CHEETAH-DOC}.installed
-
-encaps : ${EPKG} ${MKENCAP} ${CHEETAH-DOC}.packaged
-
-rename : encaps
-	test "$${OS}x" != "x"
-	for EARCHIVE in `ls *-encap-*.tar.gz`; do \
-		mv $${EARCHIVE} `printf $${EARCHIVE} | awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' | sed s:\ :-:g | sed s:OSDIST:\$${OS}:g` ; \
-	done
-
-clean : 
-	( rm *.log || true )
-	( rm *.packaged || true )
-	( rm *.gz || true )
-	( rm *~ || true )
-
-uninstall : clean
-	( rm *.installed || true )
-	( ${EPKG} -q -r ${ENCAPDIR}/bcfg2-glib* || true )
-	( rm -rf ${ENCAPDIR}/bcfg2-glib* || true )
-	( ${EPKG} -q -r ${ENCAPDIR}/bcfg2-gamin* || true )
-	( rm -rf ${ENCAPDIR}/bcfg2-gamin* || true )
-	( ${EPKG} -q -r ${ENCAPDIR}/bcfg2-cheetah* || true )
-	( rm -rf ${ENCAPDIR}/bcfg2-cheetah* || true )
-    
-${GAMIN}.installed : ${GLIB}.installed
-${CHEETAH}.installed : ${GAMIN}.installed
-${CHEETAH-DOC}.installed : ${CHEETAH}.installed
-
-${GAMIN}.packaged : ${GLIB}.packaged
-${CHEETAH}.packaged : ${GAMIN}.packaged
-${CHEETAH-DOC}.packaged : ${CHEETAH}.packaged
diff --git a/encap/tools/daemontools/Makefile b/encap/tools/daemontools/Makefile
deleted file mode 100644
index b477f2ba6..000000000
--- a/encap/tools/daemontools/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id:$
-
-.PHONY : all install clean uninstall encaps rename
-.SUFFIXES : 
-.SUFFIXES : .ep .installed .packaged
-
-BASEDIR = /usr/local
-ENCAPDIR = ${BASEDIR}/encap
-export ENCAPDIR
-EPKG = ${BASEDIR}/bin/epkg
-export EPKG
-MKENCAP = ${BASEDIR}/bin/mkencap
-export MKENCAP
-
-PATCH = patch-2.5.9
-DAEMONTOOLS = daemontools-0.76
-DAEMONTOOLS-DOC = daemontools-doc-20060731
-
-.ep.installed : # Clean, compile and install an encap package
-	@printf "***** START .ep.installed for |$*| ***** \n"
-	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
-	( rm -rf ${ENCAPDIR}/$* || true )
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.ep || true ) > $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.ep || true ) >> $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.ep ) >> $*.log 2>&1
-	${EPKG} -q -i ${ENCAPDIR}/$*
-	test -h ${BASEDIR}/var/encap/$*
-	touch $*.installed
-	@printf "***** STOP .ep.installed for |$*| ***** \n"
-
-.installed.packaged : # Create .tar.gz encap packages for distribution
-	@printf "***** START .installed.packaged for |$*| ***** \n"
-	( rm ${ENCAPDIR}/$*-*.tar.gz || true )
-	( cd ${ENCAPDIR} && ${MKENCAP} -e $* || true )
-	cd ${ENCAPDIR} && ${MKENCAP} -c $*
-	mv ${ENCAPDIR}/$*-encap-*.tar.gz .
-	touch $*.packaged
-	@printf "***** STOP .installed.packaged for |$*| ***** \n"
-
-all :
-	( $(MAKE) install > make.log 2>&1 && $(MAKE) encaps >> make.log 2>&1 ) &
-
-install : ${EPKG} ${MKENCAP} ${DAEMONTOOLS-DOC}.installed
-
-encaps : ${EPKG} ${MKENCAP} ${DAEMONTOOLS-DOC}.packaged
-
-rename : encaps
-	test "$${OS}x" != "x"
-	for EARCHIVE in `ls *-encap-*.tar.gz`; do \
-		mv $${EARCHIVE} `printf $${EARCHIVE} | awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' | sed s:\ :-:g | sed s:OSDIST:\$${OS}:g` ; \
-	done
-
-clean : 
-	( rm *.log || true )
-	( rm *.packaged || true )
-	( rm *.gz || true )
-	( rm *~ || true )
-
-uninstall : clean
-	( rm *.installed || true )
-	( ${EPKG} -q -r ${ENCAPDIR}/daemontools* || true )
-	( rm -rf ${ENCAPDIR}/daemontools* || true )
-    
-${DAEMONTOOLS}.installed : ${PATCH}.installed
-${DAEMONTOOLS-DOC}.installed : ${DAEMONTOOLS}.installed
-
-${DAEMONTOOLS-DOC}.packaged : ${DAEMONTOOLS}.packaged
diff --git a/encap/tools/makeself/Makefile b/encap/tools/makeself/Makefile
deleted file mode 100644
index fc62cecc2..000000000
--- a/encap/tools/makeself/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id$
-
-.PHONY : all install clean uninstall encaps rename
-.SUFFIXES : 
-.SUFFIXES : .ep .installed .packaged
-
-BASEDIR = /usr/local
-ENCAPDIR = ${BASEDIR}/encap
-export ENCAPDIR
-EPKG = ${BASEDIR}/bin/epkg
-export EPKG
-MKENCAP = ${BASEDIR}/bin/mkencap
-export MKENCAP
-
-MAKESELF = makeself-2.1.4
-
-.ep.installed : # Clean, compile and install an encap package
-	@printf "***** START .ep.installed for |$*| ***** \n"
-	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
-	( rm -rf ${ENCAPDIR}/$* || true )
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.ep || true ) > $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.ep || true ) >> $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.ep ) >> $*.log 2>&1
-	${EPKG} -q -i ${ENCAPDIR}/$*
-	test -h ${BASEDIR}/var/encap/$*
-	touch $*.installed
-	@printf "***** STOP .ep.installed for |$*| ***** \n"
-
-.installed.packaged : # Create .tar.gz encap packages for distribution
-	@printf "***** START .installed.packaged for |$*| ***** \n"
-	( rm ${ENCAPDIR}/$*-*.tar.gz || true )
-	( cd ${ENCAPDIR} && ${MKENCAP} -e $* || true )
-	cd ${ENCAPDIR} && ${MKENCAP} -c $*
-	mv ${ENCAPDIR}/$*-encap-*.tar.gz .
-	touch $*.packaged
-	@printf "***** STOP .installed.packaged for |$*| ***** \n"
-
-all :
-	( $(MAKE) install > make.log 2>&1 && $(MAKE) encaps >> make.log 2>&1 ) &
-
-install : ${EPKG} ${MKENCAP} ${MAKESELF}.installed
-
-encaps : ${EPKG} ${MKENCAP} ${MAKESELF}.packaged
-
-rename : encaps
-	test "$${OS}x" != "x"
-	for EARCHIVE in `ls *-encap-*.tar.gz`; do \
-		mv $${EARCHIVE} `printf $${EARCHIVE} | awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' | sed s:\ :-:g | sed s:OSDIST:\$${OS}:g` ; \
-	done
-
-clean : 
-	( rm *.log || true )
-	( rm *.packaged || true )
-	( rm *.gz || true )
-	( rm *~ || true )
-
-uninstall : clean
-	( rm *.installed || true )
-	( ${EPKG} -q -r ${ENCAPDIR}/makeself* || true )
-	( rm -rf ${ENCAPDIR}/makeself* || true )
diff --git a/encap/tools/ostiary/Makefile b/encap/tools/ostiary/Makefile
deleted file mode 100644
index f7885f1c5..000000000
--- a/encap/tools/ostiary/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id:$
-
-.PHONY : all install clean uninstall encaps rename
-.SUFFIXES : 
-.SUFFIXES : .ep .installed .packaged
-
-BASEDIR = /usr/local
-ENCAPDIR = ${BASEDIR}/encap
-export ENCAPDIR
-EPKG = ${BASEDIR}/bin/epkg
-export EPKG
-MKENCAP = ${BASEDIR}/bin/mkencap
-export MKENCAP
-
-OSTIARTY = ostiary-3.4
-OSTIARTY-DOC = ostiary-doc-20060801
-
-.ep.installed : # Clean, compile and install an encap package
-	@printf "***** START .ep.installed for |$*| ***** \n"
-	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
-	( rm -rf ${ENCAPDIR}/$* || true )
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.ep || true ) > $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -T $*.ep || true ) >> $*.log 2>&1
-	( ${MKENCAP} -m /usr/local/bin/m4 -b -CBI $*.ep ) >> $*.log 2>&1
-	${EPKG} -q -i ${ENCAPDIR}/$*
-	test -h ${BASEDIR}/var/encap/$*
-	touch $*.installed
-	@printf "***** STOP .ep.installed for |$*| ***** \n"
-
-.installed.packaged : # Create .tar.gz encap packages for distribution
-	@printf "***** START .installed.packaged for |$*| ***** \n"
-	( rm ${ENCAPDIR}/$*-*.tar.gz || true )
-	( cd ${ENCAPDIR} && ${MKENCAP} -e $* || true )
-	cd ${ENCAPDIR} && ${MKENCAP} -c $*
-	mv ${ENCAPDIR}/$*-encap-*.tar.gz .
-	touch $*.packaged
-	@printf "***** STOP .installed.packaged for |$*| ***** \n"
-
-all :
-	( $(MAKE) install > make.log 2>&1 && $(MAKE) encaps >> make.log 2>&1 ) &
-
-install : ${EPKG} ${MKENCAP} ${OSTIARTY-DOC}.installed
-
-encaps : ${EPKG} ${MKENCAP} ${OSTIARTY-DOC}.packaged
-
-rename : encaps
-	test "$${OS}x" != "x"
-	for EARCHIVE in `ls *-encap-*.tar.gz`; do \
-		mv $${EARCHIVE} `printf $${EARCHIVE} | awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' | sed s:\ :-:g | sed s:OSDIST:\$${OS}:g` ; \
-	done
-
-clean : 
-	( rm *.log || true )
-	( rm *.packaged || true )
-	( rm *.gz || true )
-	( rm *~ || true )
-
-uninstall : clean
-	( rm *.installed || true )
-	( ${EPKG} -q -r ${ENCAPDIR}/ostiary* || true )
-	( rm -rf ${ENCAPDIR}/ostiary* || true )
-    
-${OSTIARTY-DOC}.installed : ${OSTIARTY}.installed
-
-${OSTIARTY-DOC}.packaged : ${OSTIARTY}.packaged