system/xosd: Updated for version 2.2.12

3 files changed, 30 insertions, 20 deletions

diff --git a/system/xosd/README b/system/xosd/README
index d51964576f..82c2b1126b 100644
--- a/system/xosd/README
+++ b/system/xosd/README
@@ -1,8 +1,7 @@
 xosd (On Screen Display)
 
-XOSD displays text on your screen, sounds simple right? The
-difference is it is unmanaged and shaped, so it appears transparent.
-This gives the effect of an On Screen Display, like your TV/VCR etc.
-The package also includes an xmms plugin, which automatically
-displays various interesting things as they change (song name,
-volume etc...)
+XOSD displays text on your screen; sounds simple, right? The difference is 
+that it is unmanaged and shaped, so it appears transparent.  This gives the 
+effect of an On Screen Display, like your TV/VCR etc.  The package also 
+includes an xmms plugin, which automatically displays various interesting 
+things as they change (song name, volume etc...)
diff --git a/system/xosd/xosd.SlackBuild b/system/xosd/xosd.SlackBuild
index f1b380e94a..3f0146a080 100644
--- a/system/xosd/xosd.SlackBuild
+++ b/system/xosd/xosd.SlackBuild
@@ -4,31 +4,38 @@
 # Written by Jick Nan (jick.nan 在 gmail.com)
 
 # Modified by the SlackBuilds.org project
+# Modified for 64bit by Ash Wiren  (ash@spooksoftware.com)
 
 PRGNAM=xosd
 VERSION=2.2.12
-ARCH=${ARCH:-i486}	# this should not change
+ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)	
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/pkg-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
-
 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
+
 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 xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
@@ -36,19 +43,21 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  || exit 1
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
-make DESTDIR=$PKG || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
-if [ -d $PKG/usr/man ]; then
-  gzip -9 $PKG/usr/man/man?/*
-fi
+gzip -9 $PKG/usr/man/man?/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
@@ -56,4 +65,4 @@ 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/xosd/xosd.info b/system/xosd/xosd.info
index f3b2ee33a5..00b5e738d7 100644
--- a/system/xosd/xosd.info
+++ b/system/xosd/xosd.info
@@ -3,6 +3,8 @@ VERSION="2.2.12"
 HOMEPAGE="http://www.ignavus.net/software.html"
 DOWNLOAD="http://www.ignavus.net/xosd-2.2.12.tar.gz"
 MD5SUM="7cc90bdaf267cdc996643de193c9689a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Jick Nan"
 EMAIL="jick.nan@gmail.com"
 APPROVED="rworkman"