From 8cff5da6f72d5fa2cf1dd92c5203e917b3351df4 Mon Sep 17 00:00:00 2001
From: Menno Duursma <druiloor@zonnet.nl>
Date: Thu, 13 May 2010 00:39:50 +0200
Subject: [PATCH] system/cfengine: Updated for version 2.2.10

---
 system/cfengine/README              |  1 -
 system/cfengine/cfengine.SlackBuild | 12 ++++++++----
 system/cfengine/cfengine.info       | 10 ++++++----
 system/cfengine/slack-desc          |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/system/cfengine/README b/system/cfengine/README
index 75eab9fbf6..fba4ef5985 100644
--- a/system/cfengine/README
+++ b/system/cfengine/README
@@ -16,4 +16,3 @@ http://www.ieeetcsc.org/newsletters/2002-01/burgess.html
 
 Automating Security with GNU cfengine by Kirk Bauer
 http://www.linuxjournal.com/article/6848
-
diff --git a/system/cfengine/cfengine.SlackBuild b/system/cfengine/cfengine.SlackBuild
index 9bc0b73977..62e37582b1 100644
--- a/system/cfengine/cfengine.SlackBuild
+++ b/system/cfengine/cfengine.SlackBuild
@@ -8,7 +8,7 @@
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=cfengine
-VERSION=2.2.9
+VERSION=2.2.10
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -20,10 +20,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -51,9 +54,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --datadir=/usr/doc \
-  --libdir=/usr/lib \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-shared=yes \
-  --enable-static=no
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -122,4 +126,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/cfengine/cfengine.info b/system/cfengine/cfengine.info
index 64ee3ee2a3..ba7d43d158 100644
--- a/system/cfengine/cfengine.info
+++ b/system/cfengine/cfengine.info
@@ -1,8 +1,10 @@
 PRGNAM="cfengine"
-VERSION="2.2.9"
+VERSION="2.2.10"
 HOMEPAGE="http://www.cfengine.org/"
-DOWNLOAD="http://www.cfengine.org/downloads/cfengine-2.2.9.tar.gz"
-MD5SUM="ce115587078a7a8345dca52891f95513"
+DOWNLOAD="http://www.cfengine.org/tarballs/cfengine-2.2.10.tar.gz"
+MD5SUM="3b90ff8bf2ec941cd33cfb65f5012f16"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/system/cfengine/slack-desc b/system/cfengine/slack-desc
index 9885041a13..26a095cfbd 100644
--- a/system/cfengine/slack-desc
+++ b/system/cfengine/slack-desc
@@ -16,4 +16,4 @@ cfengine:
 cfengine: Cfengine was written and is maintained by Mark Burgess.
 cfengine:
 cfengine:
-cfengine:  
+cfengine: