No longer being maintained, no one expressed interest on mailing list, so removing from trunk.

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

70 files changed, 0 insertions, 5204 deletions

diff --git a/encap/HOWTO b/encap/HOWTO
deleted file mode 100644
index 4c3ec7860..000000000
--- a/encap/HOWTO
+++ /dev/null
@@ -1,16 +0,0 @@
-[[TracNav]]
-
-EncapPackages | EncapReadme | EncapPlatforms | EncapInstall | '''EncapHowto'''
-
-----
-
-= EncapHowto: Encap Packages HOWTO =
-
-== TODO ==
- * Aim is to have nice HOWTO before 1.0 release, incorporating the
-   work done at http://opensysadmin.com/trac/wiki/VirtualMachines
- * Insert reference to README, INSTALL, and PLAFORMS in wiki: format
-
-== Documentation Version ==
- * This is a copy of: $Id$
- * Most recent version: http://www.bcfg2.org/browser/trunk/bcfg2/encap/HOWTO
diff --git a/encap/INSTALL b/encap/INSTALL
deleted file mode 100644
index 500b262bb..000000000
--- a/encap/INSTALL
+++ /dev/null
@@ -1,110 +0,0 @@
-[[TracNav]]
-
-EncapPackages | EncapReadme | EncapPlatforms | '''EncapInstall''' | EncapHowto
-
-----
-
-= EncapInstall: bcfg2/encap installation instructions =
-
-== Prerequisites ==
- * Read the [wiki:EncapReadme README]
- * GNU gcc and GNU g++
-   * If you are using the gcc distributed with Solaris/x86 10, you need to 
-     install the gcc bug fix at http://www.openssl.org/~appro/values.c by 
-     running "`ksh -f values.c`" as root (or openssl will segfault)
- * GNU make (make sure "gmake" links to GNU make on non-GNU platforms)
- * epkg (the encap package manager)
-   * Binaries are at http://mirror.opensysadmin.com/epkg-binaries/ 
-     (Note: All other binary versions link against libtar-1.2.11 or earlier. 
-     Versions of libtar before 1.2.12 have a nasty bug where 100 character 
-     path names are truncated to 99 characters. To see what version of libtar
-     your epkg binary is linked against, use `epkg -V`.)
-   * If built from source, first need all recommended libraries from web page
-     * To ease building from source, read `epkg/README` and use `epkg/Makefile`
- * On AIX 4.3.3, you will need GNU binutils from:
-   ftp://ftp.software.ibm.com/aix/freeSoftware/aixtoolbox/RPMS/ppc/GNUPro/binutils-2.9.aix51.020209-4.aix4.3.ppc.rpm
-
-You will need binaries of the GNU tools. For GNU and BSD based operating 
-systems, you should be able to get these via the operating system's package 
-system. For commercial operating systems, these can be obtained from:
-
- AIX::
- * UCLA's Public Domain Software Library for AIX at 
-   http://aixpdslib.seas.ucla.edu/aixpdslib.html 
-   (These are trivial to convert into encap packages)
- * Bull AIX Freeware at http://www.bullfreeware.com/
- * IBM AIX Toolbox at ftp://ftp.software.ibm.com/aix/freeSoftware
-
- Solaris::
- * Freeware for Solaris at http://www.sunfreeware.com/
- * Community Software for Solaris at http://www.blastwave.org/packages.php
-
-== Advanced Packaging Tool (APT) support == 
-On platforms that use APT, such as Debian and Ubuntu, "bcfg2-python-apt" must
-be built. Unfortunately the version required is dependent on the version of the
-distribution. 
-
-To see if your distribution is supported, do:
-{{{
-cat /etc/issue
-grep DISTRO src/encap-profiles/Makefile \
-    | awk -F, '{print $2}' | sort | sed s:\)$::g
-}}}
-If any of the lines from `src/encap-profiles/Makefile` match your `/etc/issue`,
-you're good to go; if not, open a ticket at http://www.bcfg2.org/newticket with 
-the contents of your `/etc/issue` requesting that it be supported, and support
-should be added within a few days (or of course patches are gratefully 
-accepted).
-
-When building "bcfg2-python-apt", there are some additional prerequisites:
- * `/usr/lib/libapt-pkg*` (Part of the "apt" package on Debian)
- * `/usr/lib/libapt-inst*` (Part of the "apt-utils" package on Debian)
- * The "`libapt-pkg-dev`" package 
-So you probably want to do something like:
-{{{
-apt-get install apt apt-utils libapt-pkg-dev
-}}}
-
-== Building and installing everything ==
-Note that the build is disruptive to the currently installed bcfg2 packages
-(whatever you have installed is uninstalled and then replaced with the
-newly-built packages), although no configuration files will be replaced
-unless you ask them to be (via "`REPLACE_CONFIG="yes"; export REPLACE_CONFIG`").
-
- 1. Make sure all of the prerequisites (see above) are installed.
- 1. The build/install must be done as "`root`".
- 1. Change to the src directory (`cd src`)
- 1. Copy your `site-settings.conf` file to `bcfg2-site/`; if you don't have
-    one already, copy over `bcfg2-site/site-settings.conf-example` and change
-    it to suit your site.
- 1. Run `make` (GNU/Linux platforms) or `gmake` (all other platforms). This 
-    will kick off and background the entire build process. Make output will be
-    redirected to `make.log`, and package build output will go to individual
-    log files. If the entire build is successful, you will see: 
-    {{{
-    ### encap build finished...
-    }}}
-    followed by the locations of the various packages at the end of make.log
-
-Packages that you can install on other machines will be in the "`DIST`" 
-directory. In most cases you will only need the self-extracting/installing
-package with the name like "`bcfg2-*.run`"; that will install the bcfg2 client.
-You will need to install this even on your build machine(s) and server(s), so 
-the setup script will run.
-
-You can install the doc packages if you want, although it probably makes more
-sense to let bcfg2 install them on machines you want to have them on after you
-get stuff up and running.
-
-Cheetah will be built on all platforms (as it is needed as a build-time 
-prerequisite), however for run-time it only needs to be installed on the bcfg2
-server machine.
-
-== Next step ==
-For more information on the "`bcfg2-*.run`" file and what to do next, see the
-[wiki:EncapHowto HOWTO].
-
-== Documentation Version ==
- * This is a copy of: $Id$
- * Most recent version: http://www.bcfg2.org/browser/trunk/bcfg2/encap/INSTALL
-
diff --git a/encap/PLATFORMS b/encap/PLATFORMS
deleted file mode 100644
index fd25d1062..000000000
--- a/encap/PLATFORMS
+++ /dev/null
@@ -1,64 +0,0 @@
-[[TracNav]]
-
-EncapPackages | EncapReadme | '''EncapPlatforms''' | EncapInstall | EncapHowto
-
-----
-
-= Bcfg2/Encap Platforms =
-
-Below is a table of platforms that have been successfully bootstrapped using
-the encap package management code.
-
-|||| '''OS'''||'''Vendor'''||'''Version'''||'''Arch'''||'''By'''||'''Bcfg2'''||
-||  1 || AIX       || IBM     || 4.3.1   || POWER  || dc || 0.9.5  ||
-||  2 || AIX       || IBM     || 4.3.3   || POWER  || dc || 0.9.4i ||
-||  3 || AIX       || IBM     || 5.2.0   || POWER  || dc || 0.9.4i ||
-||  4 || AIX       || IBM     || 5.3.0   || POWER  || dc || 0.9.4i ||
-||  5 || BSD       || FreeBSD || 6.2     || ix86   || dc || 0.9.5  ||
-||  6 || BSD       || FreeBSD || 6.2     || x86_64 || dc || 0.9.5  ||
-||  7 || GNU/Linux || CentOS  || 5.0     || ix86   || dc || 0.9.5  ||
-||  8 || GNU/Linux || CentOS  || 5.0     || x86_64 || dc || 0.9.5  ||
-||  9 || GNU/Linux || Debian  || Sarge   || ix86   || dc || 0.9.5  ||
-|| 10 || GNU/Linux || Debian  || Etch    || ix86   || dc || 0.9.4i ||
-|| 11 || GNU/Linux || Debian  || Etch    || x86_64 || dc || 0.9.4i ||
-|| 12 || GNU/Linux || Debian  || Lenny   || ix86   || dc || 0.9.5  ||
-|| 13 || GNU/Linux || Debian  || Sid     || ix86   || dc || 0.9.5  ||
-|| 14 || GNU/Linux || Redhat  || 6.0     || ix86   || dc || 0.9.4i ||
-|| 15 || GNU/Linux || Redhat  || 7.2     || ix86   || dc || 0.9.4i ||
-|| 16 || GNU/Linux || Redhat  || RHEL4   || ix86   || dc || 0.9.4i ||
-|| 17 || GNU/Linux || SuSE    || SLES8   || ix86   || dc || 0.9.4i ||
-|| 18 || GNU/Linux || SuSE    || SLES10  || ix86   || dc || 0.9.4i ||
-|| 19 || GNU/Linux || SuSE    || SLES10  || x86_64 || dc || 0.9.4i ||
-|| 20 || GNU/Linux || Ubuntu  || Dapper  || ix86   || dc || 0.9.5  ||
-|| 21 || GNU/Linux || Ubuntu  || Dapper  || x86_64 || dc || 0.9.5  ||
-|| 22 || GNU/Linux || Ubuntu  || Edgy    || ix86   || dc || 0.9.5  ||
-|| 23 || GNU/Linux || Ubuntu  || Feisty  || ix86   || dc || 0.9.5  ||
-|| 24 || Solaris   || Sun     || 2.6     || Sparc  || dc || 0.9.4i ||
-|| 25 || Solaris   || Sun     || 8       || Sparc  || dc || 0.9.4i ||
-|| 26 || Solaris   || Sun     || 9       || Sparc  || dc || 0.9.4i ||
-|| 27 || Solaris   || Sun     || 10      || Sparc  || dc || 0.9.4i ||
-|| 28 || Solaris   || Sun     || 10      || x86_64 || dc || 0.9.5  ||
-
-dc: "Daniel Clark" <mailto:dclark@member.fsf.org>
-
-== Adding new platforms ==
-If you bootstrap a platform not listed above, please add a comment to:
- * http://trac.mcs.anl.gov/projects/bcfg2/ticket/74
-so that platform can be added to the list.
-
-If you modified any of the files in this package to be able to bootstrap the
-new platform, please include either diffs or a tarball of your modified
-version in a new ticket so your changes can be incorporated into a new
-release.
-
-Any other notes, such as where you got the GNU binaries or any issues people
-should be aware of, would also be appreciated.
-
-You may want to scan all of the bootstrapped binaries and libraries with
-`ldd` (or equivalent) to make sure there are no dependencies on libraries
-other than those included with the base operating system and the libraries
-built as part of the bootstrap process.
-
-== Documentation Version ==
- * This is a copy of: $Id$
- * Most recent version: http://www.bcfg2.org/browser/trunk/bcfg2/encap/PLATFORMS
\ No newline at end of file
diff --git a/encap/README b/encap/README
deleted file mode 100644
index 653f6f274..000000000
--- a/encap/README
+++ /dev/null
@@ -1,173 +0,0 @@
-[[TracNav]]
-
-EncapPackages | '''EncapReadme''' | EncapPlatforms | EncapInstall | EncapHowto
-
-----
-
-= EncapReadme: Encap based bootstrap for bcfg2 and complete bcfg2 toolchain =
-
-This code is a method for getting bcfg2, including all dependencies, up and
-running on many platforms as quickly as possible, from source.
-
-== What you get ==
-The end result is a self-extracting/self-installing bcfg2 client distribution
-that does a complete client install, which includes:
- * The epkg encap package manager
- * All software on which bcfg2 depends
- * Bcfg2 itself
- * Ostiary to kick off bcfg2 client runs remotely
- * Runit to run bcfg2 client as a periodic service with logging
- * All with site-specific configuration parameters, set at build time in a
-   single unified build-time configuration file, site-settings.conf
- * Optional install-time entry of bcfg2 and ostiary passwords, interactively
-   or via environment variables
-
-As well as:
- * Encaps of optional documentation packages
- * Optionally you can build the software the bcfg2 server requires (cd to 
-   the encap/src/encap-packages/server directory and type "make")
-
-== Internet resources ==
-For a more general overview, see http://www.bcfg2.org/wiki/EncapPackages
-
-You can obtain the latest version of the code from bcfg2 svn:
- * `svn co https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2/encap`
-
-== Operation notes ==
-Using the encap package manager this code automatically downloads, builds and
-creates encap packages for bcfg2 and dependencies to `/usr/local/encap`, and
-installs symbolic links to these packages from `/usr/local` (the usual encap
-thing).
-
-It attempts to be as self contained as possible; everything gets linked to
-under `/usr/local/lib/bcfg2`, except for bcfg2 itself and some dependent
-software, which is prefixed by `b2-` (`b2-python` etc.).
-
-To run the bcfg2 server, you also need to install gamin, which supports a
-subset of the platforms bcfg2 client will work on, including GNU/Linux (but
-first install glib, on which gamin depends). You also need to install the
-cheetah templating system on the bcfg2 server if you wish to use the bcfg2
-templating functionality.
-
-== Important differences from upstream sources ==
- * In general, everything is under `/usr/local` instead of `/`
-   * `/usr/local/etc/bcfg2.conf` is used instead of `/etc/bcfg2.conf`
-
-== Environment variables and Sentinel files ==
-Before the initial make/gmake and before the client install, you can set some
-environment variables to control some behaviors:
- * `DEST="<path>"` - Set where the final build output goes. Default is
-   `./DIST`
- * `REPLACE_CONFIG="yes"` - Unconditionally replace local configuration files
-   for bcfg2 and ostiary with those included in the distribution. The old
-   files are saved to <filename>-<date>.
- * `LOC_BCFG2_PASSWD="<password>"` , `LOC_OST_PASSWD="<password>"` - Set the
-   bcfg2 server and ostiaryd daemon passwords, to avoid being interactively
-   prompted for them.
-
-There are also some "sentinel files" (zero byte files that only indicate
-state) that you can create to control the operation of the install. This is
-mostly useful so that installs don't clobber local changes / changes made by
-bcfg2.
-
-Sentinel file names:
- * `.SENTINEL_SITE` - Indicates that the bcfg2 client has been previously
-   installed.
- * `.SENTINEL_BCFG2` - Indicates that the files have been modified by bcfg2
-   itself. (If you change any of the config files mentioned below via bcfg2,
-   you'll want to put this sentinel file in the appropriate directory with
-   bcfg2 as well).
-
-If either of these files exist, the install will not overwrite the existing
-config files unless `REPLACE_CONFIG="yes"` is set.
-
-{{{
-Directory with sentinel file(s)       Covered config files
------------------------------------   --------------------------------------
-/usr/local/etc                        bcfg2.conf , ostiary.conf
-/usr/local/etc/default/bcfg2-client   env/RUN_INTERVAL_SECONDS , env/OPTIONS
-/usr/local/etc/default/bcfg2-server   env/OPTIONS
-/usr/local/sbin                       ost-bcfg2.sh
-}}}
-
-== About runit integration ==
-In order to avoid a lot of platform/distribution-specific code, the encap
-bcfg2 distribution includes and uses [http://smarden.org/runit/useinit.html
-runit] instead of init scripts and cron.
-
-The bcfg2 client (.run) distribution uses runit to run ostiary, and to run 
-the bcfg2 client periodically.
-
-On the server, edit `/usr/local/etc/default/bcfg2-server/env/OPTIONS` to
-include the options you want to start up the bcfg2 server with, and then do
-{{{
-ln -s /usr/local/etc/sv/bcfg2-server /usr/local/var/service/
-}}}
-to enable the service.
-
-You can use `sv status /usr/local/var/service/bcfg2-server` to see the 
-status, and `rm /usr/local/var/service/bcfg2-server` to remove it.
-
-Logs for all runit services are under `/usr/local/var/svlogd`.
-
-== About ostiary integration ==
-In order to enable the remote kickoff of bcfg2 client runs, the bcfg2 client
-distribution includes [http://ingles.homeunix.org/software/ost/ ostiary], a
-simple, very security-paranoid daemon that runs a script with fixed
-arguments based on a password hash it receives.
-
-The following actions are available via ostiary; you can add more by editing
-`/usr/local/etc/ostiary.cfg`. The <password> is a value you set during
-compile-time or (preferably) .run file install time.
- * `<password>-bcfg2-dvqn` : Run `bcfg2-client -d -v -q -n`
- * `<password>-bcfg2-dvn` : Run `bcfg2-client -d -v -n`
- * `<password>-bcfg2-dvq` : Run `bcfg2-client -d -v -q`
- * `<password>-bcfg2-dv` : Run `bcfg2-client -d -v`
- * `<password>-bcfg2-vq` : Run `bcfg2-client -v -q`
- * `<password>-bcfg2-v` : Run `bcfg2-client -v`
- * `<password>-bcfg2-restart` : Restart the bcfg2-client runit service
-
-There are plans for the future for a bcfg2 plugin that will set per-machine
-passwords after the initial install, however as with cfengine the worst that
-someone can do if they find your password is to bring your host into a
-cleaner state.
-
-To execute one of these actions, you use the `ostclient` command, i.e.:
-{{{ ostclient -a <address> -p <port> }}}
-where <address> is the address of the machine you want to run the bcfg2
-client on, and <port> is the ostiary port number you set during the INSTALL
-procedure. You will then be prompted to `Enter command secret: `, at which
-point you will enter one of the above-listed values, such as
-`<password>-bcfg2-dvqn` (the command to run and the password are
-integrated into the same string).
-
-Another useful way of running ostiary is to put the password in a text file
-(on the local filesystem with appropriate permissions) and then do:
-{{{
-for HOST in $(bcfg2-query -u); do 
-    printf "$HOST: "
-    ostclient -a $HOST:1711 -f 0 < file-with-password.txt
-    sleep 1
-done
-}}}
-This will run the ostiary command associated with the password in
-"file-with-password.txt" on all hosts bcfg2 thinks are up. The sleep
-delay is arbitrary and not really required, but can be useful if you
-are monitoring the bcfg2 server logs interactively for client connections.
-
-Logs of bcfg2-client runs kicked off via ostiary are in
-`/usr/local/var/svlogd/bcfg2-client-ostiary`
-
-== Encap profile (.ep) documentation ==
-Note that the doc for the encap profile format is in
-[wiki:EncapManEncapProfile `man 5 encap_profile`].
-
-== Next steps ==
- 1. You can check to see if your platform has been successfully
-    bootstrapped before; see [wiki:EncapPlatforms PLATFORMS]
- 1. Build and install; see [wiki:EncapInstall INSTALL]
- 1. Set up your server and clients; see [wiki:EncapHowto HOWTO]
-
-== Documentation Version ==
- * This is a copy of: $Id$
- * Most recent version: http://www.bcfg2.org/browser/trunk/bcfg2/encap/README
diff --git a/encap/TODO b/encap/TODO
deleted file mode 100644
index cff7cc7fb..000000000
--- a/encap/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-= EncapTodo: TODO =
-
- * Write HOWTO
-
- * Packages all deps of new reports (django etc.) for GNU/Linux
-
- * Work towards full compliance with encap 2.1 spec
-
-== Documentation Version ==
-$Id$
diff --git a/encap/epkg/Makefile b/encap/epkg/Makefile
deleted file mode 100644
index ddd19f7f8..000000000
--- a/encap/epkg/Makefile
+++ /dev/null
@@ -1,172 +0,0 @@
-# $Id$
-
-.PHONY : log all clean distclean install pkgconfig zlib openssl libtar curl fget expat epkg
-.SUFFIXES : 
-
-BASEDIR = /usr/local
-ENCAPDIR = ${BASEDIR}/encap
-PREFIX = /tmp/epkg-static-libs
-PATH = ${PREFIX}/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/local/bin:/opt/csw/bin:/usr/sbin:/usr/bin:/bin
-CC = gcc -static-libgcc
-LDFLAGS = -L${PREFIX}/lib
-CPPFLAGS = -I${PREFIX}/include
-LD_LIBRARY_PATH = ${PREFIX}/lib
-LIBPATH = ${PREFIX}/lib
-PKG_CONFIG_PATH = ${PREFIX}/lib/pkgconfig
-ENCAP_CONTACT = dclark@pobox.com
-export PATH CC LDFLAGS CPPFLAGS LD_LIBRARY_PATH LIBPATH PKG_CONFIG_PATH ENCAP_CONTACT
-
-PKGCONFIG = pkg-config-0.22
-ZLIB = zlib-1.2.3
-LIBTAR = libtar-1.2.12
-OPENSSL = openssl-0.9.8e
-CURL = curl-7.16.4
-FGET = fget-1.3.3
-EXPAT = expat-2.0.1
-EPKG = epkg-2.3.9
-
-# Get Platform for GNU/Linux distributions...
-UNAME := $(shell uname)
-
-ifeq ($(UNAME),Linux)
-DISTRO := $(shell cat /etc/issue | grep ^[a-zA-Z] | head -1)
-UNAMEM := $(shell uname -m)
-endif
-
-## Get OS for GNU/Linux distributions...
-ifeq ($(DISTRO),Debian GNU/Linux 3.1 \n \l)
-OS = linux_debian_sarge
-endif
-
-ifeq ($(DISTRO),Debian GNU/Linux 4.0 \n \l)
-OS = linux_debian_etch
-endif
-
-ifeq ($(DISTRO),Debian GNU/Linux testing/unstable \n \l)
-OS = linux_debian_sid
-endif
-
-ifeq ($(DISTRO),Ubuntu 6.06.1 LTS \n \l)
-OS = linux_ubuntu_dapper
-endif
-
-ifeq ($(DISTRO),Red Hat Linux release 6.0 (Hedwig))
-OS = linux_redhat_60
-endif
-
-ifeq ($(DISTRO),Red Hat Linux release 7.2 (Enigma))
-OS = linux_redhat_72
-endif
-
-ifeq ($(DISTRO),Welcome to SuSE SLES 8 (powered by UnitedLinux 1.0) (i586))
-OS = linux_suse_sles8
-endif
-
-ifeq ($(DISTRO),Welcome to SUSE Linux Enterprise Server 10 (i586) - Kernel \r (\l).)
-OS = linux_suse_sles10
-endif
-
-ifeq ($(DISTRO),Welcome to SUSE Linux Enterprise Server 10 (i686) - Kernel \r (\l).)
-OS = linux_suse_sles10
-endif
-
-ifeq ($(DISTRO),Welcome to SUSE Linux Enterprise Server 10 (x86_64) - Kernel \r (\l).)
-OS = linux_suse_sles10
-endif
-
-ifeq ($(DISTRO),Red Hat Enterprise Linux AS release 4 (Nahant Update 5))
-OS = linux_redhat_rhel4
-endif
-
-ifeq ($(DISTRO),Red Hat Enterprise Linux AS release 4 (Nahant Update 4))
-OS = linux_redhat_rhel4
-endif
-
-## Get ARCH for GNU/Linux distributions...
-ARCH = ix86
-ifeq ($(UNAMEM),x86_64)
-ARCH = x86_64
-endif
-
-## Finally, set PLATFORM for GNU/Linux distributions...
-PLATFORM = 
-ifeq ($(UNAME),Linux)
-PLATFORM = -p ${ARCH}-${OS}
-endif
-
-log:
-	( $(MAKE) epkg.done > ./make.log 2>&1 ) &
-	tail -f make.log
-	
-all: epkg.done
-
-.DELETE_ON_ERROR : # delete the target of a rule if it has changed and its
-                   # commands exit with a nonzero exit status
-
-clean:
-	-rm *.done
-	-rm -rf ${PREFIX}
-
-distclean: clean
-	for D in ${PKGCONFIG} ${ZLIB} ${LIBTAR} ${OPENSSL} ${CURL} ${FGET} ${EXPAT} ${EPKG}; do (cd $$D && printf "In $$D \n" && (make clean 2>/dev/null || true) && (make distclean 2>/dev/null || true)); done
-	if [ -f ${CURL}/lib/ca-bundle.crt.orig ]; then mv ${CURL}/lib/ca-bundle.crt.orig ${CURL}/lib/ca-bundle.crt; fi
-	cd ${OPENSSL} && if [ -f config.orig ]; then mv config.orig config; fi
-	-rm /usr/local/etc/epkg-ca-bundle.pem
-	-rm /usr/local/etc/mkencap_environment
-	-rm epkg-*-encap-*-*.tar.gz
-
-pkgconfig.done:
-	cd ${PKGCONFIG} && ./configure --prefix=${PREFIX} && $(MAKE) && $(MAKE) install
-	touch pkgconfig.done
-
-zlib.done: pkgconfig.done
-	cd ${ZLIB} && prefix=${PREFIX} CC=gcc ./configure && $(MAKE) && $(MAKE) install
-	touch zlib.done
-	
-openssl.done: zlib.done
-	cd ${OPENSSL} && if [ -f config.orig ]; then cp config.orig config; fi
-	cd ${OPENSSL} && cat config | sed s:CC\=ccc:CC\=gcc:g | sed s:CC\=cc:CC\=gcc:g > config.bcfg2
-	cd ${OPENSSL} && mv config config.orig
-	cd ${OPENSSL} && cp config.bcfg2 config
-	cd ${OPENSSL} && chmod 755 config
-	cd ${OPENSSL} && LDFLAGS="-all-static $LDFLAGS" ./config --prefix="${PREFIX}" zlib no-shared no-asm -L${PREFIX}/lib -I${PREFIX}/include && $(MAKE) && $(MAKE) install
-	touch openssl.done
-
-libtar.done: openssl.done
-	cd ${LIBTAR} && ./configure --disable-encap --disable-epkg-install --prefix=${PREFIX} && $(MAKE) && $(MAKE) install
-	touch libtar.done
-
-curl.done: libtar.done
-	if [ -f ${CURL}/lib/ca-bundle.crt ]; then mv ${CURL}/lib/ca-bundle.crt ${CURL}/lib/ca-bundle.crt.orig; fi
-	cp cacert.pem ${CURL}/lib/ca-bundle.crt
-	cd ${CURL} && ./configure --with-ssl --disable-ipv6 --disable-shared --enable-static --prefix=${PREFIX} --sysconfdir=/usr/local/etc --with-ca-bundle=/usr/local/etc/epkg-ca-bundle.pem && $(MAKE) && $(MAKE) install
-	if [ -f ${CURL}/lib/ca-bundle.crt.orig ]; then mv ${CURL}/lib/ca-bundle.crt.orig ${CURL}/lib/ca-bundle.crt; fi
-	${PREFIX}/bin/curl -V | xargs echo | grep zlib | grep ftp | grep http | grep libz | grep ftps | grep https
-	touch curl.done
-
-fget.done: curl.done
-	cd ${FGET} && ./configure --disable-encap --disable-epkg-install --prefix=${PREFIX} && $(MAKE) && $(MAKE) install
-	touch fget.done
-
-expat.done: fget.done
-	cd ${EXPAT} && ./configure --disable-shared --prefix=${PREFIX} && $(MAKE) && $(MAKE) install
-	touch expat.done
-
-epkg.done: expat.done
-	test -d $(ENCAPDIR)/$(EPKG) && rm -rf $(ENCAPDIR)/$(EPKG) || true
-	-rm /usr/local/etc/epkg-ca-bundle.pem
-	-rm /usr/local/etc/mkencap_environment
-	-rm epkg-*-encap-*-*.tar.gz
-	cd ${EPKG} && ./configure && $(MAKE) && (rm -rf /usr/local/encap/epkg-2* 2>/dev/null || true) && $(MAKE) install
-	cp cacert.pem /usr/local/encap/${EPKG}/epkg-ca-bundle.pem
-	printf 'if [ ! -f "$${ENCAP_TARGET}/etc/epkg-ca-bundle.pem" ]; then\n\techo "installing: $${ENCAP_TARGET}/etc/epkg-ca-bundle.pem";\n\tcp "$${ENCAP_SOURCE}/$${ENCAP_PKGNAME}/epkg-ca-bundle.pem" "$${ENCAP_TARGET}/etc/epkg-ca-bundle.pem";\nfi\n' >> $(ENCAPDIR)/$(EPKG)/postinstall
-	$(ENCAPDIR)/$(EPKG)/bin/mkencap $(PLATFORM) -ef $(EPKG)
-	$(ENCAPDIR)/$(EPKG)/bin/mkencap $(PLATFORM) -c $(EPKG)
-	$(ENCAPDIR)/$(EPKG)/bin/epkg -f -r epkg
-	-rm /usr/local/etc/epkg-ca-bundle.pem
-	-rm /usr/local/etc/mkencap_environment
-	$(ENCAPDIR)/$(EPKG)/bin/epkg -f -i epkg
-	-$(ENCAPDIR)/$(EPKG)/bin/epkg -c
-	test -f /usr/local/etc/epkg-ca-bundle.pem
-	test -f /usr/local/etc/mkencap_environment
-	touch epkg.done
diff --git a/encap/epkg/README b/encap/epkg/README
deleted file mode 100644
index ce986d3c0..000000000
--- a/encap/epkg/README
+++ /dev/null
@@ -1,28 +0,0 @@
-If you can't find an epkg binary compiled with all of the extra
-libraries for your platform, you can use this Makefile (which will
-probably require a little bit of editing for platforms other than
-Solaris/x86 10) to compile it.
-
-You'll need to manually download the versions of packages you want to
-this directory, edit the Makefile to refer to those versions,
-decompress/untar the distributions, and then run make (or gmake on
-non-GNU platforms). The cacert.pem file that needs to be in this 
-directory is available from http://curl.haxx.se/docs/caextract.html
-
-All of the software is available from:
- * http://mirror.opensysadmin.com/epkg-deps/epkg-with-all-deps.tar.gz
-You will want to download and extract this file to this directory, as
-it contains symbloic links to the README and Makefile in this directory.
-After that is complete, do "cd epkg-with-all-deps" and then "make" or
-"gmake" (depending on what GNU Make is called on your machine).
-
-Once you have a working epkg distribution, you should:
- * cd /usr/local/encap
- * mkencap -c epkg-x.y.z
- * Rename the tar.gz file with the appropriate encap string
-   (i.e. mv epkg-x.y.z.tar.gz epkg-x.y.z-encap-i386-solaris10.tar.gz)
- * Upload that file to the encap repository at:
-   http://www.encap.org/search/upload.fcgi
- * Update the ticket at http://trac.mcs.anl.gov/projects/bcfg2/ticket/74   
-   with a quick note stating you've done the encap upload so it can be 
-   mirrored at http://www.dclark.us/mirror/epkg-contrib
diff --git a/encap/src/Makefile b/encap/src/Makefile
deleted file mode 100644
index 0e3056ed6..000000000
--- a/encap/src/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-
-export SHELL = /bin/sh
-
-.PHONY : test log all clean distclean uninstall
-
-DEST ?= DIST
-MKINSTALLDIRS = ./bcfg2-site/bcfg2-site-RENAME/mkinstalldirs
-
-log :
-	@printf "Building in background, and logging to ./make.log\n"
-	( $(MAKE) all > ./make.log 2>&1 ) &
-	tail -f make.log
-
-all : clean
-	$(MAKE) -C ./encap-profiles all
-	$(MAKE) -C ./bcfg2-site all
-	$(MAKE) -C ./makeself-dist all
-	if [ ! -d $(DEST) ]; then $(MKINSTALLDIRS) $(DEST); fi
-	cp makeself-dist/*.run $(DEST)
-	cp encap-profiles/*.tar.gz $(DEST)
-	@printf "\n\n### encap build finished...\n"
-	@printf "## Client install self-extracting/installing package is:\n"
-	@printf "%s\n" "`ls $(DEST)/*.run 2>/dev/null`"
-	@printf "\n"
-    
-clean :
-	-$(MAKE) -C ./encap-profiles clean
-	-$(MAKE) -C ./bcfg2-site clean
-	-$(MAKE) -C ./makeself-dist clean
-	-rm ./*.log ./*~ ./\#*
-	-rm -rf $(DEST) makeself-dist/bcfg2-*
-	-cd bcfg2-site && ls | grep bcfg2-site | grep -v bcfg2-site-RENAME | xargs -n1 rm -rf
-
-distclean : clean
-	-$(MAKE) -C ./encap-profiles distclean
-	-$(MAKE) -C ./bcfg2-site distclean
-	-$(MAKE) -C ./makeself-dist distclean
-
-uninstall : distclean
-	-$(MAKE) -C ./encap-profiles uninstall
diff --git a/encap/src/bcfg2-site/Makefile b/encap/src/bcfg2-site/Makefile
deleted file mode 100644
index 624e77260..000000000
--- a/encap/src/bcfg2-site/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id$
-
-# Variables
-
-PATH = /usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/bin:/bin
-CHEETAH = /usr/local/lib/bcfg2/bin/cheetah
-
-# Main
-
-.PHONY : all clean distclean fill copy fix encap install test cheetah
-.SUFFIXES : 
-
-BD = /usr/local
-ED = ${BD}/encap
-export ED
-
-all : encap install
-
-clean :
-	for DIR in `find . -type d | grep -v "\.svn"`; do \
-		for GLOB in \#\* \*\~ \*.out\*; do \
-			(rm $${DIR}/$${GLOB} 2>/dev/null || true); \
-		done; \
-	done
-
-distclean : clean
-	-rm *-encap-*.tar.gz
-
-fill : clean
-	$(CHEETAH) fill -R --oext out
-
-copy : fill
-	EN=`cat bcfg2-site-RENAME/encapname.out` && \
-	( test ! -d $(ED)/bcfg2-site-$${EN} || rm -rf $(ED)/bcfg2-site-$${EN} ) && \
-	for SRC in `find bcfg2-site-RENAME | grep -v svn | grep -v tmpl`; do \
-		DEST=$(ED)/`printf "%s\n" "$$SRC" | sed s/RENAME/$$EN/g | sed s/\.out//g`; \
-		if [ -d $$SRC ]; then mkdir $$DEST; else cp $$SRC $$DEST; fi; \
-	done		
-
-fix : copy
-	EN="$(ED)/bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	chown -R 0 $$EN && chgrp -R 0 $$EN && \
-	find $$EN -type d | xargs -n1 chmod 0755 && \
-	find $$EN -type f | xargs -n1 chmod 0644 && \
-	chmod 0600 $$EN/etc/ostiary.cfg && \
-	chmod 0600 $$EN/etc/bcfg2.conf && \
-	chmod 0700 $$EN/sbin/ost-bcfg2* && \
-	chmod 0755 $$EN/postinstall
-
-encap : fix
-	EN="bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	cd $(ED) && \
-	( test ! -f $${EN}-encap-*.tar.gz || rm $${EN}-encap-*.tar.gz ) && \
-	mkencap -c $$EN
-	EN="bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	mv $(ED)/$${EN}-encap-*.tar.gz ./
-    
-install : fix
-	-(EN="bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	epkg -q -r $(ED)/$$EN)
-	EN="bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	cd $(ED) && \
-	epkg -q -i $(ED)/$$EN && \
-	test -h $(BD)/var/encap/$$EN
-
-test :
-	: $(PATH)
-	$(CHEETAH) test
-	
-cheetah :
-	$(CHEETAH) $(ARGS)
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl
deleted file mode 100644
index 998a34b4a..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "site-settings.conf"
-encap 2.1       # libencap-2.3.8
-platform share
-date ${DATE}
-contact "${ADMIN_NAME}" <${ADMIN_EMAIL}>
-description bcfg2-site-${SITE_SHORTNAME} - bcfg2 configuration for ${SITE_NAME}
-prereq pkgspec >= bcfg2-0.8.2
-prereq pkgspec >= ostiary-3.4
-prereq pkgspec >= runit-1.7.2
-exclude etc
-exclude sbin
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapname.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/encapname.tmpl
deleted file mode 100644
index 0c0296a16..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapname.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "site-settings.conf"
-${SITE_SHORTNAME}-${SITE_VERSION}
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl
deleted file mode 100644
index 337a7a0bc..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "site-settings.conf"
-#compiler-settings
-commentStartToken = %%
-#end compiler-settings
-[communication]
-protocol = xmlrpc/ssl
-password = ${BCFG2_PASSWORD}
-%%if str($SITE_FINGERPRINT) != ""
-fingerprint = ${SITE_FINGERPRINT}
-%%end if
-
-[components]
-bcfg2 = https://${BCFG2_SERVER}:${BCFG2_PORT}
-
-[statistics]
-sendmailpath = ${SENDMAILPATH}
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/OPTIONS.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/OPTIONS.tmpl
deleted file mode 100644
index 93d733712..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/OPTIONS.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "site-settings.conf"
-${BCFG2_CLIENT_OPTIONS}
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/RUN_INTERVAL_SECONDS.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/RUN_INTERVAL_SECONDS.tmpl
deleted file mode 100644
index e4ff48d09..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/RUN_INTERVAL_SECONDS.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "site-settings.conf"
-${BCFG2_CLIENT_RUN_INTERVAL_SECONDS}
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-server/env/OPTIONS.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-server/env/OPTIONS.tmpl
deleted file mode 100644
index e4283b54e..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-server/env/OPTIONS.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "site-settings.conf"
-${BCFG2_SERVER_OPTIONS}
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl
deleted file mode 100644
index 9b7e555c5..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "site-settings.conf"
-# If present, ostiaryd will shut down once the cache of bad IPs is full.
-# Under runit, this just has the effect of generating a service restart
-# log message.
-EXIT_ON_IPCACHE_FULL
-
-# If present, ostiaryd will not detach from the terminal it was started
-# from. This is useful when running ostiaryd from programs like inetd or
-# cygrunsrv or runit.
-SKIP_DETACH
-
-# Port to listen on. (Can be specified on command line.)
-PORT=${OSTIARY_PORT}
-
-# The password to remotely kill ostiaryd. Sort of useless when running under
-# runit, since runit will just start ostiaryd back up. (But it is required
-# to be in this file)
-KILL="${OSTIARY_PASSWORD}-kill"
-
-# Must be at least one action.  Format is:
-# ACTION="secret","command (with path)",["uid"[,"gid"]]
-# NOTE: There is a maximum of 31 actions
-# IMPORTANT: Commands *CAN NOT* have any arguments -
-#            on some platforms arguments are just ignored
-ACTION="${OSTIARY_PASSWORD}-bcfg2-dvqn","/usr/local/sbin/ost-bcfg2-dvqn","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-dvn","/usr/local/sbin/ost-bcfg2-dvn","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-dvq","/usr/local/sbin/ost-bcfg2-dvq","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-dv","/usr/local/sbin/ost-bcfg2-dv","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-vq","/usr/local/sbin/ost-bcfg2-vq","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-v","/usr/local/sbin/ost-bcfg2-v","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-restart","/usr/local/sbin/ost-bcfg2-restart","0","0"
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/mkinstalldirs b/encap/src/bcfg2-site/bcfg2-site-RENAME/mkinstalldirs
deleted file mode 100755
index 0801ec2c9..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/mkinstalldirs
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1994-03-25
-# Public domain
-
-errstatus=0
-
-for file in ${1+"$@"} ; do 
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d in ${1+"$@"} ; do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-        mkdir "$pathcomp" || errstatus=$?
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl
deleted file mode 100755
index 68c5798d8..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl
+++ /dev/null
@@ -1,162 +0,0 @@
-#include "site-settings.conf"
-#compiler-settings
-cheetahVarStartToken = @
-commentStartToken = %%
-#end compiler-settings
-#!/bin/sh -e
-
-umask 002
-BASEDIR="${ENCAP_TARGET}" # Usually /usr/local
-PKGDIR="${ENCAP_SOURCE}/${ENCAP_PKGNAME}" # Ususally /usr/local/encap/<pkgname>
-LOG="${PKGDIR}/postinstall.log"
-MKINSTALLDIRS="${PKGDIR}/mkinstalldirs"
-exec > $LOG 2>&1
-
-printf "Running ${ENCAP_PKGNAME} postinstall script...\n"
-date
-
-chmod 755 ${MKINSTALLDIRS}
-${MKINSTALLDIRS} "${BASEDIR}/etc/default/bcfg2-client/env"
-${MKINSTALLDIRS} "${BASEDIR}/etc/default/bcfg2-server/env"
-${MKINSTALLDIRS} "${BASEDIR}/sbin"
-
-rmcp() {
-    SRCFILENAME="`basename ${1}`"
-    if [ -d "${2}" ]; then
-        DESTDIRNAME="$2"
-    else 
-        DESTDIRNAME="`dirname ${2}`"
-    fi
-    TARGETNAME="$DESTDIRNAME/$SRCFILENAME"
-    RMTARGET="no"
-    if [ -h "$TARGETNAME" ]; then RMTARGET="yes"; fi
-    if [ -f "$TARGETNAME" ]; then RMTARGET="yes"; fi
-    if [ "${RMTARGET}x"="yesx" ]; then
-        DATE="`date +%Y-%m-%d--%H-%M-%S`"
-        printf "INFO: Moving old $TARGETNAME to ${TARGETNAME}-${DATE}...\n"
-        cp "$TARGETNAME" "${TARGETNAME}-${DATE}" && rm "$TARGETNAME"
-    fi
-    printf "INFO: Copying %s to %s...\n" "$1" "$2"
-    cp "$1" "$2"
-}
-
-# bcfg2-client (options)
-if [ "${REPLACE_CONFIG}x" = "yesx" ]; then
-    printf "REPLACE_CONFIG=yes, so removing bcfg2-client sentinel files...\n"
-    S_B="${BASEDIR}/etc/default/bcfg2-client/.SENTINEL_BCFG2"
-    test -f ${S_B} && rm ${S_B}
-    S_S="${BASEDIR}/etc/default/bcfg2-client/.SENTINEL_SITE"
-    test -f ${S_S} && rm ${S_S}
-fi
-
-if [ -f ${BASEDIR}/etc/default/bcfg2-client/.SENTINEL_BCFG2 ]; then
-    printf "INFO: bcfg2 client options have been updated by bcfg2 -\n"
-    printf "INFO: not replacing that configuration.\n"
-elif [ -f ${BASEDIR}/etc/default/bcfg2-client/.SENTINEL_SITE ]; then
-    printf "INFO: bcfg2 client options have been previously updated -\n"
-    printf "INFO: not replacing that configuration.\n"
-else
-    DIR="etc/default/bcfg2-client"
-    rmcp $PKGDIR/$DIR/env/RUN_INTERVAL_SECONDS ${BASEDIR}/$DIR/env/
-    rmcp $PKGDIR/$DIR/env/OPTIONS ${BASEDIR}/$DIR/env/
-    touch ${BASEDIR}/$DIR/.SENTINEL_SITE
-fi
-
-# bcfg2-server (options)
-if [ "${REPLACE_CONFIG}x" = "yesx" ]; then
-    printf "REPLACE_CONFIG=yes, so removing bcfg2-server sentinel files...\n"
-    S_B="${BASEDIR}/etc/default/bcfg2-server/.SENTINEL_BCFG2"
-    test -f ${S_B} && rm ${S_B}
-    S_S="${BASEDIR}/etc/default/bcfg2-server/.SENTINEL_SITE"
-    test -f ${S_S} && rm ${S_S}
-fi
-
-if [ -f ${BASEDIR}/etc/default/bcfg2-server/.SENTINEL_BCFG2 ]; then
-    printf "INFO: bcfg2 server options have been updated by bcfg2 -\n"
-    printf "INFO: not replacing that configuration.\n"
-elif [ -f ${BASEDIR}/etc/default/bcfg2-server/.SENTINEL_SITE ]; then
-    printf "INFO: bcfg2 server options have been previously updated -\n"
-    printf "INFO: not replacing that configuration.\n"
-else
-    DIR="etc/default/bcfg2-server"
-    rmcp $PKGDIR/$DIR/env/OPTIONS ${BASEDIR}/$DIR/env/
-    touch ${BASEDIR}/$DIR/.SENTINEL_SITE
-fi
-
-# bcfg2.conf & ostiary.conf
-if [ "${REPLACE_CONFIG}x" = "yesx" ]; then
-    printf "REPLACE_CONFIG=yes, so removing ${BASEDIR}/etc sentinel files...\n"
-    S_B="${BASEDIR}/etc/.SENTINEL_BCFG2"
-    test -f ${S_B} && rm ${S_B}
-    S_S="${BASEDIR}/etc/.SENTINEL_SITE"
-    test -f ${S_S} && rm ${S_S}
-fi
-
-if [ -f ${BASEDIR}/etc/.SENTINEL_BCFG2 ]; then
-    printf "INFO: bcfg2.conf and/or ostiary.cfg may have been updated by\n"
-    printf "INFO: bcfg2 - not replacing that configuration.\n"
-elif [ -f ${BASEDIR}/etc/.SENTINEL_SITE ]; then
-    printf "INFO: bcfg2.conf and/or ostiary.cfg may have been previously\n"
-    printf "INFO: updated - not replacing that configuration.\n"
-else
-    rmcp $PKGDIR/etc/bcfg2.conf ${BASEDIR}/etc/
-    rmcp $PKGDIR/etc/ostiary.cfg ${BASEDIR}/etc/
-    touch ${BASEDIR}/etc/.SENTINEL_SITE
-fi
-
-# sbin/ost-bcfg2*
-if [ "${REPLACE_CONFIG}x" = "yesx" ]; then
-    printf "REPLACE_CONFIG=yes, so removing ${BASEDIR}/sbin sentinel files...\n"
-    S_B="${BASEDIR}/sbin/.SENTINEL_BCFG2"
-    test -f ${S_B} && rm ${S_B}
-    S_S="${BASEDIR}/sbin/.SENTINEL_SITE"
-    test -f ${S_S} && rm ${S_S}
-fi
-
-if [ -f ${BASEDIR}/sbin/.SENTINEL_BCFG2 ]; then
-    printf "INFO: sbin/ost-bcfg2* may have been updated by bcfg2 -\n"
-    printf "INFO: not replacing that configuration with this script.\n"
-elif [ -f ${BASEDIR}/sbin/.SENTINEL_SITE ]; then
-    printf "INFO: sbin/ost-bcfg2* may have been previously updated -\n"
-    printf "INFO: not replacing that configuration with this script.\n"
-else
-    OSTSH="ost-bcfg2-dv ost-bcfg2-dvn ost-bcfg2-dvq ost-bcfg2-dvqn ost-bcfg2-restart ost-bcfg2.sh ost-bcfg2-v ost-bcfg2-vq"
-    for OSTFILE in $OSTSH; do
-        rmcp $PKGDIR/sbin/${OSTFILE} ${BASEDIR}/sbin/
-    done
-    chmod 700 ${BASEDIR}/sbin/*
-    touch ${BASEDIR}/sbin/.SENTINEL_SITE
-fi
-
-# ostiary (runit)
-if [ ! -h /usr/local/var/service/ostiary ]; then
-    if [ -d /usr/local/etc/sv/ostiary ]; then
-        printf "INFO: Enabling ostiary service (via runit)...\n"
-        ln -s /usr/local/etc/sv/ostiary /usr/local/var/service/ostiary
-    else
-        printf "ERROR: /usr/local/etc/sv/ostiary does not exist.\n"
-        exit 1
-    fi
-else
-    printf "INFO: /usr/local/var/service/ostiary already exists, not replacing...\n"
-fi
-
-# bcfg2-client (runit)
-%%if int(@BCFG2_CLIENT_RUN_INTERVAL_SECONDS) > 0
-if [ ! -h /usr/local/var/service/bcfg2-client ]; then
-    if [ -d /usr/local/etc/sv/bcfg2-client ]; then
-        printf "INFO: Enabling bcfg2-client service (via runit)...\n"
-        ln -s /usr/local/etc/sv/bcfg2-client /usr/local/var/service/bcfg2-client
-    else
-        printf "ERROR: /usr/local/etc/sv/bcfg2-client does not exist.\n"
-        printf "ERROR: Could not enable bcfg2-client service.\n"
-    fi
-else
-    printf "INFO: /usr/local/var/service/bcfg2-client already exists, not replacing...\n"
-fi
-%%end if
-
-# end
-printf "Finished ${ENCAP_PKGNAME} postinstall script.\n"
-
-exit 0
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dv b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dv
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dv
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvn b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvn
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvn
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvq b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvq
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvq
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvqn b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvqn
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvqn
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-restart b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-restart
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-restart
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-v b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-v
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-v
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-vq b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-vq
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-vq
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh
deleted file mode 100755
index ea819b01a..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-#
-# ost-bcfg2.sh : Control bcfg2 client via ostiary (wrapper script)
-# $Id$
-#
-
-umask 002
-exec 2>&1
-
-PATH=/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/bin:/bin
-PYTHONPATH="/usr/local/lib/bcfg2/lib/python2.4:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/local/lib/bcfg2/lib/python2.4/site-packages/Bcfg2"
-export PATH PYTHONPATH
-
-LOGDIR="/usr/local/var/svlogd/bcfg2-client-ostiary"
-test -d $LOGDIR || mkdir $LOGDIR
-LOG="svlogd -tt $LOGDIR"
-
-case $0 in
-       *-dvqn) bcfg2 -d -v -q -n       | $LOG ;;
-        *-dvn) bcfg2 -d -v -n          | $LOG ;;
-        *-dvq) bcfg2 -d -v -q          | $LOG ;;
-         *-dv) bcfg2 -d -v             | $LOG ;;
-         *-vq) bcfg2 -v -q             | $LOG ;;
-          *-v) bcfg2 -v                | $LOG ;; 
-    *-restart) sv restart bcfg2-client | $LOG ;; 
-            *) printf "ERROR in $0\n"  | $LOG ;; 
-esac
-
-exit 0
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/var/encap/bcfg2-site-RENAME b/encap/src/bcfg2-site/bcfg2-site-RENAME/var/encap/bcfg2-site-RENAME
deleted file mode 100644
index e69de29bb..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/var/encap/bcfg2-site-RENAME
+++ /dev/null
diff --git a/encap/src/bcfg2-site/site-settings.conf-example b/encap/src/bcfg2-site/site-settings.conf-example
deleted file mode 100644
index e7f99cffb..000000000
--- a/encap/src/bcfg2-site/site-settings.conf-example
+++ /dev/null
@@ -1,49 +0,0 @@
-######
-###### Set these variables as appropriate for your site
-######
-####
-#### Site Information
-####
-#set global $ADMIN_NAME = "Local Admin Contact"
-#set global $ADMIN_EMAIL = "tickets@localhost.localdomain.com"
-#set global $SITE_NAME = "localdomain.com"
-## SITE_SHORTNAME should be a single word with no punctuation
-#set global $SITE_SHORTNAME = "localdomain"
-## SITE_VERSION should be the version of this file, starting at 1
-#set global $SITE_VERSION = "1"
-## SITE_FINGERPRINT value, or "" to disable
-#set global $SITE_FINGERPRINT = ""
-####
-#### Paths, Variables, and Passwords
-####
-#set global $SENDMAILPATH = "/usr/sbin/sendmail"
-#set global $BCFG2_SERVER = "config.localdomain.com"
-#set global $BCFG2_PORT = "6"
-#set global $OSTIARY_PORT = "7"
-## How often to run the bcfg2 client, or "0" to disable
-#set global $BCFG2_CLIENT_RUN_INTERVAL_SECONDS = "3600"
-## Initial options for bcfg(1). The bcfg2 client is started with these options 
-## on installation and periodically based on BCFG2_CLIENT_RUN_INTERVAL_SECONDS, 
-## so you probably want to include the "-n" (dry-run mode) flag, unless you
-## already have a good configuration in place. You can then change the config
-## file /usr/local/etc/default/bcfg2-client/env/OPTIONS via the bcfg2 "Cfg"
-## functionality (possibly by kicking off a non-dry from the bcfg2 server using
-## ostiary, or just by running bcfg2 manually on the client) to run in non-dry-
-## run mode.
-#set global $BCFG2_CLIENT_OPTIONS = "-q -v -d -n"
-## Initial options for bcfg2-server(8). Note that bcfg2-server is not fully
-## configured by bcfg2-site; you need to edit /usr/local/etc/bcfg2.conf to 
-## include the "[server]" stanza and appropriate values, as well as a "key ="
-## line in the "[communications]" stanza (see bcfg2 doc for details).
-#set global $BCFG2_SERVER_OPTIONS = "-v"
-## You can set passwords here, and you will not be prompted for them at
-## install time; however you will then have to treat your bcfg2-site
-## distribution as equivalent to the bcfg2 server and ostiary passwords.
-## To be prompted for passwords at install time, make these empty string ("")
-#set global $BCFG2_PASSWORD = ""
-#set global $OSTIARY_PASSWORD = ""
-######
-###### Automatically-set variables - you shouldn't have to touch these.
-######
-#from time import localtime, strftime
-#set global $DATE = strftime("%a %b %d %H:%M:%S %Z %Y", localtime())
diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile
deleted file mode 100644
index 7ebfc294c..000000000
--- a/encap/src/encap-profiles/Makefile
+++ /dev/null
@@ -1,225 +0,0 @@
-# $Id$
-
-.PHONY : test log all install clean distclean uninstall encaps bcfg2only bcfg2bump
-.SUFFIXES :
-.SUFFIXES : .ep .sh .installed .packaged .d
-
-export ENCAP_CONTACT = dclark@pobox.com
-export BASEDIR = /usr/local
-export ENCAPDIR := ${BASEDIR}/encap
-export EPKG := ${BASEDIR}/bin/epkg
-export MKENCAP := ${BASEDIR}/bin/mkencap
-export SHELL = /bin/sh
-srcdir = .
-export EP2TARGET := $(srcdir)/ep2target
-PAGER ?= more
-export PKG_CONFIG_PATH = ${BASEDIR}/lib/bcfg2/lib/pkgconfig
-
-BCFG2 := $(basename $(wildcard bcfg2-[0-9].[0-9]*.ep))
-BCFG2_CHEETAH := $(basename $(wildcard bcfg2-cheetah-[0-9].[0-9]*.ep))
-BCFG2_ELEMENTTREE := $(basename $(wildcard bcfg2-elementtree-*.ep))
-BCFG2_GZIP := $(basename $(wildcard bcfg2-gzip-*.ep))
-BCFG2_M2CRYPTO := $(basename $(wildcard bcfg2-m2crypto-*.ep))
-BCFG2_OPENSSL := $(basename $(wildcard bcfg2-openssl-*.ep))
-BCFG2_PKG_CONFIG := $(basename $(wildcard bcfg2-pkg-config-*.ep))
-BCFG2_PYTHON := $(basename $(wildcard bcfg2-python-[0-9].[0-9]*.ep))
-BCFG2_READLINE := $(basename $(wildcard bcfg2-readline-*.ep))
-BCFG2_SETUPTOOLS := $(basename $(wildcard bcfg2-setuptools-*.ep))
-BCFG2_SWIG := $(basename $(wildcard bcfg2-swig-*.ep))
-BCFG2_ZLIB := $(basename $(wildcard bcfg2-zlib-*.ep))
-M4 := $(basename $(wildcard m4-*.sh))
-MAKESELF := $(basename $(wildcard makeself-*.ep))
-OSTIARTY := $(basename $(wildcard ostiary-[0-9].[0-9]*.ep))
-PATCH := $(basename $(wildcard patch-*.ep))
-RUNIT := $(basename $(wildcard runit-[0-9].[0-9]*.ep))
-
-sources_ep := $(sort $(BCFG2) $(BCFG2_CHEETAH) $(BCFG2_ELEMENTTREE) $(BCFG2_GZIP) $(BCFG2_M2CRYPTO) $(BCFG2_OPENSSL) $(BCFG2_PKG_CONFIG) $(BCFG2_PYTHON) $(BCFG2_READLINE) $(BCFG2_SETUPTOOLS) $(BCFG2_SWIG) $(BCFG2_ZLIB) $(MAKESELF) $(OSTIARTY) $(PATCH) $(RUNIT))
-
-sources_sh := $(M4)
-
-# Only compile bcfg2-python-apt on known Debian and Ubuntu 
-# systems (as python-apt is distribution-specific)
-UNAME := $(shell uname)
-
-ifeq ($(UNAME),Linux)
-DISTRO := $(shell cat /etc/issue | grep ^[a-zA-Z] | head -1)
-UNAMEM := $(shell uname -m)
-endif
-
-ifeq ($(DISTRO),Debian GNU/Linux 3.1 \n \l)
-BCFG2_PYTHON_APT = bcfg2-python-apt-0.5.10
-OS = linux_debian_sarge
-endif
-
-ifeq ($(DISTRO),Debian GNU/Linux 4.0 \n \l)
-BCFG2_PYTHON_APT = bcfg2-python-apt-0.6.19
-OS = linux_debian_etch
-endif
-
-ifeq ($(DISTRO),Debian GNU/Linux testing/unstable \n \l)
-BCFG2_PYTHON_APT = bcfg2-python-apt-0.6.19
-OS = linux_debian_sid
-endif
-
-ifeq ($(DISTRO),Ubuntu 6.06.1 LTS \n \l)
-BCFG2_PYTHON_APT = bcfg2-python-apt-0.6.16.2ubuntu8
-OS = linux_ubuntu_dapper
-endif
-
-ifeq ($(DISTRO),Red Hat Linux release 6.0 (Hedwig))
-OS = linux_redhat_60
-endif
-
-ifeq ($(DISTRO),Red Hat Linux release 7.2 (Enigma))
-OS = linux_redhat_72
-endif
-
-ifeq ($(DISTRO),Red Hat Enterprise Linux AS release 4 (Nahant Update 4))
-OS = linux_redhat_rhel4
-endif
-
-ifeq ($(DISTRO),Red Hat Enterprise Linux AS release 4 (Nahant Update 5))
-OS = linux_redhat_rhel4
-endif
-
-ifeq ($(DISTRO),Welcome to SuSE SLES 8 (powered by UnitedLinux 1.0) (i586))
-OS = linux_suse_sles8
-endif
-
-ifeq ($(DISTRO),Welcome to SUSE Linux Enterprise Server 10 (i586) - Kernel \r (\l).)
-OS = linux_suse_sles10
-endif
-
-ifeq ($(DISTRO),Welcome to SUSE Linux Enterprise Server 10 (x86_64) - Kernel \r (\l).)
-OS = linux_suse_sles10
-endif
-
-ifdef BCFG2_PYTHON_APT
-sources_ep += $(BCFG2_PYTHON_APT)
-endif
-
-## Get ARCH for GNU/Linux distributions...
-ARCH = ix86
-ifeq ($(UNAMEM),x86_64)
-ARCH = x86_64
-endif
-
-## Finally, set PLATFORM for GNU/Linux distributions...
-PLATFORM =  
-ifeq ($(UNAME),Linux)
-PLATFORM = -p ${ARCH}-${OS}
-endif
-
-export MKENCAPCMD := ${BASEDIR}/bin/mkencap $(PLATFORM)
-
-# List of all sources...
-sources := $(sort $(sources_ep) $(sources_sh))
-
-%.installed : %.ep # Clean, compile and install an encap package
-	@printf "***** START .ep.installed for |$*| ***** \n"
-	-$(EPKG) -q -r $(ENCAPDIR)/$*
-	-rm -rf $(ENCAPDIR)/$*
-	-$(MKENCAPCMD) -m /usr/local/bin/m4 -b -DUP $(srcdir)/$*.ep > ./$*.log 2>&1
-	-$(MKENCAPCMD) -m /usr/local/bin/m4 -b -T $(srcdir)/$*.ep >> ./$*.log 2>&1
-	$(MKENCAPCMD) -m /usr/local/bin/m4 -b -CBI $(srcdir)/$*.ep >> ./$*.log 2>&1
-	$(EPKG) -q -i $(ENCAPDIR)/$*
-	test -h $(BASEDIR)/var/encap/$*
-	touch ./$*.installed
-	@printf "***** STOP .ep.installed for |$*| ***** \n"
-
-%.installed : %.sh # Create and install a "fake" encap package
-	@printf "***** START .sh.installed for |$*| ***** \n"
-	-$(EPKG) -q -r $(ENCAPDIR)/$*
-	-rm -rf $(ENCAPDIR)/$*
-	chmod 755 $(srcdir)/$*.sh && $(srcdir)/$*.sh
-	$(EPKG) -q -i $(ENCAPDIR)/$*
-	test -h $(BASEDIR)/var/encap/$*
-	touch ./$*.installed
-	@printf "***** STOP .sh.installed for |$*| ***** \n"
-
-%.packaged : %.installed # Create .tar.gz encap packages
-	@printf "***** START .installed.packaged for |$*| ***** \n"
-	-rm $(ENCAPDIR)/$*-*.tar.gz
-	-(cd $(ENCAPDIR) && $(MKENCAPCMD) -ef $*)
-	-(cd $(ENCAPDIR) && $(MKENCAPCMD) -c $*)
-	mv $(ENCAPDIR)/$*-encap-*.tar.gz ./
-	touch ./$*.packaged
-	@printf "***** STOP .installed.packaged for |$*| ***** \n"
-
-%.d : %.ep # Create dependancy files from .ep files
-	@printf "***** START .d.ep for |$*| ***** \n"
-	chmod 755 $(EP2TARGET) && $(EP2TARGET) $< > $@
-	@printf "***** STOP .d.ep for |$*| ***** \n"
-
-%.d : %.sh # Create dependancy files from .sh files
-	@printf "***** START .d.sh for |$*| ***** \n"
-	chmod 755 $(EP2TARGET) && $(EP2TARGET) $< > $@
-	@printf "***** STOP .d.sh for |$*| ***** \n"
-
-log :
-	( $(MAKE) install > ./make.log 2>&1 \
-	&& $(MAKE) encaps >> ./make.log 2>&1 ) &
-
-all : install encaps
-
-.DELETE_ON_ERROR : # delete the target of a rule if it has changed and its
-                   # commands exit with a nonzero exit status
-
-install : $(EPKG) $(MKENCAP) $(EP2TARGET) $(M4).installed $(addsuffix .installed,$(sources))
-
-encaps : $(EPKG) $(MKENCAP) $(EP2TARGET) $(addsuffix .packaged,$(sources))
-
-clean :
-	-(rm ./*.log; rm ./*.packaged; rm ./*.gz; rm ./*~)
-
-distclean : clean
-	-rm ./*.d
-
-uninstall : distclean
-	-(find $(BASEDIR)/lib/bcfg2 | grep "\.pyc" | xargs -n1 rm)
-	-(ENCAPS="m4 patch runit makeself ostiary bcfg2"; \
-	for ENCAP in $${ENCAPS}; do \
-		$(EPKG) -q -r $(ENCAPDIR)/$${ENCAP}-*; \
-		rm -rf $(ENCAPDIR)/$${ENCAP}-*; \
-		rm ./$${ENCAP}-*.installed; \
-	done)
-	-rm -rf  $(BASEDIR)/lib/bcfg2
-
-bcfg2only :
-	$(MAKE) -t; sleep 2; touch $(srcdir)/$(BCFG2).ep; $(MAKE)
-
-bcfg2bump :
-	@if [ "$(NEW)x" != "x" ]; then NEW="$(NEW)"; fi && \
-	if [ "$(OLD)x" != "x" ]; then OLD="$(OLD)"; fi && \
-	if [ "$(FORCE)x" != "x" ]; then FORCE="$(FORCE)"; fi && \
-	if [ "$${OLD}x" != "x" -a "$${NEW}x" != "x" ]; then \
-	OLDBASE="`printf "%s\n" "$${OLD}" | sed 's:\.ep::g'`"; \
-	NEWBASE="`printf "%s\n" "$${NEW}" | sed 's:\.ep::g'`"; \
-		if [ "$${FORCE}x" != "yesmamx" ]; then \
-			printf "About to 'svn mv %s %s'\n" "$$OLD" "$$NEW"; \
-			printf "\tand edit the later as appropriate.\n"; \
-			printf "And then 'rm %s%s'...\n" "$$OLDBASE" ".*"; \
-			printf "Press 'return' to continue, or 'ctrl-c' to exit. "; \
-			read THROWAWAY; \
-		fi; \
-		svn mv $${OLD} $${NEW} && \
-		sed s:$${OLDBASE}:$${NEWBASE}:g $${NEW} > $${NEW}.tmp && \
-		mv $${NEW}.tmp $${NEW} && \
-		rm $${OLDBASE}.*; \
-		printf "Changes to %s are:\n" "$${NEW}"; \
-		if [ "$${FORCE}x" != "yesmamx" ]; then \
-			svn diff $${NEW} | $(PAGER); \
-			printf "'svn commit %s %s -m \"EncapPackages: Bumped bcfg2 .ep version to %s\"'? \n" "$${OLD}" "$${NEW}" "$${NEW}"; \
-			printf "Press 'return' to commit, or 'ctrl-c' to exit. "; \
-			read THROWAWAY; \
-		else \
-			svn diff $${NEW}; \
-		fi; \
-		svn commit $${OLD} $${NEW} -m "EncapPackages: Bumped bcfg2 .ep version to $${NEW}"; \
-	else \
-		printf "Set the OLD, NEW (and optionally FORCE) environment "; \
-		printf "variables. Example:\n"; \
-		printf "\tOLD=bcfg2-0.8.3pre5.ep NEW=bcfg2-0.8.3.ep $(MAKE) bcfg2bump\n";\
-	fi
-
-include $(addsuffix .d,$(sources))
diff --git a/encap/src/encap-profiles/bcfg2-0.9.5pre2.ep b/encap/src/encap-profiles/bcfg2-0.9.5pre2.ep
deleted file mode 100644
index 7e5411a70..000000000
--- a/encap/src/encap-profiles/bcfg2-0.9.5pre2.ep
+++ /dev/null
@@ -1,520 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<!-- To make this work with a new version of bcfg2, first do a "svn mv" -->
-<!-- of this file to the new version name, and then do a global search- -->
-<!-- replace of the version with the new version (i.e. search for       -->
-<!-- "0.8.3pre3" and replace with "0.8.3") - DO NOT DO IT MANUALLY,     -->
-<!-- the version string is referenced by some of the included files.    -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-0.9.5pre2"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="patch-2.5.9" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-elementtree-1.2.6" />
-<prereq package="bcfg2-m2crypto-0.17" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/bcfg/bcfg2-0.9.5pre2.tar.gz
-     http://mirror.opensysadmin.com/bcfg/bcfg2-0.9.5pre2.tar.gz
-     ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-0.9.5pre2.tar.gz"
->
-
-<patch options="-p1"><![CDATA[
-Index: bcfg2/src/lib/Client/XML.py
-===================================================================
---- bcfg2/src/lib/Client/XML.py	(revision 2876)
-+++ bcfg2/src/lib/Client/XML.py	(working copy)
-@@ -4,23 +4,12 @@
- # library will use lxml, then builtin xml.etree, then ElementTree
- 
- try:
--    from lxml.etree import Element, SubElement, XML, tostring
--    from lxml.etree import XMLSyntaxError as ParseError
--    driver = 'lxml'
-+    from elementtree.ElementTree import Element, SubElement, XML, tostring
-+    from xml.parsers.expat import ExpatError as ParseError
-+    driver = 'etree'
- except ImportError:
--    # lxml not available 
--    try:
--        from xml.etree.ElementTree import Element, SubElement, XML, tostring
--        from xml.parsers.expat import ExpatError as ParseError
--        driver = 'etree-py'
--    except ImportError:
--        try:
--            from elementtree.ElementTree import Element, SubElement, XML, tostring
--            from xml.parsers.expat import ExpatError as ParseError
--            driver = 'etree'
--        except ImportError:
--            print "Failed to load lxml, xml.etree and elementtree.ElementTree"
--            print "Cannot continue"
--            raise SystemExit, 1
-+    print "Failed to load elementtree.ElementTree"
-+    print "Cannot continue"
-+    raise SystemExit, 1
- 
- len([Element, SubElement, XML, tostring, ParseError])
-]]></patch>
-
-<configure type="unset" />
-
-<build>
-/usr/local/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install>
-
-<clean>
-/usr/local/bin/b2-python setup.py clean
-</clean>
-
-</source>
-
-<prepackage type="set"><![CDATA[
-# Make binaries available from /usr/local/bin
-test -d bin || mkdir bin
-for FILE in `ls lib/bcfg2/bin`; do \
-    ln -sf ../lib/bcfg2/bin/${FILE} bin/${FILE}; \
-    if [ ! "`printf "${FILE}" | cut -c 1-5`x" = "bcfg2x" ]; then \
-        ln -sf ../lib/bcfg2/bin/${FILE} bin/b2-${FILE}; \
-    fi; \
-done
-# Make doc available from /usr/local/share/doc/bcfg2
-test -d share || mkdir share
-test -d share/doc || mkdir share/doc
-test -d share/doc/bcfg2 || mkdir share/doc/bcfg2
-(cp ${builddir}/doc/manual.pdf share/doc/bcfg2/ || true)
-cp -r ${builddir}/examples share/doc/bcfg2/
-# Make man pages available from /usr/local/man
-mv lib/bcfg2/share/man .
-# Make tools dirs and copy over tools
-test -d lib/bcfg2/tools || mkdir lib/bcfg2/tools
-cp ${builddir}/tools/* lib/bcfg2/tools/
-test -d sbin || mkdir sbin
-test -d share/doc/bcfg2/tools || mkdir share/doc/bcfg2/tools
-# Makes tools with #! line executable
-for FILE in `ls lib/bcfg2/tools`; do \
-	F="lib/bcfg2/tools/${FILE}"; \
-    if [ "`head -1 ${F} | grep ^#\!/`x" != "x" ]; then \
-        chmod 755 ${F} ; \
-	fi; \
-done
-# Make executable tools available from /usr/local/sbin, and nonexecutable 
-# tools/tools doc available from /usr/local/share/doc/bcfg2/tools
-for FILE in `ls lib/bcfg2/tools`; do \
-    F="lib/bcfg2/tools/${FILE}"; \
-    if [ -x ${F} ]; then \
-        ln -sf ../lib/bcfg2/tools/${FILE} sbin/b2-example-tool-${FILE}; \
-	else \
-		ln -sf ../../../../lib/bcfg2/tools/${FILE} share/doc/bcfg2/tools/${FILE}; \
-    fi; \
-done
-# runit stuff
-test -d var || mkdir var
-test -d etc || mkdir etc
-test -d etc/sv || mkdir etc/sv
-test -d etc/sv/bcfg2-client || mkdir etc/sv/bcfg2-client
-test -d etc/sv/bcfg2-client/log || mkdir etc/sv/bcfg2-client/log
-test -d etc/sv/bcfg2-server || mkdir etc/sv/bcfg2-server
-test -d etc/sv/bcfg2-server/log || mkdir etc/sv/bcfg2-server/log
-# Make "this encap is installed" sentinal file available in /usr/local/var/encap
-test -d  var/encap || mkdir var/encap
-touch var/encap/${ENCAP_PKGNAME}
-]]></prepackage>
-
-<include_file name="b2-regexplace.py" mode="0755"><![CDATA[
-#!/usr/local/bin/b2-python
-
-# regexplace: regular expression search and replace
-# Stefano Spinucci
-# 2006-02-07 (rev 4)
-# Daniel Clark
-# 2006-08-03 (modified for bcfg2 encap use)
-# thanks to roadrunner.py
-# http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52553
-# for some ideas and some code
-# tested with python 2.4.4
-
-import sys, os, re, string
-
-# pupulate and return 'fileslist[]' with all files inside 'dir' matching 'regx'
-def make_files_list(dir, regx):
-
-    # if dir is not a directory, exit with error
-    if not os.path.isdir(dir):
-        sys.exit(dir + ' is not a valid dir to walk !!!')
-
-    # compile the search regexp
-    cregex=re.compile(regx)
-
-    # initialize the file list
-    fileslist = []
-
-    # loop on all files and select files matching 'regx'
-    # don't include symbolic links
-    for root, dirs, files in os.walk(dir):
-        for name in files:
-            if cregex.search(name) and name not in ("b2-regexplace.sh", "b2-regexplace.py", "postinstall", "postinstall.log", "bcfg2-0.9.5pre2.ep"):
-                path = os.path.join(root, name)
-                if not os.path.islink(path):
-                    fileslist.append(path)
-
-    # return the file list
-    return fileslist[:]
-
-# in all files in 'fileslist' search the regexp 'searchregx' and replace
-# with 'replacestring'; real substitution in files only if 'simulation' = 0
-def replace_in_files(fileslist, searchregx, replacestring, simulation):
-
-    # compile regexp
-    cregex=re.compile(searchregx)
-    
-    # loop on all files
-    for xfile in fileslist:
-
-        # initialize the replace flag
-        replaceflag=0
-
-        # open file for read  
-        readlines=open(xfile,'r').readlines()
-        # intialize the list counter
-        listindex = -1
-
-        # search and replace in current file printing to the user changed lines
-        for currentline in readlines:
-
-            # increment the list counter
-            listindex = listindex + 1
-
-            # if the regexp is found
-            if cregex.search(currentline):
-
-                # make the substitution
-                f=re.sub(searchregx,replacestring,currentline)
-
-                # print the current filename, the old string and the new string
-                print '\n' + xfile
-                print '- ' + currentline ,
-                if currentline[-1:]!='\n': print '\n' ,
-                print '+ ' + f ,
-                if f[-1:]!='\n': print '\n' ,
-
-                # if substitution is real
-                if simulation == 0:
-
-                    # update the whole file variable ('readlines')
-                    readlines[listindex] = f
-                    replaceflag=1
-                            
-        # if some text was replaced
-        # overwrite the original file
-        if replaceflag==1:
-
-            # open the file for writting  
-            write_file=open(xfile,'w') 
-
-            # overwrite the file  
-            for line in readlines:
-                write_file.write(line)
-
-            # close the file
-            write_file.close()
-
-# main function
-def main():
-
-    # if parameters are wrong, exit with error
-    if len(sys.argv) < 5:
-
-        print 'Usage: regexplace.py dirname files-regexp search-regexp replace-string'
-
-        sys.exit(1)
-
-    # make the file list
-    fileslist = make_files_list(sys.argv[1], sys.argv[2])
-
-    # real execution
-    replace_in_files(fileslist, sys.argv[3], sys.argv[4], 0)        
-
-    # simulated execution
-    #replace_in_files(fileslist, sys.argv[3], sys.argv[4], 1)
-                
-            
-if __name__ == '__main__':
-    main()
-]]></include_file>
-
-<include_file name="b2-regexplace.sh" mode="0755"><![CDATA[
-#!/bin/sh
-
-# This fixes paths for the bcfg2 encap packaging.
-
-BASEDIR="`echo ${0} | xargs -n1 dirname`"
-REGEXPLACE="${BASEDIR}/b2-regexplace.py"
-PYTHON="/usr/local/bin/b2-python"
-BINARIES="${REGEXPLACE} ${PYTHON}"
-COMPILEALL="/usr/local/lib/bcfg2/lib/python2.4/compileall.py"
-
-printf "**** Running postinstall with BASEDIR=|${BASEDIR}|...\n"
-for BINARY in ${BINARIES}; do
-    if [ ! -x ${BINARY} ]; then
-        printf "\nERROR: ${BINARY} is not executable, exiting...\n"
-        exit 1
-    fi
-done
-
-for FILE in ${COMPILEALL}; do
-    if [ ! -f ${FILE} ]; then
-        printf "\nERROR: ${FILE} does not exist, exiting...\n"
-        exit 1
-    fi
-done
-
-# Do not run more than once; it does not converge.
-# (/usr/local/usr/local/bcfg2.conf bug)
-if [ "${1}x" != "firstx" ]; then
-    printf "\nb2-regexplace.sh: Already ran\n\t${BASEDIR}/b2-regexplace.sh, not running again...\n"
-    exit 0
-fi
-
-printf "\nRemoving bcfg2 .pyc files...\n"
-find ${BASEDIR} -type f | grep "\.pyc$" | xargs -n1 rm
-
-printf "\nFixing bcfg2 paths...\n"
-
-printf "\nReplacing \"/etc/bcfg2.conf\" with \"/usr/local/etc/bcfg2.conf\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* \/etc\/bcfg2.conf \/usr\/local\/etc\/bcfg2.conf
-
-printf "\nReplacing \"/local/sbin/epkg\" with \"/usr/local/bin/epkg\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* \/local\/sbin\/epkg \/usr\/local\/bin\/epkg
-
-printf "\nReplacing \"/usr/share/bcfg2\" with \"/usr/local/lib/bcfg2/share/bcfg2\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* \/usr\/share\/bcfg2\/ \/usr\/local\/lib\/bcfg2\/share\/bcfg2\/
-
-printf "\nReplacing \"/var/lib/bcfg2\" with \"/usr/local/var/lib/bcfg2\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* \/var\/lib\/bcfg2 \/usr\/local\/var\/lib\/bcfg2
-
-printf "\nReplacing \"prefix = '/usr'\" with \"prefix = '/usr/local/lib/bcfg2'\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* prefix\ =\ \'\/usr\' prefix\ =\ \'/usr/local/lib/bcfg2\'
-
-printf "\nReplacing \"xmllint\" with \"/usr/local/bin/b2-xmllint\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* xmllint \/usr\/local\/bin\/b2-xmllint
-
-printf "\nReplacing \"#!/usr/bin/env python\" with "
-printf "\"#!/usr/local/bin/b2-python\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/env\ python \#\!\/usr\/local\/bin\/b2-python
-
-printf "\nReplacing \"#!/usr/bin/perl\" with \"#!/usr/bin/env perl\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/perl \#\!\/usr\/bin\/env\ perl
-
-printf "\nReplacing \"#!/usr/bin/python\" with "
-printf "\"#!/usr/local/bin/b2-python\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/python \#\!\/usr\/local\/bin\/b2-python
-
-# For some reason this causes TLSSocketServerMixIn.py to be replaced with the contents of 
-# TLSSocketServerMixIn.pyc , which breaks things. Should figure out why and fix this for
-# improved performance as soon as possible (TODO/FIXME).
-#printf "\nCreating bcfg2 .pyc files...\n"
-#${PYTHON} ${COMPILEALL} ${BASEDIR}
-
-exit 0
-]]></include_file>
-
-<include_file name="etc/sv/bcfg2-client/bcfg2-client.sh" mode="0755"><![CDATA[
-#!/bin/sh
-
-# note: variables provided from environment with chpst -e:
-#       /usr/local/etc/default/bcfg2-client/env/OPTIONS
-#       /usr/local/etc/default/bcfg2-client/env/RUN_INTERVAL_SECONDS
-
-ENVDIR="/usr/local/etc/default/bcfg2-client/env"
-PYTHONPATH="/usr/local/lib/bcfg2/lib/python2.4:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/local/lib/bcfg2/lib/python2.4/site-packages/Bcfg2"
-export ENVDIR PYTHONPATH
-
-# make sure we have options
-if [ ! -f ${ENVDIR}/OPTIONS ]; then
-    printf "WARNING: ${ENVDIR}/OPTIONS\n"
-    printf "WARNING: does not exist. Using default of \"-q -v -d -n\"\n"
-    OPTIONS="-q -v -d -n"
-fi
-
-# make sure we have a sleep variable
-if [ "${RUN_INTERVAL_SECONDS}x" = "x" ]; then
-    printf "WARNING: ${ENVDIR}/RUN_INTERVAL_SECONDS\n"
-    printf "WARNING: does not exist or has no value.\n"
-    printf "WARNING: Using default of 3600 seconds between runs.\n"
-    RUN_INTERVAL_SECONDS=3600
-fi
-
-# Run bcfg2 and then sleep (runsv takes care of starting up script
-# again after it exits). Need to exec sleep so runit can exit
-# cleanly while the sleep is in progress; see:
-# http://comments.gmane.org/gmane.comp.sysutils.supervision.general/1373
-# for more information on why this is required (short reason: runit is
-# more anal about making sure things are logged than daemontools)
-printf "*** starting /usr/local/bin/bcfg2 ${OPTIONS} ...\n"
-/usr/local/bin/bcfg2 ${OPTIONS}
-printf "*** sleeping ${RUN_INTERVAL_SECONDS} seconds ...\n"
-exec sleep ${RUN_INTERVAL_SECONDS}
-]]></include_file>
-
-<include_file name="etc/sv/bcfg2-client/run" mode="0755"><![CDATA[
-#!/bin/sh
-exec 2>&1
-printf "*** exec /usr/local/bin/chpst -e /usr/local/etc/default/bcfg2-client/env ./bcfg2-client.sh ...\n"
-exec /usr/local/bin/chpst -e /usr/local/etc/default/bcfg2-client/env ./bcfg2-client.sh
-]]></include_file>
-
-<include_file name="etc/sv/bcfg2-client/log/run" mode="0755"><![CDATA[
-#!/bin/sh
-exec 2>&1
-exec /usr/local/bin/svlogd -tt /usr/local/var/svlogd/bcfg2-client
-]]></include_file>
-
-<include_file name="etc/sv/bcfg2-server/run" mode="0755"><![CDATA[
-#!/bin/sh
-exec 2>&1
-/usr/local/bin/chpst -e /usr/local/etc/default/bcfg2-server/env /bin/sh -c '\
-    printf "*** exec /usr/local/bin/bcfg2-server ${OPTIONS} ...\n"'
-exec /usr/local/bin/chpst -e /usr/local/etc/default/bcfg2-server/env /bin/sh -c '\
-    exec /usr/local/bin/bcfg2-server ${OPTIONS}'
-]]></include_file>
-
-<include_file name="etc/sv/bcfg2-server/log/run" mode="0755"><![CDATA[
-#!/bin/sh
-exec 2>&1
-exec /usr/local/bin/svlogd -tt /usr/local/var/svlogd/bcfg2-server
-]]></include_file>
-
-<include_file name="postinstall" mode="0755"><![CDATA[
-#!/bin/sh
-BASEDIR="`echo ${0} | xargs -n1 dirname`"
-SVLOGD="/usr/local/var/svlogd"
-DEFAULT="/usr/local/etc/default"
-
-# Fix paths
-if [ ! -f ${BASEDIR}/postinstall.log ]; then
-    test -x ${BASEDIR}/b2-regexplace.sh || exit 1
-    ${BASEDIR}/b2-regexplace.sh first > ${BASEDIR}/postinstall.log 2>&1 3>&1
-else
-    printf "\npostinstall: already ran\n\t${BASEDIR}/b2-regexplace.sh, not running again...\n" >> ${BASEDIR}/postinstall.log
-fi
-
-# Make sure log directories exist
-test -d /usr/local/var || mkdir /usr/local/var
-test -d $SVLOGD || mkdir $SVLOGD
-test -d $SVLOGD/bcfg2-client || mkdir $SVLOGD/bcfg2-client
-test -d $SVLOGD/bcfg2-server || mkdir $SVLOGD/bcfg2-server
-
-# Make sure environment directories exist
-test -d /usr/local/etc || mkdir /usr/local/etc
-test -d $DEFAULT || mkdir $DEFAULT
-test -d $DEFAULT/bcfg2-client || mkdir $DEFAULT/bcfg2-client
-test -d $DEFAULT/bcfg2-client/env || mkdir $DEFAULT/bcfg2-client/env
-test -d $DEFAULT/bcfg2-server || mkdir $DEFAULT/bcfg2-server
-test -d $DEFAULT/bcfg2-server/env || mkdir $DEFAULT/bcfg2-server/env
-
-# Put in default client environment if it didn't exist
-if [ ! -f $DEFAULT/bcfg2-client/.SENTINEL ]; then
-    touch $DEFAULT/bcfg2-client/.SENTINEL
-    echo "-q -v -d -n" > $DEFAULT/bcfg2-client/env/OPTIONS
-    echo "3600" > $DEFAULT/bcfg2-client/env/RUN_INTERVAL_SECONDS
-fi
-
-# Put in default server environment if it didn't exist
-if [ ! -f $DEFAULT/bcfg2-server/.SENTINEL ]; then
-    touch $DEFAULT/bcfg2-server/.SENTINEL
-    echo "-v" > $DEFAULT/bcfg2-server/env/OPTIONS
-fi
-]]></include_file>
-
-<include_file name="preremove" mode="0755"><![CDATA[
-#!/bin/sh
-
-printf "Running bcfg2 preremove script...\n"
-date
-
-if [ -h /usr/local/var/service/bcfg2-client ]; then
-    printf "INFO: Removing /usr/local/var/service/bcfg2-client...\n"
-    rm /usr/local/var/service/bcfg2-client
-fi
-
-if [ -h /usr/local/var/service/bcfg2-server ]; then
-    printf "INFO: Removing /usr/local/var/service/bcfg2-server...\n"
-    rm /usr/local/var/service/bcfg2-server
-fi
-
-printf "Finished bcfg2 preremove script.\n"
-]]></include_file>
-
-<encapinfo>
-description Bcfg2 - Provides a declarative interface to system configuration
-prereq pkgspec >= bcfg2-python-2.4.4
-prereq pkgspec >= bcfg2-elementtree-1.2.6
-prereq pkgspec >= bcfg2-m2crypto-0.17
-</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
deleted file mode 100644
index f58d82374..000000000
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
+++ /dev/null
@@ -1,105 +0,0 @@
-<?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" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/bin/b2-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/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install> 
-
-<clean>
-/usr/local/bin/b2-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-elementtree-1.2.6.ep b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
deleted file mode 100644
index e91fe8443..000000000
--- a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-    pkgspec="bcfg2-elementtree-1.2.6"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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
-
-<source
-url="http://encapsrcdist/mirror/elementtree/elementtree-1.2.6-20050316.tar.gz
-http://mirror.opensysadmin.com/elementtree/elementtree-1.2.6-20050316.tar.gz
-http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz"
->
-
-<configure type="unset" />
-
-<build>
-/usr/local/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install>
-
-<clean>
-/usr/local/bin/b2-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 elementtree - Light-weight toolkit for XML processing
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep b/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
deleted file mode 100644
index efeba8822..000000000
--- a/encap/src/encap-profiles/bcfg2-gzip-1.2.4b.ep
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-gzip-1.2.4b"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="patch-2.5.9" />
-<prereq package="bcfg2-pkg-config-0.22" />
-
-<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/gzip/gzip-1.2.4a.tar.gz
-     http://mirror.opensysadmin.com/gzip/gzip-1.2.4a.tar.gz
-     ftp://ftp.gnu.org/gnu/gzip/gzip-1.2.4a.tar.gz"
->
-
-<patch options="-p1"><![CDATA[
---- gzip-1.2.4/gzip.c	Thu Aug 19 15:39:43 1993
-+++ gzip-1.2.4b/gzip.c	Tue Jan  8 21:44:18 2002
-@@ -1005,7 +1005,14 @@
- #ifdef NO_MULTIPLE_DOTS
-     char *dot; /* pointer to ifname extension, or NULL */
- #endif
-+    int max_suffix_len = (z_len > 3 ? z_len : 3);
- 
-+    /* Leave enough room in ifname or ofname for suffix: */
-+    if (strlen(iname) >= sizeof(ifname) - max_suffix_len) {
-+        strncpy(ifname, iname, sizeof(ifname) - 1);
-+	/* last byte of ifname is already zero and never overwritten */
-+        error("file name too long");
-+    }
-     strcpy(ifname, iname);
- 
-     /* If input file exists, return OK. */
-]]></patch>
-
-<configure>
-./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2"
-</configure>
-
-<install type="prepend">
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install>
-
-</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 gzip - The GNU compression utility
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
deleted file mode 100644
index 6b7fb0481..000000000
--- a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-  profile_ver="1.0"
-  pkgspec="bcfg2-m2crypto-0.17"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<prereq package="bcfg2-openssl-0.9.8e" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-swig-1.3.31" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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 -L/usr/local/lib -R/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib"
-PLATFORM_ELSE
-PLATFORM_ENDIF
-        type="set"
-/>
-
-<environment
-        variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include/openssl -I/usr/local/lib/bcfg2/include"
-        type="set"
-/>
-
-<source
-url="http://encapsrcdist/mirror/m2crypto/m2crypto-0.17.tar.gz
-     http://mirror.opensysadmin.com/m2crypto/m2crypto-0.17.tar.gz
-     http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-0.17.tar.gz"
->
-
-<configure>
-/usr/local/bin/b2-python setup.py build_ext \
---openssl=/usr/local/lib/bcfg2 \
--I/usr/local/lib/bcfg2/include/openssl \
--I/usr/local/lib/bcfg2/include \
--L/usr/local/lib/bcfg2/lib/
-</configure>
-
-<build>
-/usr/local/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
-</install>
-
-<clean>
-/usr/local/bin/b2-python setup.py 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 m2crypto - a crypto and SSL toolkit for Python
-exclude lib/bcfg2/lib/python2.4/site-packages/site.py
-exclude lib/bcfg2/lib/python2.4/site-packages/site.pyc
-exclude lib/bcfg2/lib/python2.4/site-packages/easy-install.pth
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep b/encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep
deleted file mode 100644
index ebcd16408..000000000
--- a/encap/src/encap-profiles/bcfg2-openssl-0.9.8e.ep
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-openssl-0.9.8e"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.22" />
-
-<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"
-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/openssl/openssl-0.9.8e.tar.gz
-     http://mirror.opensysadmin.com/openssl/openssl-0.9.8e.tar.gz
-     http://www.openssl.org/source/openssl-0.9.8e.tar.gz"
-	use_objdir="no"
->
-
-<configure>
-if [ -f config.orig ]; then cp config.orig config; fi
-cat config | sed s:CC\=ccc:CC\=gcc:g | sed s:CC\=cc:CC\=gcc:g > config.bcfg2
-mv config config.orig
-cp config.bcfg2 config
-chmod 755 config
-./config \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-	zlib-dynamic shared no-asm \
-	-L/usr/local/lib/bcfg2/lib \
-	-I/usr/local/lib/bcfg2/include
-</configure>
-
-<build type="append">
-    ${MAKE} test || true
-</build>
-
-</source>
-
-<prepackage>
-# Put source back to pristine state
-rm ${builddir}/config
-cp ${builddir}/config.orig ${builddir}/config
-chmod 755 ${builddir}/config
-# Make man pages available from /usr/local/lib/bcfg2/man
-mv lib/bcfg2/ssl/man lib/bcfg2/
-# Other stuff...
-test -d bin || mkdir bin
-ln -sf ../lib/bcfg2/bin/openssl bin/b2-openssl
-# 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 openssl - SSL encryption tool and library
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-pkg-config-0.22.ep b/encap/src/encap-profiles/bcfg2-pkg-config-0.22.ep
deleted file mode 100644
index 58b621b93..000000000
--- a/encap/src/encap-profiles/bcfg2-pkg-config-0.22.ep
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-pkg-config-0.22"
->
-
-<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.22.tar.gz
-     http://mirror.opensysadmin.com/pkg-config/pkg-config-0.22.tar.gz
-     http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.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-python-2.4.4.ep b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
deleted file mode 100644
index ea768cb25..000000000
--- a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<!-- On AIX 4.3.3 you need GNU binutils installed (from the IBM RPM) -->
-
-<encap_profile
-  profile_ver="1.0"
-  pkgspec="bcfg2-python-2.4.4"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="patch-2.5.9" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-gzip-1.2.4b" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<prereq package="bcfg2-readline-5.2" />
-
-<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_IF_MATCH(aix4.3.3)
-    value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/linux/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(aix4.3.3)
-        value="-L/usr/local/lib/bcfg2/lib -L/usr/local/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/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 -L/usr/local/lib -R/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib"
-PLATFORM_ELSE
-PLATFORM_ENDIF
-        type="set"
-/>
-
-<environment
-        variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include"
-        type="set"
-/>
-
-PLATFORM_IF_MATCH(aix4.3.3)
-<environment
-        variable="NM"
-        value="/usr/linux/bin/nm"
-        type="set"
-/>
-PLATFORM_ELSE
-PLATFORM_ENDIF
-
-<source
-url="http://encapsrcdist/mirror/python/Python-2.4.4.tgz
-     http://mirror.opensysadmin.com/python/Python-2.4.4.tgz
-     http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tgz"
->
-
-<patch options="-p0"><![CDATA[
---- setup.py	2007-06-24 18:48:21.000000000 -0400
-+++ setup.py	2007-06-24 19:25:26.000000000 -0400
-@@ -355,22 +355,6 @@
-         # static Unicode character database
-         if have_unicode:
-             exts.append( Extension('unicodedata', ['unicodedata.c']) )
--        # access to ISO C locale support
--        data = open('pyconfig.h').read()
--        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
--        if m is not None:
--            locale_libs = ['intl']
--        else:
--            locale_libs = []
--        if platform == 'darwin':
--            locale_extra_link_args = ['-framework', 'CoreFoundation']
--        else:
--            locale_extra_link_args = []
--
--
--        exts.append( Extension('_locale', ['_localemodule.c'],
--                               libraries=locale_libs,
--                               extra_link_args=locale_extra_link_args) )
-
-         # Modules with some UNIX dependencies -- on by default:
-         # (If you have a really backward UNIX, select and socket may not be
-]]></patch>
-
-<patch options="-p0" from_dir="Lib"><![CDATA[
---- site.py	2007-06-21 22:26:29.000000000 -0400
-+++ site.py	2007-06-21 22:26:55.000000000 -0400
-@@ -170,7 +170,7 @@
-
- def addsitepackages(known_paths):
-     """Add site-packages (and possibly site-python) to sys.path"""
--    prefixes = [sys.prefix]
-+    prefixes = ['/usr/local/lib/bcfg2', sys.prefix]
-     if sys.exec_prefix != sys.prefix:
-         prefixes.append(sys.exec_prefix)
-     for prefix in prefixes:
-
-]]></patch>
-
-<configure>
-if [ -f setup.py.orig ]; then cp setup.py.orig setup.py; fi
-cat setup.py \
-| sed s:\/usr\/local\/:\/usr\/local\/lib\/bcfg2\/:g \
-> setup.py.bcfg2
-mv setup.py setup.py.orig
-cp setup.py.bcfg2 setup.py
-./configure \
-  --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-PLATFORM_IF_MATCH(linux)
-PLATFORM_ELSE
-  --with-gcc \
-PLATFORM_ENDIF
-  --enable-shared=no \
-  --disable-ipv6 \
-  --without-cxx \
-  --without-libintl
-</configure>
-
-</source>
-
-<prepackage><![CDATA[
-# Put setup back into pristine state
-rm ${builddir}/setup.py
-cp ${builddir}/setup.py.orig ${builddir}/setup.py
-# Convienience links
-mkdir bin 2>/dev/null || exit 0
-ln -sf ../lib/bcfg2/bin/pydoc bin/b2-pydoc
-ln -sf ../lib/bcfg2/bin/python bin/b2-python
-# Remove some big stuff that bcfg2 doesn't need
-if [ -d lib/bcfg2/lib/python2.4/test ]; then rm -rf lib/bcfg2/lib/python2.4/test; fi
-if [ -d lib/bcfg2/lib/python2.4/idlelib ]; then rm -rf lib/bcfg2/lib/python2.4/idlelib; fi
-# 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 python - scripting language
-</encapinfo>
-
-</encap_profile>
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
deleted file mode 100644
index a381cd433..000000000
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-python-apt-0.5.10"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/python-apt/python-apt_0.5.10.tar.gz
-     http://mirror.opensysadmin.com/python-apt/python-apt_0.5.10.tar.gz
-     http://ftp.debian.org/debian/pool/main/p/python-apt/python-apt_0.5.10.tar.gz"
-subdir="python-apt-0.5.10"
->
-
-<configure>
-/usr/local/bin/b2-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/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install> 
-
-<clean>
-/usr/local/bin/b2-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 python-apt - python interface to libapt-pkg
-</encapinfo>
-
-</encap_profile>
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
deleted file mode 100644
index c85751dd4..000000000
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-python-apt-0.6.16.2ubuntu8"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz
-     http://mirror.opensysadmin.com/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz
-     http://archive.ubuntu.com/ubuntu/pool/main/p/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz"
-subdir="python-apt-0.6.16.2ubuntu8"
->
-
-<configure>
-/usr/local/bin/b2-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/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install> 
-
-<clean>
-/usr/local/bin/b2-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 python-apt - python interface to libapt-pkg
-</encapinfo>
-
-</encap_profile>
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
deleted file mode 100644
index 47fd51c9b..000000000
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-python-apt-0.6.19"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/python-apt/python-apt_0.6.19.tar.gz
-     http://mirror.opensysadmin.com/python-apt/python-apt_0.6.19.tar.gz
-     http://ftp.debian.org/debian/pool/main/p/python-apt/python-apt_0.6.19.tar.gz"
-subdir="python-apt-0.6.19"
->
-
-<configure>
-/usr/local/bin/b2-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/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install> 
-
-<clean>
-/usr/local/bin/b2-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 python-apt - python interface to libapt-pkg
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-readline-5.2.ep b/encap/src/encap-profiles/bcfg2-readline-5.2.ep
deleted file mode 100644
index 6bae397d4..000000000
--- a/encap/src/encap-profiles/bcfg2-readline-5.2.ep
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-readline-5.2"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-pkg-config-0.22" />
-
-<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/readline/readline-5.2.tar.gz
-     http://mirror.opensysadmin.com/readline/readline-5.2.tar.gz
-     ftp://ftp.cwru.edu/pub/bash/readline-5.2.tar.gz"
->
-
-<configure>
-./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2"
-</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 readline - lets users edit command lines as they are typed in
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep b/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
deleted file mode 100644
index 34684060b..000000000
--- a/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-setuptools-0.6c6"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<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/setuptools/setuptools-0.6c6.tar.gz
-     http://mirror.opensysadmin.com/setuptools/setuptools-0.6c6.tar.gz
-     http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-0.6c6.tar.gz"
->
-
-<configure>
-/usr/local/bin/b2-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/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install>
-
-<clean>
-/usr/local/bin/b2-python setup.py clean
-</clean>
-
-</source>
-
-<prepackage type="set">
-# Fix paths so they work with symlinks
-mv ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/easy-install.pth ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/easy-install.pth.broken
-mv ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/setuptools.pth ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/setuptools.pth.broken
-cat ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/easy-install.pth.broken | sed s:\.\/:\/usr\/local\/lib\/bcfg2\/lib\/python2.4\/site-packages\/:g > ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/easy-install.pth
-cat ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/setuptools.pth.broken | sed s:\.\/:\/usr\/local\/lib\/bcfg2\/lib\/python2.4\/site-packages\/:g > ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/setuptools.pth
-rm ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages/*.broken
-# 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 setuptools - work with python packages
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep b/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
deleted file mode 100644
index 2bfaf8497..000000000
--- a/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-  profile_ver="1.0"
-  pkgspec="bcfg2-swig-1.3.31"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<prereq package="bcfg2-python-2.4.4" />
-
-<environment
-        variable="CC"
-        value="gcc -static-libgcc"
-        type="set"
-/>
-
-<environment
-        variable="CXX"
-        value="g++ -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 -Wl,-brtl"
-PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -L/usr/local/lib -R/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib"
-PLATFORM_ELSE
-PLATFORM_ENDIF
-        type="set"
-/>
-
-PLATFORM_IF_MATCH(aix)
-<environment
-        variable="CXXFLAGS"
-        value="-Wl,-bstatic -lstdc++ -Wl,-bdynamic -lsupc++"
-        type="set"
-/>
-PLATFORM_ELSE
-PLATFORM_ENDIF
-
-<environment
-        variable="CPPFLAGS"
-        value="-I/usr/local/lib/bcfg2/include/openssl -I/usr/local/lib/bcfg2/include"
-        type="set"
-/>
-
-<source
-url="http://encapsrcdist/mirror/swig/swig-1.3.31.tar.gz
-     http://mirror.opensysadmin.com/swig/swig-1.3.31.tar.gz
-     http://internap.dl.sourceforge.net/sourceforge/swig/swig-1.3.31.tar.gz"
->
-
-<configure>
-./configure \
-  --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-  --without-x \
-  --without-tcl \
-  --with-python=/usr/local/bin/b2-python \
-  --without-perl5 \
-  --without-java \
-  --without-gcj \
-  --without-guile \
-  --without-mzscheme \
-  --without-ruby \
-  --without-php4 \
-  --without-ocaml \
-  --without-pike \
-  --without-chicken \
-  --without-csharp \
-  --without-lua \
-  --without-allegrocl \
-  --without-clisp \
-  --without-r
-</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 swig - generate scripting interfaces to C/C++ code
-</encapinfo>
-
-</encap_profile>
-
-
diff --git a/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep b/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
deleted file mode 100644
index cdcddd297..000000000
--- a/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-zlib-1.2.3"
->
-
-<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"
-/>
-
-PLATFORM_IF_MATCH(solaris)
-<environment
-        variable="CFLAGS"
-        type="unset"
-/>
-PLATFORM_ELSE_IF_MATCH(linux)
-<environment
-        variable="CFLAGS"
-        value=" -fPIC"
-        type="append"
-/>
-PLATFORM_ELSE
-PLATFORM_ENDIF
-
-<source
-url="http://encapsrcdist/mirror/zlib/zlib-1.2.3.tar.gz
-     http://mirror.opensysadmin.com/zlib/zlib-1.2.3.tar.gz
-     http://www.zlib.net/zlib-1.2.3.tar.gz"
->
-
-<configure>
-./configure \
-PLATFORM_IF_MATCH(aix)
-PLATFORM_ELSE
-	--shared \
-PLATFORM_ENDIF
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2"
-</configure>
-
-</source>
-
-<prepackage type="set">
-# Make man pages available from /usr/local/lib/bcfg2/man
-mv lib/bcfg2/share/man 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 zlib - compression library
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/ep2target b/encap/src/encap-profiles/ep2target
deleted file mode 100755
index ee0c8b4e4..000000000
--- a/encap/src/encap-profiles/ep2target
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# Note: Solaris sed(1) requires a newline from stdin
-SED="sed"
-#SED="/opt/csw/bin/gsed"
-#SED="/usr/xpg4/bin/sed"
-#SED="/usr/ucb/sed"
-
-chomp() {
-    printf "%s\n" "$1" | ${SED} 's:^\ ::g' | ${SED} 's:\ $::g'
-}
-
-cname() {
-    unset CTMP1 CTMP2
-    for PART in `printf "%s\n" "$1" | ${SED} 's:-:\ :g'`; do 
-        if [ ! "`printf "%s\n" "$PART" | cut -c1 | ${SED} 's:[0-9]:0:g'`x" = "0x" ]; then
-        CTMP1="${CTMP1} ${PART}"
-        fi
-    done
-    CTMP2="`chomp "$CTMP1" | ${SED} 's:\ :_:g' | ${SED} 's:\+:X:g' | tr [a-z] [A-Z]`"
-    printf "\$(%s)%s" "`basename "$CTMP2"`" "$2"
-}
-
-builddeps() {
-    unset DEPSTMP
-    for LINE in `grep "<prereq package=\"" $1 \
-                 | ${SED} 's/\ //g' \
-                 | awk -F\" '{print $2}'`; do 
-                 DEPSTMP="${DEPSTMP} `cname $LINE $2`"
-    done
-    chomp "$DEPSTMP"
-}
-
-installdeps() {
-    unset DEPSTMP
-    for LINE in `grep "prereq pkgspec" $1 \
-                 | awk '{print $4}'`; do 
-                 DEPSTMP="${DEPSTMP} `cname $LINE $2`"
-    done
-    chomp "$DEPSTMP"
-}
-
-printf "%s : %s\n" "`cname $1 .installed`" "`builddeps $1 .installed`"
-printf "%s : %s\n" "`cname $1 .packaged`" "`installdeps $1 .packaged`"
-
-exit 0
diff --git a/encap/src/encap-profiles/m4-1.4.4.sh b/encap/src/encap-profiles/m4-1.4.4.sh
deleted file mode 100755
index 35bd80bbf..000000000
--- a/encap/src/encap-profiles/m4-1.4.4.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-# $Id$
-
-ENCAP_PKGNAME="m4-1.4.4"
-PATH="$PATH:/usr/local/bin"
-export PATH
-
-date > ${ENCAP_PKGNAME}.log
-
-if [ -f "${ENCAP_PKGNAME}.ep" ]; then rm ${ENCAP_PKGNAME}.ep; fi
-cat > ${ENCAP_PKGNAME}.ep << EOF
-<?xml version="1.0"?>
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="m4-1.4.4"
->
-
-<environment
-        variable="CC"
-        value="gcc -static-libgcc"
-        type="set"
-/>
-
-<environment
-        variable="PATH"
-        value="/usr/local/bin:"
-        type="prepend"
-/>
-
-<environment
-        variable="PATH"
-        value=":/usr/sfw/bin:/usr/ccs/bin"
-        type="append"
-/>
-
-<source
-url="http://encapsrcdist/mirror/m4/m4-1.4.4.tar.gz
-     http://mirror.opensysadmin.com/m4/m4-1.4.4.tar.gz
-     http://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz"
->
-
-</source>
-
-<prepackage type="set">
-test -d var || mkdir var
-test -d var/encap || mkdir var/encap
-touch var/encap/${ENCAP_PKGNAME}
-</prepackage>
-
-<encapinfo>
-description m4 - GNU implementation of the traditional Unix macro processor
-</encapinfo>
-
-</encap_profile>
-EOF
-
-if [ -f m4-fake ]; then rm m4-fake; fi
-cat > m4-fake << EOF
-#!/bin/sh
-cat \$4
-EOF
-chmod 755 m4-fake
-
-CURDIR="`pwd`"
-
-printf "Environment variables:\n" \
-	>> ${ENCAP_PKGNAME}.log
-env >> ${ENCAP_PKGNAME}.log
-
-printf "\nsrcdir:|%s| pwd:|%s| \$0:|%s|\n" "${srcdir}" "`pwd`" "$0" \
-    >> ${ENCAP_PKGNAME}.log
-
-printf "\n%s :\n" "`ls -l ${ENCAP_PKGNAME}.ep`" \
-    >> ${ENCAP_PKGNAME}.log
-cat ${ENCAP_PKGNAME}.ep >> ${ENCAP_PKGNAME}.log
-
-printf "\n\n%s :\n" "`ls -l m4-fake`" \
-    >> ${ENCAP_PKGNAME}.log
-cat m4-fake >> ${ENCAP_PKGNAME}.log
-
-printf "\n${MKENCAP} -m ${CURDIR}/m4-fake -b -DUP ${ENCAP_PKGNAME}.ep :\n" \
-    >> ${ENCAP_PKGNAME}.log
-( ${MKENCAP} -m ${CURDIR}/m4-fake -b -DUP ${ENCAP_PKGNAME}.ep || true ) \
-    >> ${ENCAP_PKGNAME}.log 2>&1
-
-printf "\n${MKENCAP} -m ${CURDIR}/m4-fake -b -T ${ENCAP_PKGNAME}.ep :\n" \
-    >> ${ENCAP_PKGNAME}.log
-( ${MKENCAP} -m ${CURDIR}/m4-fake -b -T ${ENCAP_PKGNAME}.ep || true ) \
-    >> ${ENCAP_PKGNAME}.log 2>&1
-
-printf "\n${MKENCAP} -m ${CURDIR}/m4-fake -b -CBI ${ENCAP_PKGNAME}.ep :\n" \
-    >> ${ENCAP_PKGNAME}.log
-( ${MKENCAP} -m ${CURDIR}/m4-fake -b -CBI ${ENCAP_PKGNAME}.ep ) \
-    >> ${ENCAP_PKGNAME}.log 2>&1
-
-rm m4-fake >> ${ENCAP_PKGNAME}.log 2>&1
-rm ${ENCAP_PKGNAME}.ep >> ${ENCAP_PKGNAME}.log 2>&1
-
-exit 0
diff --git a/encap/src/encap-profiles/makeself-2.1.4.ep b/encap/src/encap-profiles/makeself-2.1.4.ep
deleted file mode 100644
index 871db7745..000000000
--- a/encap/src/encap-profiles/makeself-2.1.4.ep
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="makeself-2.1.4"
->
-
-<prereq package="m4-1.4.4" />
-
-<source
-url="http://encapsrcdist/mirror/makeself/makeself-2.1.4.run
-     http://mirror.opensysadmin.com/makeself/makeself-2.1.4.run
-     http://www.megastep.org/makeself/makeself-2.1.4.run"
-subdir="/"
->
-
-<unpack><![CDATA[
-/bin/sh -x ${ENCAP_PKGNAME}.run
-]]></unpack>
-
-<configure>
-:
-</configure>
-
-<build>
-:
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d  ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/bin || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/bin
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man/man1 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man/man1
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/makeself || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/makeself
-if [ -d ${builddir}/${ENCAP_PKGNAME}.run ]; then rmdir ${builddir}/${ENCAP_PKGNAME}.run; fi
-cp ${builddir}/* ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/makeself
-mv ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/makeself/*.sh ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/bin
-mv ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/makeself/*.1 ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man/man1
-</install>
-
-<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 makeself - Make self-extractable archives on Unix
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/ostiary-3.4.ep b/encap/src/encap-profiles/ostiary-3.4.ep
deleted file mode 100644
index 519c908da..000000000
--- a/encap/src/encap-profiles/ostiary-3.4.ep
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="ostiary-3.4"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="patch-2.5.9" />
-
-<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
-
-<source
-url="http://encapsrcdist/mirror/ostiary/ostiary-3.4.tar.gz
-     http://mirror.opensysadmin.com/ostiary/ostiary-3.4.tar.gz
-     http://ingles.homeunix.org/software/ost/ostiary-3.4.tar.gz"
-use_objdir="no"
->
-
-<patch options="-p1"><![CDATA[
-#
-# Allow up to 32 Actions (up from 8)...
-#
---- ostiary-3.4/ost.h	2006-08-16 23:31:59.000000000 -0400
-+++ ostiary-3.4.new/ost.h	2006-08-16 23:33:23.000000000 -0400
-@@ -22,7 +22,7 @@
- /* Note: strictly IPv4 for now... */
- #define MAX_SIZEOF_IP 16
- 
--#define MAX_NUM_SECRETS 8
-+#define MAX_NUM_SECRETS 32
- #define MAX_NUM_CACHED_IPS 128
- 
- #define MAX_SECRET_SIZE 64
-@@ -53,7 +53,7 @@
- /* Note: strictly IPv4 for now... */
- #define MAX_SIZEOF_IP 16
- 
--#define MAX_NUM_SECRETS 8
-+#define MAX_NUM_SECRETS 32
- #define MAX_NUM_CACHED_IPS 128
- 
- /* You can make MAX_SECRET_SIZE bigger, but don't forget to update
-]]></patch>
-
-</source>
-
-<prepackage>
-# /usr/local/etc stuff
-test -d share || mkdir share
-test -d share/doc || mkdir share/doc
-test -d share/doc/ostiary || mkdir share/doc/ostiary
-test -d share/doc/ostiary/examples || mkdir share/doc/ostiary/examples
-mv etc/ostiary.cfg share/doc/ostiary/examples/ostiary.cfg
-rmdir etc
-# daemons should be in /usr/local/sbin
-test -d sbin || mkdir sbin
-mv bin/ostiaryd sbin/ostiaryd
-# runit stuff
-test -d var || mkdir var
-test -d etc || mkdir etc
-test -d etc/sv || mkdir etc/sv
-test -d etc/sv/ostiary || mkdir etc/sv/ostiary
-test -d etc/sv/ostiary/log || mkdir etc/sv/ostiary/log
-# Make "this encap is installed" sentinal file available in /usr/local/var/encap
-test -d var/encap || mkdir var/encap
-touch var/encap/${ENCAP_PKGNAME}
-</prepackage>
-
-<include_file name="etc/sv/ostiary/run" mode="0755"><![CDATA[
-#!/bin/sh
-exec 2>&1
-exec /usr/local/sbin/ostiaryd -c /usr/local/etc/ostiary.cfg -v -D
-]]></include_file>
-
-<include_file name="etc/sv/ostiary/log/run" mode="0755"><![CDATA[
-#!/bin/sh
-exec 2>&1
-exec /usr/local/bin/svlogd -tt /usr/local/var/svlogd/ostiary
-]]></include_file>
-
-<include_file name="postinstall" mode="0755"><![CDATA[
-#!/bin/sh -e
-umask 002
-BASEDIR="`echo ${0} | xargs -n1 dirname`"
-LOG=${BASEDIR}/postinstall.log
-exec > $LOG 2>&1
-printf "Running ostiary postinstall script...\n"
-date
-test -d /var/run || mkdir /var/run
-test -d /usr/local/var/svlogd || mkdir /usr/local/var/svlogd
-test -d /usr/local/var/svlogd/ostiary || mkdir /usr/local/var/svlogd/ostiary
-printf "Finished ostiary postinstall script.\n"
-]]></include_file>
-
-<include_file name="preremove" mode="0755"><![CDATA[
-#!/bin/sh
-
-printf "Running ostiary preremove script...\n"
-date
-
-if [ -h /usr/local/var/service/ostiary ]; then
-    printf "INFO: Removing /usr/local/var/service/ostiary...\n"
-    rm /usr/local/var/service/ostiary
-fi
-
-printf "Finished ostiary preremove script.\n"
-]]></include_file>
-
-<encapinfo>
-description Ostiary - Simple, Secure Remote Script Execution
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/patch-2.5.9.ep b/encap/src/encap-profiles/patch-2.5.9.ep
deleted file mode 100644
index 6df246d45..000000000
--- a/encap/src/encap-profiles/patch-2.5.9.ep
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="patch-2.5.9"
->
-
-<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
-
-<source
-url="http://encapsrcdist/mirror/patch/patch-2.5.9.tar.gz
-     http://mirror.opensysadmin.com/patch/patch-2.5.9.tar.gz
-     ftp://alpha.gnu.org/gnu/diffutils/patch-2.5.9.tar.gz"
->
-
-</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 patch - apply a diff file to an original
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/reports/Makefile b/encap/src/encap-profiles/reports/Makefile
deleted file mode 100644
index e2f1529e5..000000000
--- a/encap/src/encap-profiles/reports/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id$
-
-.PHONY : test log all install clean distclean encaps rename
-.SUFFIXES :
-.SUFFIXES : .ep .installed .packaged .d
-
-export BASEDIR = /usr/local
-export ENCAPDIR := ${BASEDIR}/encap
-export EPKG := ${BASEDIR}/bin/epkg
-export MKENCAP := ${BASEDIR}/bin/mkencap
-export SHELL = /bin/sh
-srcdir = .
-export EP2TARGET := $(srcdir)/ep2target
-PAGER ?= more
-
-BCFG2_DJANGO := $(basename $(wildcard bcfg2-django-*.ep))
-BCFG2_MOD_PYTHON := $(basename $(wildcard bcfg2-mod_python-*.ep))
-BCFG2_PYSQLITE := $(basename $(wildcard bcfg2-pysqlite-*.ep))
-SQLITE := $(basename $(wildcard sqlite-*.ep))
-
-sources := $(BCFG2_DJANGO) $(BCFG2_MOD_PYTHON) $(BCFG2_PYSQLITE) $(SQLITE)
-
-%.installed : %.ep # Clean, compile and install an encap package
-	@printf "***** START .ep.installed for |$*| ***** \n"
-	-$(EPKG) -q -r $(ENCAPDIR)/$*
-	-rm -rf $(ENCAPDIR)/$*
-	-$(MKENCAP) -m /usr/local/bin/m4 -b -DUP $(srcdir)/$*.ep > ./$*.log 2>&1
-	-$(MKENCAP) -m /usr/local/bin/m4 -b -T $(srcdir)/$*.ep >> ./$*.log 2>&1
-	$(MKENCAP) -m /usr/local/bin/m4 -b -CBI $(srcdir)/$*.ep >> ./$*.log 2>&1
-	$(EPKG) -q -i $(ENCAPDIR)/$*
-	test -h $(BASEDIR)/var/encap/$*
-	touch ./$*.installed
-	@printf "***** STOP .ep.installed for |$*| ***** \n"
-
-%.packaged : %.installed # Create .tar.gz encap packages
-	@printf "***** START .installed.packaged for |$*| ***** \n"
-	-rm $(ENCAPDIR)/$*-*.tar.gz
-	-(cd $(ENCAPDIR) && $(MKENCAP) -e $*)
-	-(cd $(ENCAPDIR) && $(MKENCAP) -c $*)
-	mv $(ENCAPDIR)/$*-encap-*.tar.gz ./
-	touch ./$*.packaged
-	@printf "***** STOP .installed.packaged for |$*| ***** \n"
-
-%.d : %.ep # Create dependancy files from .ep files
-	@printf "***** START .d.ep for |$*| ***** \n"
-	$(EP2TARGET) $< > $@
-	@printf "***** STOP .d.ep for |$*| ***** \n"
-
-log :
-	( $(MAKE) install > ./make.log 2>&1 \
-	&& $(MAKE) encaps >> ./make.log 2>&1 \
-	&& $(MAKE) rename >> ./make.log 2>&1 ) &
-
-all : install encaps rename
-
-.DELETE_ON_ERROR : # delete the target of a rule if it has changed and its
-                   # commands exit with a nonzero exit status
-
-install : $(EPKG) $(MKENCAP) $(EP2TARGET) $(M4).installed $(addsuffix .installed,$(sources))
-
-encaps : $(EPKG) $(MKENCAP) $(EP2TARGET) $(addsuffix .packaged,$(sources))
-
-rename : encaps
-	if [ "$(OS)x" != "x" ]; then OS="$(OS)"; fi && \
-	if [ "$${OS}x" != "x" ]; then \
-		for OLDNAME in `(ls . | grep .*-encap-.*.tar.gz) || break`; do \
-			NEWNAME="`printf "%s\n" "$${OLDNAME}" \
-				| awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' \
-				| sed s:\ :-:g | sed s:OSDIST:\$${OS}:g`" ; \
-			if [ "$${OLDNAME}x" != "$${NEWNAME}x" ]; then \
-				mv ./$${OLDNAME} ./$${NEWNAME}; \
-			fi; \
-		done; \
-	fi
-	for OLDNAME in `(ls . | grep .*-doc-.*-encap-.*.tar.gz) || break`; do \
-		NEWNAME="`printf "%s\n" "$${OLDNAME}" \
-			| awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' \
-			| sed s:\ :-:g | sed s:OSDIST:share:g`" ; \
-		if [ "$${OLDNAME}x" != "$${NEWNAME}x" ]; then \
-			mv ./$${OLDNAME} ./$${NEWNAME}; \
-		fi; \
-	done;
-
-clean :
-	-(rm ./*.log; rm ./*.packaged; rm ./*.gz; rm ./*~)
-
-distclean : clean
-	-rm ./*.d
-
-include $(addsuffix .d,$(sources))
diff --git a/encap/src/encap-profiles/reports/README b/encap/src/encap-profiles/reports/README
deleted file mode 100644
index 36f4dd9bc..000000000
--- a/encap/src/encap-profiles/reports/README
+++ /dev/null
@@ -1,7 +0,0 @@
-You must build and install the client packages in ".." and the server
-packages in "../server" before building here.
-
-Type "make".
-
-Bcfg2 Reports do not work on all of the platforms supported by Bcfg2 client.
-GNU/Linux on x86_32 or x86_64 are recommended.
diff --git a/encap/src/encap-profiles/reports/bcfg2-django-0.96.ep b/encap/src/encap-profiles/reports/bcfg2-django-0.96.ep
deleted file mode 100644
index 65f1991a7..000000000
--- a/encap/src/encap-profiles/reports/bcfg2-django-0.96.ep
+++ /dev/null
@@ -1 +0,0 @@
-http://www.djangoproject.com/download/0.96/tarball/
diff --git a/encap/src/encap-profiles/reports/bcfg2-mod_python-3.3.1.ep b/encap/src/encap-profiles/reports/bcfg2-mod_python-3.3.1.ep
deleted file mode 100644
index d60cf7cdf..000000000
--- a/encap/src/encap-profiles/reports/bcfg2-mod_python-3.3.1.ep
+++ /dev/null
@@ -1 +0,0 @@
-http://www.eng.lsu.edu/mirrors/apache/httpd/modpython/mod_python-3.3.1.tgz
diff --git a/encap/src/encap-profiles/reports/bcfg2-pysqlite-2.3.4.ep b/encap/src/encap-profiles/reports/bcfg2-pysqlite-2.3.4.ep
deleted file mode 100644
index 31e41d79e..000000000
--- a/encap/src/encap-profiles/reports/bcfg2-pysqlite-2.3.4.ep
+++ /dev/null
@@ -1 +0,0 @@
-http://initd.org/pub/software/pysqlite/releases/2.3/2.3.4/pysqlite-2.3.4.tar.gz
diff --git a/encap/src/encap-profiles/reports/ep2target b/encap/src/encap-profiles/reports/ep2target
deleted file mode 120000
index 6a7aaa552..000000000
--- a/encap/src/encap-profiles/reports/ep2target
+++ /dev/null
@@ -1 +0,0 @@
-../ep2target
\ No newline at end of file
diff --git a/encap/src/encap-profiles/reports/sqlite-3.4.0.ep b/encap/src/encap-profiles/reports/sqlite-3.4.0.ep
deleted file mode 100644
index 935380227..000000000
--- a/encap/src/encap-profiles/reports/sqlite-3.4.0.ep
+++ /dev/null
@@ -1 +0,0 @@
-http://www.sqlite.org/sqlite-3.4.0.tar.gz
diff --git a/encap/src/encap-profiles/runit-1.7.2.ep b/encap/src/encap-profiles/runit-1.7.2.ep
deleted file mode 100644
index 66ebcdeb9..000000000
--- a/encap/src/encap-profiles/runit-1.7.2.ep
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-  profile_ver="1.0"
-  pkgspec="runit-1.7.2"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="patch-2.5.9" />
-
-<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"
-/>
-
-<environment
-        variable="CPPFLAGS"
-        value="-I/usr/local/lib"
-        type="set"
-/>
-
-PLATFORM_IF_MATCH(linux)
-PLATFORM_ELSE
-<environment
-        variable="MAKE"
-        value="gmake"
-        type="set"
-/>
-PLATFORM_ENDIF
-
-<source
-url="http://encapsrcdist/mirror/runit/runit-1.7.2.tar.gz
-     http://mirror.opensysadmin.com/runit/runit-1.7.2.tar.gz
-     http://smarden.org/runit/runit-1.7.2.tar.gz"
-use_objdir="no"
-subdir="admin/runit-1.7.2"
->
-
-PLATFORM_IF_MATCH(aix\|solaris2.6)
-<patch options="-p0" from_dir="src"><![CDATA[
---- uw_tmp.h1	2007-06-25 01:17:00.000000000 -0400
-+++ uw_tmp.h1	2007-06-25 01:17:23.000000000 -0400
-@@ -3,7 +3,7 @@
-
- /* sysdep: -utmpx */
-
--#define UW_TMP_UFILE _PATH_UTMP
--#define UW_TMP_WFILE _PATH_WTMP
-+#define UW_TMP_UFILE UTMP_FILE
-+#define UW_TMP_WFILE WTMP_FILE
-
- typedef struct utmp uw_tmp;
-]]></patch>
-PLATFORM_ELSE
-PLATFORM_ENDIF
-
-PLATFORM_IF_MATCH(solaris)
-<patch options="-p0" from_dir="src"><![CDATA[
---- Makefile	2007-07-02 10:09:24.000000000 -0400
-+++ Makefile	2007-07-02 10:09:45.000000000 -0400
-@@ -6,10 +6,10 @@
- 	./check-local $(IT)
-
- runit: load runit.o unix.a byte.a
--	./load runit unix.a byte.a -static
-+	./load runit unix.a byte.a
-
- runit-init: load runit-init.o unix.a byte.a
--	./load runit-init unix.a byte.a -static
-+	./load runit-init unix.a byte.a
-
- runsv: load runsv.o unix.a byte.a time.a
- 	./load runsv unix.a byte.a time.a
-]]></patch>
-PLATFORM_ELSE
-PLATFORM_ENDIF
-
-PLATFORM_IF_MATCH(solaris2.6)
-<patch options="-p0" from_dir="src"><![CDATA[
---- utmpset.c   2007-07-19 07:08:25.356231209 -0400
-+++ utmpset.c   2007-07-19 07:08:41.279314222 -0400
-@@ -34,7 +34,6 @@
-   while (read(fd, &ut, sizeof(uw_tmp)) == sizeof(uw_tmp)) {
-     if (!ut.ut_name[0] || (str_diff(ut.ut_line, line) != 0)) continue;
-     memset(ut.ut_name, 0, sizeof ut.ut_name);
--    memset(ut.ut_host, 0, sizeof ut.ut_host);
-     if (time(&ut.ut_time) == -1) break;
- #ifdef DEAD_PROCESS
-     ut.ut_type =DEAD_PROCESS;
-]]></patch>
-PLATFORM_ELSE
-PLATFORM_ENDIF
-
-<configure type="unset" />
-
-<build>
-./package/compile
-./package/check
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/bin || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/bin
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/runit || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/runit
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man/man8 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man/man8
-cp command/* ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/bin
-cp -r doc/* ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/runit
-cp -r etc ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/runit
-cp -r package ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/runit
-cp man/* ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/man/man8
-</install>
-
-<clean type="unset" />
-
-</source>
-
-<prepackage>
-# 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>
-
-<include_file name="bin/runsvdir-usrlocal-start" mode="0755"><![CDATA[
-#!/bin/sh
-PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
-exec env - PATH=$PATH \
-runsvdir -P /usr/local/var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
-]]></include_file>
-
-<include_file name="inittab.boot" mode="0644"><![CDATA[
-
-SV:123456:respawn:/usr/local/bin/runsvdir-usrlocal-start
-]]></include_file>
-
-<include_file name="upstart.boot" mode="0644"><![CDATA[
-# /etc/event.d/SV 0644
-#
-# for runit - manage /usr/local/bin/runsvdir-usrlocal-start
-#
-start on runlevel-2
-start on runlevel-3
-start on runlevel-4
-start on runlevel-5
-stop on shutdown
-respawn /usr/local/bin/runsvdir-usrlocal-start
-]]></include_file>
-
-<include_file name="inittab-install" mode="0755"><![CDATA[
-#!/bin/sh -e
-if grep SV: /etc/inittab >/dev/null
-then
-  echo 'inittab contains an SV: line. I assume that runsvdir is already running.
-'
-else
-  echo 'Adding runsvdir to inittab...'
-  rm -f /etc/inittab'{new}'
-  cat /etc/inittab inittab.boot > /etc/inittab'{new}'
-  mv -f /etc/inittab'{new}' /etc/inittab
-  kill -HUP 1
-  echo 'init should start runsvdir now.
-'
-fi
-]]></include_file>
-
-<include_file name="inittab-remove" mode="0755"><![CDATA[
-#!/bin/sh -e
-if grep SV: /etc/inittab >/dev/null
-then
-  echo 'Backing up inittab to .inittab.backup...'
-  rm -f /etc/.inittab.backup
-  cp -f /etc/inittab /etc/.inittab.backup
-  echo 'Removing svscan lines from inittab...'
-  rm -f /etc/inittab'{new}'
-  grep -v SV: /etc/inittab > /etc/inittab'{new}'
-  mv -f /etc/inittab'{new}' /etc/inittab
-  kill -HUP 1
-  echo 'init should stop runsvdir now.
-'
-else
-  echo 'inittab does not contain a runsvdir line.
-'
-fi
-]]></include_file>
-
-<include_file name="postinstall" mode="0755"><![CDATA[
-#!/bin/sh
-umask 002
-BASEDIR="`echo ${0} | xargs -n1 dirname`"
-LOG=${BASEDIR}/postinstall.log
-exec > $LOG 2>&1
-
-printf "Running runit postinstall script...\n"
-date
-
-case `uname` in
-    AIX|SunOS) PS="ps -ef" ;;
-    *)         PS="ps auxw" ;;
-esac
-
-printf "1: Make sure required directories exist...\n"
-test -d /usr/local/var || mkdir /usr/local/var
-test -d /usr/local/var/svlogd || mkdir /usr/local/var/svlog
-test -d /usr/local/var/service || mkdir /usr/local/var/service
-test -d /usr/local/etc || mkdir /usr/local/etc
-test -d /usr/local/etc/default || mkdir /usr/local/etc/default
-test -d /usr/local/etc/sv || mkdir /usr/local/etc/sv
-
-printf "\n2: Currently running runsv and svlogd processes:\n"
-$PS | grep [r]unsv
-$PS | grep [s]vlogd
-
-printf "\n3: Killing any running runsv and svlogd processes...\n"
-$PS | grep [r]unsv | awk '{print $2}' | xargs -n1 -i{} kill -15 -{} 2>/dev/null
-$PS | grep [s]vlogd | awk '{print $2}' | xargs -n1 -i{} kill -15 -{} 2>/dev/null
-sleep 2
-$PS | grep [r]unsv | awk '{print $2}' | xargs -n1 -i{} kill -9 -{} 2>/dev/null
-$PS | grep [s]vlogd | awk '{print $2}' | xargs -n1 -i{} kill -9 -{} 2>/dev/null
-
-printf "\n4: Currently running runsv and svlogd processes:\n"
-$PS | grep [r]unsv
-$PS | grep [s]vlogd
-
-printf "\n5: Removing any stale state information in /usr/local/etc/sv...\n"
-for service in `ls /usr/local/etc/sv`; do
-    test -d /usr/local/etc/sv/$service/supervise && rm -rf /usr/local/etc/sv/$service/supervise
-    test -d /usr/local/etc/sv/$service/log/supervise && rm -rf /usr/local/etc/sv/$service/log/supervise
-done
-
-printf "\n6: Re-enabling services that were installed before package was removed...\n"
-if [ -d /usr/local/var/service/.disabled ]; then
-    for service in `ls /usr/local/var/service/.disabled`; do
-        if [ -h /usr/local/var/service/$service ]; then
-            printf "A new version of $service exists, removing old version...\n"
-            rm /usr/local/var/service/.disabled/$service
-        else
-            printf "Re-enabling service $service...\n"
-            mv /usr/local/var/service/.disabled/$service /usr/local/var/service/
-      fi
-    done
-fi
-
-printf "\n7: Making runsvdir run all the time...\n"
-if [ -f /etc/inittab ]; then
-    printf "Installing to /etc/inittab ...\n"
-    cd ${ENCAP_SOURCE}/${ENCAP_PKGNAME} && ./inittab-install
-fi
-
-if [ -d /etc/event.d ]; then
-    printf "Installing to /etc/event.d/SV (Upstart) ...\n"
-    initctl stop SV 2>/dev/null || true
-    cd ${ENCAP_SOURCE}/${ENCAP_PKGNAME} && cp upstart.boot /etc/event.d/SV
-    initctl start SV
-fi
-
-printf "\n8: Finished runit postinstall script.\n"
-]]></include_file>
-
-<include_file name="preremove" mode="0755"><![CDATA[
-#!/bin/sh
-printf "Running runit preremove script...\n"
-umask 002
-date
-
-case `uname` in
-    AIX|SunOS) PS="ps -ef" ;;
-    *)         PS="ps auxw" ;;
-esac
-
-printf "1: All sv processes runnning before any actions...\n"
-$PS | grep [s]v
-
-printf "\n2: Running sv force-shutdown on all /usr/local/var/service services.\n"
-printf "We wait up to an hour for each service to die - if it takes more than a\n"
-printf "minute, your daemon probably doesn't properly support signals, and you\n"
-printf "will probably want to manually kill the service process in another window.\n"
-for service in `ls /usr/local/var/service`; do
-    printf "Trying to force-shutdown /usr/local/var/service/$service ...\n"
-    sv -v -w 3600 force-shutdown /usr/local/var/service/$service
-done
-sleep 2
-printf "All sv processes runnning now...\n"
-$PS | grep [s]v
-
-printf "\n3: Removing all services from /usr/local/var/service/ - runsvdir should now\n"
-printf "shut down any runsv processes...\n"
-test -d /usr/local/var/service/.disabled || mkdir /usr/local/var/service/.disabled
-mv /usr/local/var/service/* /usr/local/var/service/.disabled/ 2>/dev/null || printf "No services to disable.\n"
-printf "Waiting 10 seconds for runsv processes to die...\n"
-sleep 10
-printf "All sv processes runnning now...\n"
-$PS | grep [s]v
-printf "If there are any runsv or svlogd processes still running, you will need\n"
-printf "to kill them manually.\n"
-
-printf "\n4: Now shutting down the runsvdir processes...\n"
-# Stop the "runsvdir" process {
-if [ -f /etc/inittab ]; then
-    printf "Removing from /etc/inittab ...\n"
-    cd ${ENCAP_SOURCE}/${ENCAP_PKGNAME} && ./inittab-remove
-fi
-if [ -d /etc/event.d ]; then
-    if [ -f /etc/event.d/SV ]; then
-        printf "Removing /etc/event.d/SV (Upstart) ...\n"
-        initctl stop SV || printf "SV already stopped...\n"
-        rm /etc/event.d/SV
-    fi
-fi
-# } Stop the "runsvdir" process
-sleep 2
-printf "All sv processes runnning now...\n"
-$PS | grep [s]v
-printf "runsvdir should no longer be running.\n"
-
-printf "\n5: Removing any old state from /usr/local/etc/sv directories...\n"
-for service in `ls /usr/local/etc/sv`; do
-    test -d /usr/local/etc/sv/$service/supervise && rm -rf /usr/local/etc/sv/$service/supervise
-    test -d /usr/local/etc/sv/$service/log/supervise && rm -rf /usr/local/etc/sv/$service/log/supervise
-done
-
-printf "\n6: Finished runit preremove script.\n"
-]]></include_file>
-
-<encapinfo>
-description runit - a UNIX init scheme with service supervision
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/server/Makefile b/encap/src/encap-profiles/server/Makefile
deleted file mode 100644
index 35c5cc752..000000000
--- a/encap/src/encap-profiles/server/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id$
-
-.PHONY : test log all install clean distclean encaps rename
-.SUFFIXES :
-.SUFFIXES : .ep .installed .packaged .d
-
-export BASEDIR = /usr/local
-export ENCAPDIR := ${BASEDIR}/encap
-export EPKG := ${BASEDIR}/bin/epkg
-export MKENCAP := ${BASEDIR}/bin/mkencap
-export SHELL = /bin/sh
-srcdir = .
-export EP2TARGET := $(srcdir)/ep2target
-PAGER ?= more
-
-BCFG2_CHEETAH_DOC := $(basename $(wildcard bcfg2-cheetah-doc-*.ep))
-BCFG2_GAMIN := $(basename $(wildcard bcfg2-gamin-*.ep))
-BCFG2_GLIB := $(basename $(wildcard bcfg2-glib-*.ep))
-BCFG2_LIBXML2 := $(basename $(wildcard bcfg2-libxml2-*.ep))
-BCFG2_LIBXSLT := $(basename $(wildcard bcfg2-libxslt-*.ep))
-BCFG2_LXML := $(basename $(wildcard bcfg2-lxml-*.ep))
-BCFG2_PYREX := $(basename $(wildcard bcfg2-pyrex-*.ep))
-OSTIARTY_DOC := $(basename $(wildcard ostiary-doc-*.ep))
-
-sources := $(BCFG2_CHEETAH_DOC) $(BCFG2_GAMIN) $(BCFG2_GLIB) $(BCFG2_LIBXML2) $(BCFG2_LIBXSLT) $(BCFG2_LXML) $(BCFG2_PYREX) $(OSTIARTY_DOC)
-
-%.installed : %.ep # Clean, compile and install an encap package
-	@printf "***** START .ep.installed for |$*| ***** \n"
-	-$(EPKG) -q -r $(ENCAPDIR)/$*
-	-rm -rf $(ENCAPDIR)/$*
-	-$(MKENCAP) -m /usr/local/bin/m4 -b -DUP $(srcdir)/$*.ep > ./$*.log 2>&1
-	-$(MKENCAP) -m /usr/local/bin/m4 -b -T $(srcdir)/$*.ep >> ./$*.log 2>&1
-	$(MKENCAP) -m /usr/local/bin/m4 -b -CBI $(srcdir)/$*.ep >> ./$*.log 2>&1
-	$(EPKG) -q -i $(ENCAPDIR)/$*
-	test -h $(BASEDIR)/var/encap/$*
-	touch ./$*.installed
-	@printf "***** STOP .ep.installed for |$*| ***** \n"
-
-%.packaged : %.installed # Create .tar.gz encap packages
-	@printf "***** START .installed.packaged for |$*| ***** \n"
-	-rm $(ENCAPDIR)/$*-*.tar.gz
-	-(cd $(ENCAPDIR) && $(MKENCAP) -e $*)
-	-(cd $(ENCAPDIR) && $(MKENCAP) -c $*)
-	mv $(ENCAPDIR)/$*-encap-*.tar.gz ./
-	touch ./$*.packaged
-	@printf "***** STOP .installed.packaged for |$*| ***** \n"
-
-%.d : %.ep # Create dependancy files from .ep files
-	@printf "***** START .d.ep for |$*| ***** \n"
-	$(EP2TARGET) $< > $@
-	@printf "***** STOP .d.ep for |$*| ***** \n"
-
-log :
-	( $(MAKE) install > ./make.log 2>&1 \
-	&& $(MAKE) encaps >> ./make.log 2>&1 \
-	&& $(MAKE) rename >> ./make.log 2>&1 ) &
-
-all : install encaps rename
-
-.DELETE_ON_ERROR : # delete the target of a rule if it has changed and its
-                   # commands exit with a nonzero exit status
-
-install : $(EPKG) $(MKENCAP) $(EP2TARGET) $(M4).installed $(addsuffix .installed,$(sources))
-
-encaps : $(EPKG) $(MKENCAP) $(EP2TARGET) $(addsuffix .packaged,$(sources))
-
-rename : encaps
-	if [ "$(OS)x" != "x" ]; then OS="$(OS)"; fi && \
-	if [ "$${OS}x" != "x" ]; then \
-		for OLDNAME in `(ls . | grep .*-encap-.*.tar.gz) || break`; do \
-			NEWNAME="`printf "%s\n" "$${OLDNAME}" \
-				| awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' \
-				| sed s:\ :-:g | sed s:OSDIST:\$${OS}:g`" ; \
-			if [ "$${OLDNAME}x" != "$${NEWNAME}x" ]; then \
-				mv ./$${OLDNAME} ./$${NEWNAME}; \
-			fi; \
-		done; \
-	fi
-	for OLDNAME in `(ls . | grep .*-doc-.*-encap-.*.tar.gz) || break`; do \
-		NEWNAME="`printf "%s\n" "$${OLDNAME}" \
-			| awk -F- '{$$NF = "OSDIST.tar.gz" ; print}' \
-			| sed s:\ :-:g | sed s:OSDIST:share:g`" ; \
-		if [ "$${OLDNAME}x" != "$${NEWNAME}x" ]; then \
-			mv ./$${OLDNAME} ./$${NEWNAME}; \
-		fi; \
-	done;
-
-clean :
-	-(rm ./*.log; rm ./*.packaged; rm ./*.gz; rm ./*~)
-
-distclean : clean
-	-rm ./*.d
-
-include $(addsuffix .d,$(sources))
diff --git a/encap/src/encap-profiles/server/README b/encap/src/encap-profiles/server/README
deleted file mode 100644
index 983d9f1ba..000000000
--- a/encap/src/encap-profiles/server/README
+++ /dev/null
@@ -1,6 +0,0 @@
-You must build and install the client packages in ".." before building here.
-
-Type "make".
-
-Bcfg2 Server does not work on all of the platforms supported by Bcfg2 client.
-GNU/Linux on x86_32 or x86_64 are recommended.
diff --git a/encap/src/encap-profiles/server/bcfg2-cheetah-doc-0.9.16a1.ep b/encap/src/encap-profiles/server/bcfg2-cheetah-doc-0.9.16a1.ep
deleted file mode 100644
index 1c671b58b..000000000
--- a/encap/src/encap-profiles/server/bcfg2-cheetah-doc-0.9.16a1.ep
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-cheetah-doc-0.9.16a1"
->
-
-<prereq package="m4-1.4.4" />
-
-<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"
-/>
-
-<source
-url="http://encapsrcdist/mirror/cheetah/CheetahDocs-0.9.16a1.tgz
-http://mirror.opensysadmin.com/cheetah/CheetahDocs-0.9.16a1.tgz
-http://umn.dl.sourceforge.net/sourceforge/cheetahtemplate/CheetahDocs-0.9.16a1.tgz"
-subdir="CheetahDocs"
->
-
-<configure>
-:
-</configure>
-
-<build>
-:
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/cheetah || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/cheetah
-cp -R * ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/cheetah
-</install>
-
-<clean>
-:
-</clean>
-
-</source>
-
-<prepackage>
-# 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-doc - cheetah template system documentation
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/server/bcfg2-gamin-0.1.8.ep b/encap/src/encap-profiles/server/bcfg2-gamin-0.1.8.ep
deleted file mode 100644
index 5dd204e8a..000000000
--- a/encap/src/encap-profiles/server/bcfg2-gamin-0.1.8.ep
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-gamin-0.1.8"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-glib-2.12.12" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/gamin/gamin-0.1.8.tar.gz
-     http://mirror.opensysadmin.com/gamin/gamin-0.1.8.tar.gz
-     http://www.gnome.org/~veillard/gamin/sources/gamin-0.1.8.tar.gz"
->
-
-<configure>
-./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2"
-</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 Gamin - The File Alteration Monitor
-prereq pkgspec >= bcfg2-glib-2.12.12
-</encapinfo>
-
-</encap_profile>
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
deleted file mode 100644
index 0d6f8cfa4..000000000
--- a/encap/src/encap-profiles/server/bcfg2-glib-2.12.12.ep
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-glib-2.12.12"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-libxml2-2.6.29" />
-<prereq package="bcfg2-libxslt-1.1.21" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/glib/glib-2.12.12.tar.gz
-     http://mirror.opensysadmin.com/glib/glib-2.12.12.tar.gz
-     http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-2.12.12.tar.gz"
->
-
-<configure>
-./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2"
-</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 glib - data structure handling, portability wrappers, and interfaces 
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/server/bcfg2-libxml2-2.6.29.ep b/encap/src/encap-profiles/server/bcfg2-libxml2-2.6.29.ep
deleted file mode 100644
index a00d59e95..000000000
--- a/encap/src/encap-profiles/server/bcfg2-libxml2-2.6.29.ep
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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.22" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/server/bcfg2-libxslt-1.1.21.ep b/encap/src/encap-profiles/server/bcfg2-libxslt-1.1.21.ep
deleted file mode 100644
index 640b82e50..000000000
--- a/encap/src/encap-profiles/server/bcfg2-libxslt-1.1.21.ep
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-libxslt-1.1.21"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-libxml2-2.6.29" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/libxslt/libxslt-1.1.21.tar.gz
-     http://mirror.opensysadmin.com/libxslt/libxslt-1.1.21.tar.gz
-     ftp://xmlsoft.org/libxml2/libxslt-1.1.21.tar.gz"
->
-
-<configure>
-./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-	--without-iconv \
-PLATFORM_IF_MATCH(aix)
-PLATFORM_ELSE
-	--enable-shared \
-PLATFORM_ENDIF
-	--with-crypto=no \
-	--with-libxml-prefix=/usr/local/lib/bcfg2 \
-	--with-libxml-include-prefix=/usr/local/lib/bcfg2/include \
-	--with-libxml-libs-prefix=/usr/local/lib/bcfg2/lib \
-	--enable-ipv6=no \
-	--with-python=/usr/local/lib/bcfg2 \
-	--with-zlib=/usr/local/lib/bcfg2
-</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 libxslt - XSLT C processing library
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/encap-profiles/server/bcfg2-lxml-1.2.1.ep b/encap/src/encap-profiles/server/bcfg2-lxml-1.2.1.ep
deleted file mode 100644
index 443638fec..000000000
--- a/encap/src/encap-profiles/server/bcfg2-lxml-1.2.1.ep
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-lxml-1.2.1"
->
-
-<prereq package="m4-1.4.4" />
-<prereq package="bcfg2-zlib-1.2.3" />
-<prereq package="bcfg2-pkg-config-0.22" />
-<prereq package="bcfg2-python-2.4.4" />
-<prereq package="bcfg2-pyrex-0.9.5.1a" />
-<prereq package="bcfg2-libxml2-2.6.29" />
-<prereq package="bcfg2-libxslt-1.1.21" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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.2.1.tgz
-     http://mirror.opensysadmin.com/lxml/lxml-1.2.1.tgz
-     http://codespeak.net/lxml/lxml-1.2.1.tgz"
->
-
-<configure>
-/usr/local/bin/b2-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/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
---single-version-externally-managed \
---record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
-</install>
-
-<clean>
-/usr/local/bin/b2-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/server/bcfg2-pyrex-0.9.5.1a.ep b/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep
deleted file mode 100644
index c27d45af9..000000000
--- a/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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" />
-<prereq package="bcfg2-setuptools-0.6c6" />
-
-<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/bin/b2-python setup.py build \
---build-base=${builddir}/build
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
-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/bin/b2-python setup.py install \
---prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
-</install>
-
-<clean>
-/usr/local/bin/b2-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/server/ep2target b/encap/src/encap-profiles/server/ep2target
deleted file mode 120000
index 6a7aaa552..000000000
--- a/encap/src/encap-profiles/server/ep2target
+++ /dev/null
@@ -1 +0,0 @@
-../ep2target
\ No newline at end of file
diff --git a/encap/src/encap-profiles/server/ostiary-doc-20060801.ep b/encap/src/encap-profiles/server/ostiary-doc-20060801.ep
deleted file mode 100644
index 75db01462..000000000
--- a/encap/src/encap-profiles/server/ostiary-doc-20060801.ep
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id$ -->
-
-<encap_profile
-	profile_ver="1.0"
-	pkgspec="ostiary-doc-20060801"
->
-
-<prereq package="m4-1.4.4" />
-
-<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"
-/>
-
-<source
-url="http://encapsrcdist/mirror/ostiary/ostiary-doc-20060801.tar.gz
-     http://mirror.opensysadmin.com/ostiary/ostiary-doc-20060801.tar.gz"
-use_objdir="no"
->
-
-<configure>
-:
-</configure>
-
-<build>
-:
-</build>
-
-<install>
-test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc
-test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/ostiary || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/ostiary
-cp * ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/ostiary
-</install>
-
-<clean>
-:
-</clean>
-
-</source>
-
-<prepackage>
-# 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 ostiary-doc - documentation from ostiary website
-</encapinfo>
-
-</encap_profile>
diff --git a/encap/src/makeself-dist/Makefile b/encap/src/makeself-dist/Makefile
deleted file mode 100644
index 1637aad88..000000000
--- a/encap/src/makeself-dist/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id$
-
-# Variables
-export SHELL = /bin/sh
-export PATH = /usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/bin:/bin
-
-# Main
-
-.PHONY : all clean distclean
-.SUFFIXES : 
-
-all : 
-	chmod 755 ./makedist.sh && ./makedist.sh
-
-clean :
-	-rm ./*~ ./\#*
-
-distclean : clean
-	-rm -rf ./bcfg2-*
diff --git a/encap/src/makeself-dist/makedist.sh b/encap/src/makeself-dist/makedist.sh
deleted file mode 100755
index 2a7625978..000000000
--- a/encap/src/makeself-dist/makedist.sh
+++ /dev/null
@@ -1,263 +0,0 @@
-#!/bin/sh -e
-
-# $Id$
-
-# Script to create the
-# bcfg2-<sitename>-<ver>-<arch>-<os>.run
-# (example: bcfg2-nasa-1-rs6000-aix5.3.0.run)
-# one-step install bcfg2 client distribution file
-
-umask 002
-
-# Set Variables
-BASEDIR="/usr/local"
-ENCAPDIR="${BASEDIR}/encap"
-EPKG="${BASEDIR}/bin/epkg"
-MAKESELF="/usr/local/bin/makeself.sh"
-MDDIR="`pwd`"
-BSDIR="$MDDIR/../bcfg2-site"
-EPDIR="$MDDIR/../encap-profiles"
-
-# Detect Variables
-BSEP="`basename $BSDIR/bcfg2-site-*-encap-share.tar.gz`"
-SITENAME="`echo $BSEP | awk -F\- '{print $3}'`"
-SITEVER="`echo $BSEP | awk -F\- '{print $4}'`"
-
-EPEP="`basename $EPDIR/m4-*-encap-*.tar.gz`"
-ARCH="`echo $EPEP | awk -F\- '{print $4}'`"
-OS="`echo $EPEP | awk -F\- '{print $5}' | sed s:\.tar\.gz$::g`"
-
-# Make temporary directory $DISTDIR from which distribution will be created
-cd $MDDIR
-DISTDIR="bcfg2-${SITENAME}-${SITEVER}-${ARCH}-${OS}"
-if [ -d "$DISTDIR" ]; then rm -rf $DISTDIR; fi
-mkdir $DISTDIR
-
-# Copy epkg distribution to $DISTDIR
-VERS="2.3.8 2.3.9"
-for VER in $VERS; do
-    if [ -d "$ENCAPDIR/epkg-${VER}" ]; then
-        EPKGDIR="$ENCAPDIR/epkg-${VER}"
-    fi
-done
-if [ "${EPKGDIR}x" = "x" ]; then
-    printf "ERROR: Can't find your epkg directory to copy, exiting...\n"
-    exit 1
-fi
-tar -cf $DISTDIR/epkg.tar $EPKGDIR/*
-
-# Copy bcfg2 and client deps to $DISTDIR
-BCFG2="`basename $EPDIR/bcfg2-[0-9].[0-9]*-encap-*.tar.gz`"
-BCFG2_ELEMENTTREE="`basename $EPDIR/bcfg2-elementtree-*-encap-*.tar.gz`"
-BCFG2_M2CRYPTO="`basename $EPDIR/bcfg2-m2crypto-*-encap-*.tar.gz`"
-BCFG2_OPENSSL="`basename $EPDIR/bcfg2-openssl-*-encap-*.tar.gz`"
-BCFG2_PYTHON="`basename $EPDIR/bcfg2-python-[0-9].[0-9]*-encap-*.tar.gz`"
-OSTIARTY="`basename $EPDIR/ostiary-[0-9].[0-9]*-encap-*.tar.gz`"
-RUNIT="`basename $EPDIR/runit-[0-9].[0-9]*-encap-*.tar.gz`"
-
-BCFG2_PYTHON_APT_TMP="`basename $EPDIR/bcfg2-python-apt-*-encap-*.tar.gz`"
-if [ "${BCFG2_PYTHON_APT_TMP}x" != 'bcfg2-python-apt-*-encap-*.tar.gzx' ]; then
-    BCFG2_PYTHON_APT="$BCFG2_PYTHON_APT_TMP"
-fi
-
-BCFG2DEPS="$BCFG2_ELEMENTTREE $BCFG2_M2CRYPTO $BCFG2_OPENSSL $BCFG2_PYTHON $BCFG2_PYTHON_APT"
-
-FILES="$BCFG2DEPS $BCFG2 $RUNIT $OSTIARTY"
-
-for FILE in ${FILES}; do
-    cp $EPDIR/$FILE $DISTDIR
-done
-
-# Copy bcfg2-site to $DISTDIR
-BCFG2_SITE="$BSEP"
-cp $BSDIR/$BCFG2_SITE $DISTDIR
-
-# Create setup.sh in $DISTDIR
-if [ "`uname`x" = "SunOSx" ]; then
-    printf "#!/bin/ksh\n\n" > $DISTDIR/setup.sh
-    EXPR="/usr/ucb/expr"
-else
-    printf "#!/bin/sh\n\n" > $DISTDIR/setup.sh
-    EXPR="expr"
-fi
-######################################################################
-cat >> $DISTDIR/setup.sh << EOF
-
-# \$Id$
-
-# This is the script that is run by makeself after it extracts all the files
-# from the .run distribution. It installs epkg, and then all the encaps in the
-# right order (for client-side only, server side encaps just install manually)
-
-umask 002
-
-# Local Variables
-LOC_INSTALLDIR="\`pwd\`"
-
-# Make sure /usr/local/man exists
-if [ ! -d /usr/local ]; then mkdir /usr/local; fi
-if [ -h /usr/local/man ]; then rm /usr/local/man; fi
-if [ ! -d /usr/local/man ]; then mkdir /usr/local/man; fi
-
-# Install epkg if it isn't installed
-if [ ! -h "$EPKG" -o ! -d "$ENCAPDIR/epkg-2.3.[89]" ]; then
-    printf "epkg : (cd / && tar xf \$LOC_INSTALLDIR/epkg.tar)\n"
-    (cd / && tar xf \$LOC_INSTALLDIR/epkg.tar)
-    printf "epkg : $EPKGDIR/bin/epkg -i -q $EPKGDIR\n"
-    $EPKGDIR/bin/epkg -i -q $EPKGDIR
-fi
-
-# Install everything else
-for LOC_PKG in $BCFG2DEPS $BCFG2 $RUNIT $OSTIARTY $BCFG2_SITE; do
-    LOC_PKGSPEC="\`printf "%s\n" "\$LOC_PKG" | sed s:-encap.*::g\`"
-    if [ -d "$ENCAPDIR/\$LOC_PKGSPEC" ]; then
-        if [ "\${LOC_PKGSPEC}x" != "x" ]; then
-            printf "\$LOC_PKGSPEC : removing $ENCAPDIR/\$LOC_PKGSPEC\n"
-            ($EPKG -r -q $ENCAPDIR/\$LOC_PKGSPEC || true)
-            rm -rf $ENCAPDIR/\$LOC_PKGSPEC
-        fi
-    fi
-    printf "\$LOC_PKGSPEC : installing \${LOC_PKG}\n"
-    $EPKG -i -q \$LOC_PKG
-done
-
-## Handle passwords if not already set... [
-# Define variables
-LOC_BCFG2_CONF="/usr/local/etc/bcfg2.conf"
-LOC_BCFG2_RE='^password\ =\ $'
-LOC_OST_CFG="/usr/local/etc/ostiary.cfg"
-LOC_OST_KILL_RE='^KILL=\"-kill\"$'
-LOC_OST_ACTION_RE='^ACTION=\"-bcfg2-'
-
-# Check to see if passwords are set
-printf "Checking to see if password is set in \'\${LOC_BCFG2_CONF}\'... "
-grep "\${LOC_BCFG2_RE}" \$LOC_BCFG2_CONF >/dev/null && LOC_BCFG2_SET="no"
-if [ "\${LOC_BCFG2_SET}x" = "nox" ]; then
-    printf "no\n"
-else
-    printf "yes\n"
-fi
-
-printf "Checking to see if passwords are set in \'\${LOC_OST_CFG}\'... "
-grep "\${LOC_OST_KILL_RE}" \$LOC_OST_CFG >/dev/null && LOC_OST_SET="no"
-grep "\${LOC_OST_ACTION_RE}" \$LOC_OST_CFG >/dev/null && LOC_OST_SET="no"
-if [ "\${LOC_OST_SET}x" = "nox" ]; then
-    printf "no\n"
-else
-    printf "yes\n"
-fi
-
-# Password read function
-getpasswd() {
-    password1=""; password2=""; password=""
-    stty -echo
-    trap "stty echo ; echo 'Interrupted' ; exit 1" 1 2 3 15
-    printf "Enter \$1 password: "
-    read -r password1
-    printf "\n"
-    printf "Enter \$1 password again: "
-    read -r password2
-    printf "\n"
-    stty echo
-    if [ "\${password1}x" != "\${password2}x" ]; then
-        printf "The passwords did not match, please try again...\n"
-        getpasswd "\$1"
-    else
-        password="\${password1}"
-    fi
-}
-
-# Securely prompt sysadmin for passwords that are not either already set or
-# in the environment as LOC_BCFG2_PASSWD and/or LOC_OST_PASSWD
-if [ "\${LOC_BCFG2_SET}x" = "nox" ]; then
-    # You can set passwords as env variables to avoid interactive mode
-    if [ "\${LOC_BCFG2_PASSWD}x" = "x" ]; then
-        getpasswd bcfg2
-        LOC_BCFG2_PASSWD="\$password"
-    else
-        printf "Got LOC_BCFG2_PASSWD from environment...\n"
-    fi
-fi
-
-if [ "\${LOC_OST_SET}x" = "nox" ]; then
-    # You can set passwords as env variables to avoid interactive mode
-    if [ "\${LOC_OST_PASSWD}x" = "x" ]; then
-        getpasswd "ostiary base"
-        LOC_OST_PASSWD="\$password"
-    else
-        printf "Got LOC_OST_PASSWD from environment...\n"
-    fi
-fi
-
-# Sed quoting function - quote the &, :, ' and \ characters
-sedquote() {
-    i=1
-    while [ \$i -le \`${EXPR} length \$1\` ]; do
-        c=\`${EXPR} substr \$1 \$i 1\`
-        if [ "\${c}x" = "&x" -o "\${c}x" = ":x" -o "\${c}x" = "'x" -o "\${c}x" = "\\\\x" ]; then
-            c=\\\\\${c}
-        fi
-        printf "%s" "\$c"
-        i=\`${EXPR} \$i + 1\`
-    done
-}
-
-# Edit files with supplied password values
-umask 077
-
-if [ "\${LOC_BCFG2_SET}x" = "nox" ]; then
-    printf "Setting bcfg2 password...\n"
-    chmod 600 \$LOC_BCFG2_CONF
-    LOC_BCFG2_SED="\$LOC_INSTALLDIR/loc_bcfg2.sed"
-    printf "s:%s:password = %s:g\n" "\$LOC_BCFG2_RE" "\`sedquote "\${LOC_BCFG2_PASSWD}"\`" > \$LOC_BCFG2_SED
-    sed -f \$LOC_BCFG2_SED \$LOC_BCFG2_CONF > \${LOC_BCFG2_CONF}.withpasswords
-    chmod 600 \${LOC_BCFG2_CONF}.withpasswords
-    mv \${LOC_BCFG2_CONF}.withpasswords \${LOC_BCFG2_CONF}
-fi
-
-if [ "\${LOC_OST_SET}x" = "nox" ]; then
-    printf "Setting ostiary passwords...\n"
-    chmod 600 \$LOC_OST_CFG
-    LOC_OST_KILL_SED="\$LOC_INSTALLDIR/loc_ost_kill.sed"
-    LOC_OST_ACTION_SED="\$LOC_INSTALLDIR/loc_ost_action.sed"
-    printf "s:%s:KILL=%s%s-kill%s:g\n" "\$LOC_OST_KILL_RE" '"' "\`sedquote "\${LOC_OST_PASSWD}"\`" '"' > \$LOC_OST_KILL_SED
-    printf "s:%s:ACTION=\\"%s-bcfg2-:g\n" "\$LOC_OST_ACTION_RE" "\`sedquote "\${LOC_OST_PASSWD}"\`" > \$LOC_OST_ACTION_SED
-    sed -f \$LOC_OST_KILL_SED \$LOC_OST_CFG | sed -f \$LOC_OST_ACTION_SED \
-    > \${LOC_OST_CFG}.withpasswords
-    chmod 600 \${LOC_OST_CFG}.withpasswords
-    mv \${LOC_OST_CFG}.withpasswords \${LOC_OST_CFG}
-fi
-
-## ]
-
-# Just to be paranoid...
-chown 0 \${LOC_BCFG2_CONF}*
-chown 0 \${LOC_OST_CFG}*
-chgrp 0 \${LOC_BCFG2_CONF}*
-chgrp 0 \${LOC_OST_CFG}*
-chmod 600 \${LOC_BCFG2_CONF}*
-chmod 600 \${LOC_OST_CFG}*
-
-# Restart services if they exist to catch any config file changes
-if [ -x /usr/local/bin/sv ]; then
-    for LOC_SERVICE in bcfg2-client bcfg2-server ostiary; do
-        if [ -h /usr/local/var/service/\${LOC_SERVICE} ]; then
-            printf "Restarting runit service \${LOC_SERVICE}...\n"
-            /usr/local/bin/sv restart /usr/local/var/service/\${LOC_SERVICE}
-            sleep 2
-            /usr/local/bin/sv status /usr/local/var/service/\${LOC_SERVICE}
-        fi
-    done
-fi
-
-exit 0
-
-EOF
-######################################################################
-chmod 755 $DISTDIR/setup.sh
-
-# Create .run file from $DISTDIR with makeself
-BLURB="Bcfg2 Client install for $SITENAME (version $SITEVER) - export REPLACE_CONFIG=yes before running to force config file replacement"
-${MAKESELF} --nox11 $DISTDIR ${DISTDIR}.run "$BLURB" ./setup.sh
-
-exit 0