system/lirc: Updated for version 0.8.4a

1 files changed, 28 insertions, 45 deletions

diff --git a/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild
index b580b24cffcc8..de644df7186a6 100644
--- a/system/lirc/lirc.SlackBuild
+++ b/system/lirc/lirc.SlackBuild
@@ -2,7 +2,9 @@
 
 # Slackware build script for lirc
 
+# Copyright 2009  Johann Wilhelm <johann.wilhelm@9mal6.de>
 # Copyright 2007  David Somero <dsomero@hotmail.com>
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +24,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Robby Workman of the SlackBuilds.org project
-# No additional license terms and no copyright claim :-)
-
 PRGNAM=lirc
-VERSION=0.8.3
+VERSION=0.8.4a
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -36,17 +35,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PKG_VERSION=${PKG_VERSION:-$VERSION} # Only changes if BLASTER=yes
-
 # Any of these can be changed by passing the desired value on command line
 # when executing the build script.  For example:
-# BLASTER=yes ./lirc.SlackBuild
-# Note that IRQ and PORT are only important if BLASTER is "yes"
-BLASTER=${BLASTER:-no}
+# IRQ=5 ./lirc.SlackBuild
 IRQ=${IRQ:-4}
 PORT=${PORT:-0x3f8}
 KERNEL=${KERNEL:-$(uname -r)}
 
+PKG_VERSION=${VERSION}_$(echo $KERNEL | tr '-' '_')
+
 if [ "${ARCH}" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "${ARCH}" = "i686" ]; then
@@ -70,6 +67,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Patch configure to not build a couple of things that either won't work
+# or will break compilation
+patch -p1 < $CWD/$PRGNAM-$VERSION.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -78,44 +79,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --exec-prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
   --enable-sandboxed \
-  --with-driver=userspace \
+  --with-driver=all \
+  --with-transmitter \
   --with-x \
-  --program-prefix="" \
-  --program-suffix=""
+  --with-major=61 \
+  --with-port=$PORT \
+  --with-irq=$IRQ \
+  --with-moduledir=/lib/modules/$KERNEL/misc \
+  --build=$ARCH-slackware-linux
 
-make
+make 
 make install DESTDIR=$PKG
 
-if [ "$BLASTER" = "yes" ] ;then 
-  make distclean
-
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
-    --prefix=/usr \
-    --mandir=/usr/man \
-    --exec-prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --enable-sandboxed \
-    --with-driver=serial \
-    --with-transmitter \
-    --with-x \
-    --with-major=61 \
-    --with-port=$PORT\
-    --with-irq=$IRQ \
-    --with-moduledir=/lib/modules/$KERNEL/misc
-
-  make 
-  make install DESTDIR=$PKG
-  PKG_VERSION=${VERSION}_$(echo $KERNEL | tr '-' '_')
-fi
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERSION
 cp -a ANNOUNCE AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
   doc/lirc.hwdb contrib/lircrc $PKG/usr/doc/$PRGNAM-$PKG_VERSION
 install -m 0644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$PKG_VERSION
+install -m 0644 $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$PKG_VERSION
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
@@ -128,15 +111,15 @@ install -m 0644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$PKG_VERSION
 )
 
 install -D -m 0644 contrib/lircd.conf $PKG/etc/lircd.conf.new
-install -D -m 0644 contrib/lircmd.conf $PKG/etc/lircmd.conf.new
-install -D -m 0644 contrib/lircrc $PKG/etc/lircrc.new
-install -D -m 0644 contrib/lirc.rules $PKG/etc/udev/rules.d/96-lirc.rules
+install -m 0644 contrib/lircmd.conf $PKG/etc/lircmd.conf.new
+install -m 0644 contrib/lircrc $PKG/etc/lircrc.new
+install -D -m 0644 contrib/lirc.rules $PKG/lib/udev/rules.d/96-lirc.rules
 
 rm -rf $PKG/dev 	# We don't need this
 
 mkdir -p $PKG/install
-install -m 0644 $CWD/doinst.sh $PKG/install/doinst.sh
-install -m 0644 $CWD/slack-desc $PKG/install/slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$PKG_VERSION-$ARCH-$BUILD$TAG.tgz