From 7d0a1a6cb895d0532d27323d1309fde1264af203 Mon Sep 17 00:00:00 2001
From: Menno Duursma <druiloor@zonnet.nl>
Date: Wed, 12 May 2010 17:45:03 +0200
Subject: [PATCH] system/cfengine: Updated for version 2.2.9

---
 system/cfengine/cfengine.SlackBuild | 35 ++++++++++++++++++-----------
 system/cfengine/cfengine.info       | 10 ++++-----
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/system/cfengine/cfengine.SlackBuild b/system/cfengine/cfengine.SlackBuild
index fdab1fad49..9bc0b73977 100644
--- a/system/cfengine/cfengine.SlackBuild
+++ b/system/cfengine/cfengine.SlackBuild
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 # Slackware build script for Cfengine
-# Written by Menno E. Duursma <druiloor@zonnet.nl>
+# Written by Menno Duursma <druiloor@zonnet.nl>
 
 # This program is free software. It comes without any warranty.
 # Granted WTFPL, Version 2, as published by Sam Hocevar. See
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=cfengine
-VERSION=2.2.8
+VERSION=2.2.9
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -53,16 +53,29 @@ CXXFLAGS="$SLKCFLAGS" \
   --datadir=/usr/doc \
   --libdir=/usr/lib \
   --enable-shared=yes \
-  --enable-static=no \
-  --with-docs
+  --enable-static=no
 
 make
 make install-strip DESTDIR=$PKG
 
-( cd $PKG/usr/man || exit 1
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ;
-    do ln -s $(readlink $i).gz $i.gz ; rm $i ;
+# Install manpages
+mkdir -p $PKG/usr/man/man8
+for manpage in doc/*.8; do
+  gzip -9c $manpage > $PKG/usr/man/man8/$(basename $manpage).gz
+done
+
+# Prepare and install info pages and handy links to 'em
+mkdir -p $PKG/usr/info
+for infopage in doc/*.info*; do
+  gzip -9c $infopage > $PKG/usr/info/$(basename $infopage).gz
+done
+( cd $PKG/usr/info
+  ln -vsf cfengine-Tutorial.info.gz cfengine.info.gz
+  for ref in cfkey cfshow cfagent cfservd cfexecd; do
+    ln -vsf cfengine-Reference.info.gz $ref.info.gz
+  done
+  for anom in cfenvd cfenvgraph; do
+    ln -vsf cfengine-Anomalies.info.gz $anom.info.gz
   done
 )
 
@@ -99,15 +112,11 @@ mkdir -p $PKG/var/$PRGNAM/bin
 # Put docs in the versioned directory
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 
-cp -a [A-Z][A-Z]* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a [A-Z][A-Z]* ChangeLog doc/*.{pdf,html} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
-# Compress info pages and remove the package's dir file
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/cfengine/cfengine.info b/system/cfengine/cfengine.info
index 8026f1c21e..64ee3ee2a3 100644
--- a/system/cfengine/cfengine.info
+++ b/system/cfengine/cfengine.info
@@ -1,8 +1,8 @@
 PRGNAM="cfengine"
-VERSION="2.2.8"
+VERSION="2.2.9"
 HOMEPAGE="http://www.cfengine.org/"
-DOWNLOAD="http://www.cfengine.org/downloads/cfengine-2.2.8.tar.gz"
-MD5SUM="8881c3c350f36b35845cdb1e6e53b8a1"
-MAINTAINER="Menno E. Duursma"
+DOWNLOAD="http://www.cfengine.org/downloads/cfengine-2.2.9.tar.gz"
+MD5SUM="ce115587078a7a8345dca52891f95513"
+MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="dsomero"