development/quilt: Updated for version 0.46

3 files changed, 24 insertions, 14 deletions

diff --git a/development/quilt/README b/development/quilt/README
index b75de6f385..6e2ed8bc23 100644
--- a/development/quilt/README
+++ b/development/quilt/README
@@ -1,7 +1,7 @@
 These scripts allow to manage a series of patches by keeping track of the
-changes each patch makes. Patches can be applied, un-applied, refreshed, etc.
+changes each patch makes.  Patches can be applied, un-applied, refreshed, etc.
 
-The key philosophical concept is that your primary output is patches. Not ".c"
+The key philosophical concept is that your primary output is patches - not ".c"
 files, not ".h" files, but patches, so patches are the first-class object here.
 
 Quilt was originally based on Andrew Morton's patch scripts published on the
diff --git a/development/quilt/quilt.SlackBuild b/development/quilt/quilt.SlackBuild
index f45b5e8d2a..081ebc137d 100644
--- a/development/quilt/quilt.SlackBuild
+++ b/development/quilt/quilt.SlackBuild
@@ -24,7 +24,7 @@
 
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
-PRGNAME=quilt
+PRGNAM=quilt
 VERSION=0.46
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
@@ -32,13 +32,18 @@ TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAME
+PKG=$TMP/package-$PRGNAM
 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
@@ -46,9 +51,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAME-$VERSION
-tar xvf $CWD/$PRGNAME-$VERSION.tar.gz
-cd $PRGNAME-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
@@ -56,7 +61,9 @@ CFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --build=$ARCH-slackware-linux
 
 make
 make install BUILD_ROOT=$PKG docdir=/usr/doc
@@ -65,17 +72,18 @@ make install BUILD_ROOT=$PKG docdir=/usr/doc
 mv $PKG/etc/quilt.quiltrc $PKG/etc/quilt.quiltrc.new
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 ( find $PKG/usr/man -type f -name "*.?" | xargs gzip -9f )
 
-cp -a AUTHORS COPYING TODO quilt.changes $PKG/usr/doc/$PRGNAME-$VERSION
-cat $CWD/$PRGNAME.SlackBuild > $PKG/usr/doc/$PRGNAME-$VERSION/$PRGNAME.SlackBuild
+cp -a AUTHORS COPYING TODO quilt.changes $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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/$PRGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/quilt/quilt.info b/development/quilt/quilt.info
index 8736e14b41..696215522f 100644
--- a/development/quilt/quilt.info
+++ b/development/quilt/quilt.info
@@ -3,6 +3,8 @@ VERSION="0.46"
 HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
 DOWNLOAD="http://download.savannah.gnu.org/releases/quilt/quilt-0.46.tar.gz"
 MD5SUM="4508546d1ed0257ef7c128b6121b7208"
-MAINTAINER="Arun Prasannan"
-EMAIL="polar@arunprasannan.com"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Ash Wiren"
+EMAIL="ash@spooksoftware.com"
 APPROVED="rworkman"