3 files changed, 162 insertions, 3 deletions
diff --git a/encap/tools/bcfg2-server/Makefile b/encap/tools/bcfg2-server/Makefile
index 6e73f0576..454897400 100644
--- a/encap/tools/bcfg2-server/Makefile
+++ b/encap/tools/bcfg2-server/Makefile
@@ -1,4 +1,4 @@
-# $Id:$
+# $Id$
 
 .PHONY : all install clean uninstall encaps rename
 .SUFFIXES : 
@@ -14,6 +14,8 @@ export MKENCAP
 
 GLIB = bcfg2-glib-2.8.6
 GAMIN = bcfg2-gamin-0.1.7
+CHEETAH = bcfg2-cheetah-2.0rc7
+CHEETAH-DOC = bcfg2-cheetah-doc-0.9.16a1
 
 .ep.installed : # Clean, compile and install an encap package
 	@printf "***** START .ep.installed for |$*| ***** \n"
@@ -39,9 +41,9 @@ GAMIN = bcfg2-gamin-0.1.7
 all :
 	( $(MAKE) install > make.log 2>&1 && $(MAKE) encaps >> make.log 2>&1 ) &
 
-install : ${EPKG} ${MKENCAP} ${GAMIN}.installed
+install : ${EPKG} ${MKENCAP} ${CHEETAH-DOC}.installed
 
-encaps : ${EPKG} ${MKENCAP} ${GAMIN}.packaged
+encaps : ${EPKG} ${MKENCAP} ${CHEETAH-DOC}.packaged
 
 rename : encaps
 	test "$${OS}x" != "x"
@@ -61,7 +63,13 @@ uninstall : clean
 	( rm -rf ${ENCAPDIR}/bcfg2-glib* || true )
 	( ${EPKG} -q -r ${ENCAPDIR}/bcfg2-gamin* || true )
 	( rm -rf ${ENCAPDIR}/bcfg2-gamin* || true )
+	( ${EPKG} -q -r ${ENCAPDIR}/bcfg2-cheetah* || true )
+	( rm -rf ${ENCAPDIR}/bcfg2-cheetah* || true )
     
 ${GAMIN}.installed : ${GLIB}.installed
+${CHEETAH}.installed : ${GAMIN}.installed
+${CHEETAH-DOC}.installed : ${CHEETAH}.installed
 
 ${GAMIN}.packaged : ${GLIB}.packaged
+${CHEETAH}.packaged : ${GAMIN}.packaged
+${CHEETAH-DOC}.packaged : ${CHEETAH}.packaged
diff --git a/encap/tools/bcfg2-server/bcfg2-cheetah-2.0rc7.ep b/encap/tools/bcfg2-server/bcfg2-cheetah-2.0rc7.ep
new file mode 100644
index 000000000..ba77108f3
--- /dev/null
+++ b/encap/tools/bcfg2-server/bcfg2-cheetah-2.0rc7.ep
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-cheetah-2.0rc7"
+>
+
+<environment
+        variable="CC"
+        value="gcc"
+        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://www.pobox.com/users/dclark/mirror/cheetah/Cheetah-2.0rc7.tar.gz
+http://umn.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-2.0rc7.tar.gz"
+>
+
+<configure>
+/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+-I/usr/local/lib/bcfg2/include \
+-L/usr/local/lib/bcfg2/lib \
+-L/usr/local/lib/bcfg2/lib/python2.4/site-packages
+</configure>
+
+<build>
+/usr/local/lib/bcfg2/bin/python setup.py build \
+--build-base=${builddir}/build
+</build>
+
+<install>
+/usr/local/lib/bcfg2/bin/python setup.py install \
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
+</install> 
+
+<clean>
+/usr/local/lib/bcfg2/bin/python setup.py clean --all
+</clean>
+
+</source>
+
+<prepackage type="set">
+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/tools/bcfg2-server/bcfg2-cheetah-doc-0.9.16a1.ep b/encap/tools/bcfg2-server/bcfg2-cheetah-doc-0.9.16a1.ep
new file mode 100644
index 000000000..023e0bf21
--- /dev/null
+++ b/encap/tools/bcfg2-server/bcfg2-cheetah-doc-0.9.16a1.ep
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-cheetah-doc-0.9.16a1"
+>
+
+<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://www.pobox.com/users/dclark/mirror/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>
+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>