4 files changed, 24 insertions, 46 deletions
diff --git a/system/fsarchiver/README b/system/fsarchiver/README
index 85c0a7ea1d198..f5cfdc3255191 100644
--- a/system/fsarchiver/README
+++ b/system/fsarchiver/README
@@ -8,18 +8,11 @@ Everything is checksummed in the archive in order to protect the data.
 If the archive is corrupt, you just loose the current file, not the 
 whole archive.
 
-Build Notes:
-Please note that LZMA support is disabled in the script, the source 
-apparently needs next major version of LZMA (renamed XZ) which is 
-still in beta.
-
-Static binary is built so it can be copied with your backup scripts and 
-used when you don't have package installed but need the binary.
-
 Dependencies:
 zlib, bzip2, e2fsprogs and other filesystem tools which are all part 
 of Slackware.
 
-There are no man pages in the package.  For short help, fsarchiver -h.  
-For detailed usage, check out the project website
-at http://www.fsarchiver.org/Main_Page
+There's a manpage now so you can get on usage by doing:
+1. fsarchiver -h (for short help)
+2. man 8 fsarchiver
+3. Or, check out the project website at http://www.fsarchiver.org/Main_Page
diff --git a/system/fsarchiver/fsarchiver.SlackBuild b/system/fsarchiver/fsarchiver.SlackBuild
index 16f1f71f90505..9cfbe66fa83af 100644
--- a/system/fsarchiver/fsarchiver.SlackBuild
+++ b/system/fsarchiver/fsarchiver.SlackBuild
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # Slackware Package Build Script for fsarchiver
-# Home Page http://www.fsarchiver.org/Main_Page
+# Home Page: http://www.fsarchiver.org/Main_Page
 
-# Copyright (c) 2009, Nishant Limbachia (nishant@mnspace.net)
+# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA [nishant__AT__mnspace__DOT__net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is 
@@ -23,11 +23,9 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Modified by the SlackBuilds.org project.
 
 PRGNAM=fsarchiver
-VERSION=0.5.7
+VERSION=0.6.7
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -48,18 +46,7 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
-set -e 
-
-### [en|dis]able LZMA (XZ) support.  This is not intended for 12.2
-### as XZ is not available for 12.2.  Specifically added for folks 
-### running -current or Slackware64.
-### run script with LZMA=yes fsarchiver.SlackBuild
-
-if [ ${LZMA:-no} = "no" ]; then
-	DO_LZMA="dis"
-else
-	DO_LZMA="en"
-fi
+set -e 	# Exit on most errors
 
 rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -73,14 +60,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-if [ "$ARCH" = "x86_64" ]; then
-# Fix hard coded lib paths
-  sed -i -e "s|/usr/lib/libext2fs.a|/lib${LIBDIRSUFFIX}/libext2fs.a|g" \
-         -e "s|/usr/lib/libcom_err.a|/lib${LIBDIRSUFFIX}/libcom_err.a|g" \
-         -e "s|/usr/lib/|/usr/lib${LIBDIRSUFFIX}/|g" \
-         configure
-fi
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -88,9 +67,7 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-static \
-  --${DO_LZMA}able-lzma \
-  --disable-lzo
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -101,8 +78,14 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+### compress man pages
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+) 
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/fsarchiver/fsarchiver.info b/system/fsarchiver/fsarchiver.info
index 7516ba2feab19..fa4a003e42013 100644
--- a/system/fsarchiver/fsarchiver.info
+++ b/system/fsarchiver/fsarchiver.info
@@ -1,8 +1,11 @@
 PRGNAM="fsarchiver"
-VERSION="0.5.7"
+VERSION="0.6.7"
 HOMEPAGE="http://www.fsarchiver.org/Main_Page"
-DOWNLOAD="http://downloads.sourceforge.net/fsarchiver/fsarchiver-0.5.7.tar.gz"
-MD5SUM="2ddc2b9e6f05cc17a429f93d3fba5e11"
+DOWNLOAD="http://downloads.sourceforge.net/fsarchiver/fsarchiver-0.6.7.tar.gz"
+MD5SUM="c7f243de54647b4ad694526c340300b4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="dsomero"
+APPROVED="michiel"
+
diff --git a/system/fsarchiver/slack-desc b/system/fsarchiver/slack-desc
index 9dd3e13a267c1..63c85d9d61138 100644
--- a/system/fsarchiver/slack-desc
+++ b/system/fsarchiver/slack-desc
@@ -4,8 +4,7 @@
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
+          |-----handy-ruler------------------------------------------------|
 fsarchiver: fsarchiver (Filesystem Archiver for Linux)
 fsarchiver:
 fsarchiver: FSArchiver is a system tool that allows you to save the