network/irda-utils: Updated for version 0.9.18

1 files changed, 29 insertions, 16 deletions

diff --git a/network/irda-utils/irda-utils.SlackBuild b/network/irda-utils/irda-utils.SlackBuild
index 8df11c56c5..2c7db59756 100644
--- a/network/irda-utils/irda-utils.SlackBuild
+++ b/network/irda-utils/irda-utils.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 
+ 
 # Slackware build script for irda-utils
 # (C) 2007 Michael Wagner <lapinours@web.de> 
 # All rights reserved.
@@ -24,8 +24,9 @@
 PRGNAM=irda-utils
 VERSION=0.9.18
 ARCH=${ARCH:-i486} 
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -36,24 +37,34 @@ OUTPUT=${OUTPUT:-/tmp}
 # like -fno-strict-aliasing
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1 
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 # Patch irnetd's Makefile to recognize $ROOT
-patch -p0 < $CWD/Makefile.irnetd.diff || exit 1 
+patch -p0 < $CWD/patches/Makefile.irnetd.diff
 
 # Patch smcinit's Makefile to link libz
-patch -p0 < $CWD/Makefile.smcinit.diff || exit 1
+patch -p0 < $CWD/patches/Makefile.smcinit.diff
+
+# io.h has moved in newer kernel includes
+patch -p1 < $CWD/patches/irda-utils-0.9.18-fixup_io.c_include.diff
 
 # Now that we have declared $SLKCFLAGS, lets use it
 find . -name Makefile | \
@@ -65,14 +76,20 @@ while read i; do
 done
 
 mkdir -p $PKG/usr/bin $PKG/usr/sbin $PKG/usr/man
-make || exit 1
-make install ROOT=$PKG MANDIR=$PKG/usr/man || exit 1
+make
+make install ROOT=$PKG MANDIR=$PKG/usr/man
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | 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 . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
+# Use a BSD-style init script (emphasise is put on "style" ;) )
+mkdir -p $PKG/etc/rc.d && rm -rf $PKG/etc/rc.d/init.d
+cat $CWD/rc.irda.new > $PKG/etc/rc.d/rc.irda.new
+
 # Documentation is spread all over the source package; just include the README files
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 find . -name README | \
@@ -81,13 +98,9 @@ while read i; do
 done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Use a BSD-style init script (emphasise is put on "style" ;) )
-mkdir -p $PKG/etc/rc.d && rm -rf $PKG/etc/rc.d/init.d
-cat $CWD/rc.irda.new > $PKG/etc/rc.d/rc.irda.new
-
 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/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}