1 files changed, 14 insertions, 23 deletions
diff --git a/system/cfengine/cfengine.SlackBuild b/system/cfengine/cfengine.SlackBuild
index a24dc3922e53..f88193da8257 100644
--- a/system/cfengine/cfengine.SlackBuild
+++ b/system/cfengine/cfengine.SlackBuild
@@ -1,17 +1,15 @@
 #!/bin/sh
 
 # Slackware build script for Cfengine
-#
-# Written by Menno Duursma <druiloor@zonnet.nl>
 
-# Exit on most errors
-set -e
+# Written by Menno Duursma <druiloor@zonnet.nl>
 
 PRGNAM=cfengine
-VERSION=2.1.22
+VERSION=2.2.3
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -23,11 +21,13 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e # Exit on most errors
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root . 
 chmod -R u+w,go+r-w,a-s .
@@ -42,16 +42,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --datadir=/usr/doc \
+  --libdir=/usr/lib \
+  --enable-shared=yes \
   --with-docs
 
-# Compile the application and install it into the $PKG directory
 make
 make install-strip DESTDIR=$PKG
 
 # Create the server directory (may not be needed)
 mkdir -p $PKG/var/cfengine/masterfiles
 
-# Include an example config files
+# Include example config files
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.cfengine > $PKG/etc/rc.d/rc.cfengine.new
 mkdir -p $PKG/var/cfengine/inputs
@@ -60,38 +61,28 @@ cat $CWD/config/cfagent.conf > $PKG/var/cfengine/inputs/cfagent.conf.new
 cat $CWD/config/cfservd.conf > $PKG/var/cfengine/inputs/cfservd.conf.new
 cat $CWD/config/cfrun.hosts > $PKG/var/cfengine/inputs/cfrun.hosts.new
 
-# Compress man pages
-( cd $PKG/usr/man
+( 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 ;
   done
 )
 
-# Compress info pages and remove the package's dir file
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
-( cd $PKG/usr/info
-  # link main-page to the ref doc
-  ln -s cfengine-Reference.info.gz cfengine.info.gz
-)
 
-# Move program documentation into place
+# Put docs in the versioned directory
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc
-  # Fix permissions
-  find . -type f -exec chmod 644 {} \;
-)
 
-# Include the SlackBuild script in the documentation directory
+cp -a [A-Z][A-Z]* ChangeLog $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.SBo
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
-# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Make the package; be sure to leave it in $OUTPUT
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz