Update.

1 files changed, 68 insertions, 24 deletions

diff --git a/fuse/build/fuse.SlackBuild b/fuse/build/fuse.SlackBuild
index b7a251a9..c41e144e 100755
--- a/fuse/build/fuse.SlackBuild
+++ b/fuse/build/fuse.SlackBuild
@@ -6,7 +6,7 @@
 #
 # Slackware SlackBuild script 
 # ===========================
-# By:        Eric Hameleers <alien@sox.homeip.net>
+# By:        Eric Hameleers <alien@slackware.com>
 # For:       fuse
 # URL:       http://fuse.sourceforge.net/
 # Needs:     
@@ -24,6 +24,8 @@
 #            * Fixed generation of the fuse-module-xxxxxx.txt file which is
 #              basically the slack-desc- file. Also, added a "rm -rf $PKG2"
 #              in the "--cleanup" section.
+# 2.5.3-1:   25/aug/2006 by Eric Hameleers <alien@slackware.com>
+#            * Upgrade, script cleanup.
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -40,16 +42,29 @@ fi
 
 PRGNAM=fuse
 PRGNAM2=fuse-module
-VERSION=2.4.2
-KVERSION=${KVERSION:-`/usr/bin/uname -r`}
-KSRC=${KSRC:-/lib/modules/$KVERSION/build}
+VERSION=2.5.3
+KVER=${KVER:-`/usr/bin/uname -r`}
+KSRC=${KSRC:-/lib/modules/${KVER}/build}
 ARCH=${ARCH:-i486}
-BUILD=2
+BUILD=1
+
+DOCS="AUTHORS COPYING COPYING.LIB ChangeLog FAQ Filesystems \
+      NEWS README README-2.4 README.NFS doc/how-fuse-works doc/kernel.txt"
+
+SOURCE="${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
+
+# Slackware 11 and up need other option (gcc > 3.3.x)
+if [ `gcc -dumpversion | tr -d  '.' |cut -c 1-2` -gt 33 ]; then
+  MOPT=tune
+else
+  MOPT=cpu
+fi
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -61,6 +76,38 @@ PKG2=$TMP/package-$PRGNAM2
 
 if [ ! -d $TMP/tmp-$PRGNAM ]; then
   mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+elif [ "$1" != "--oldbuild" ]; then
+  # If the "--oldbuild" parameter is present, we keep
+  #  the old build files and continue;
+  # By default we remove the remnants of previous build and continue:
+  rm -rf $TMP/tmp-$PRGNAM/*
+fi
+
+if [ ! -d $PKG ]; then
+  mkdir -p $PKG # place for the package to be built
+else
+  rm -rf $PKG/*   # cleanup target before the build
+fi
+if [ ! -d $PKG2 ]; then
+  mkdir -p $PKG2 # place for the package to be built
+else
+  rm -rf $PKG2/*   # cleanup target before the build
+fi
+
+# Download the sources if requested
+if [ "${SOURCE}" != "" ] && ! [ -f ${CWD}/${SOURCE} ]; then
+  echo "Source '${SOURCE}' not available yet... will download now:"
+  wget -nv -O ${CWD}/${SOURCE} "${SRCURL}"
+  if [ $? -ne 0 ]; then
+    echo "Downloading '${SOURCE}' failed... aborting the build."
+    mv -f ${CWD}/${SOURCE} ${CWD}/${SOURCE}.FAIL
+    exit 1
+  fi
+fi
+
+if [ "$1" == "--download" ]; then
+  echo "Download complete."
+  exit 0
 fi
 
 
@@ -70,12 +117,6 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-rm -rf $PKG/*
-mkdir -p $PKG # place for the package to be built
-
-rm -rf $PKG2/*
-mkdir -p $PKG2
-
 cd $PKG
 
 # Explode the package framework:
@@ -89,10 +130,17 @@ cd $TMP/tmp-$PRGNAM
 # --- TARBALL EXTRACTION,PATCH,MODIFY ---
 
 echo "Extracting the program tarball for $PRGNAM..."
-tar -xzvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+if `file $CWD/${SOURCE} | grep -q ": bzip2"`; then
+  tar -xjvf $CWD/${SOURCE}
+else
+  tar -xzvf $CWD/${SOURCE}
+fi
+if [ $? -ne 0 ]; then
+  echo "Error in unpacking '${SOURCE}!' Aborting..."
+  exit $?
+fi
 
 cd ${PRGNAM}-${VERSION}
-
 chown -R root.root *
 
 
@@ -126,16 +174,13 @@ fi
 
 # --- DOCUMENTATION ---
 
-DOCS="AUTHORS COPYING COPYING.LIB ChangeLog FAQ Filesystems \
-      NEWS README README-2.4 README.NFS doc/how-fuse-works doc/kernel.txt"
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS \
       $PKG/usr/doc/$PRGNAM-$VERSION
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 # Compress the man page(s)
-gzip -9f $PKG/usr/man/*/*
+find $PKG/usr/man -name "*.?" -type f -exec gzip -9f {} \;
 
 # Strip binaries
 ( cd $PKG
@@ -147,7 +192,6 @@ gzip -9f $PKG/usr/man/*/*
 # --- OWNERSHIP, RIGHTS ---
 
 chmod -R o-w $PKG
-chown root:bin $PKG/usr/bin/* $PKG/usr/sbin/* $PKG/bin/* $PKG/sbin/* 2>/dev/null
 
 # Some people might find this a security risk. The fuse documentation thinks it
 # is wrapped in adequate safety guards. If you do not make fusermount setuid root,
@@ -181,7 +225,7 @@ mkdir -p $PKG2/install
 cat <<-EEOOTT > $PKG2/install/doinst.sh
 	# Only run depmod on matching running kernel
 	# Slackware will run depmod anyway on reboot):
-	MYMODVER=$KVERSION
+	MYMODVER=$KVER
 	MYKERNEL=\`uname -r\`
 	
 	if [ "\$MYKERNEL" = "\$MYMODVER" ]; then
@@ -200,10 +244,10 @@ cat <<-EEOOTT > $PKG2/install/doinst.sh
 	EEOOTT
 
 cat $CWD/${PRGNAM2}.slack-desc > $PKG2/install/slack-desc
-makepkg --linkadd y --chown n $TMP/$PRGNAM2-${VERSION}_${KVERSION}-$ARCH-$BUILD.tgz \
+makepkg --linkadd y --chown n $TMP/$PRGNAM2-${VERSION}_${KVER}-$ARCH-$BUILD.tgz \
   2>&1 | tee $CWD/makepkg-${PRGNAM2}.log
-(cd $TMP && md5sum $PRGNAM2-${VERSION}_${KVERSION}-$ARCH-$BUILD.tgz > $PRGNAM2-${VERSION}_${KVERSION}-$ARCH-$BUILD.tgz.md5)
-cat $PKG2/install/slack-desc | grep "^${PRGNAM2}" > $TMP/$PRGNAM2-${VERSION}_${KVERSION}-$ARCH-$BUILD.txt
+(cd $TMP && md5sum $PRGNAM2-${VERSION}_${KVER}-$ARCH-$BUILD.tgz > $PRGNAM2-${VERSION}_${KVER}-$ARCH-$BUILD.tgz.md5)
+cat $PKG2/install/slack-desc | grep "^${PRGNAM2}" > $TMP/$PRGNAM2-${VERSION}_${KVER}-$ARCH-$BUILD.txt
 
 
 # --- CLEANUP ---