diff options
| -rw-r--r-- | desktop/xfce4-xkb-plugin/slack-desc | 12 | ||||
| -rw-r--r-- | desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild | 29 | ||||
| -rw-r--r-- | desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info | 8 |
3 files changed, 31 insertions, 18 deletions
diff --git a/desktop/xfce4-xkb-plugin/slack-desc b/desktop/xfce4-xkb-plugin/slack-desc index 2e4cdb01c7..c0082d1428 100644 --- a/desktop/xfce4-xkb-plugin/slack-desc +++ b/desktop/xfce4-xkb-plugin/slack-desc @@ -11,9 +11,9 @@ xfce4-xkb-plugin: xfce4-xkb-plugin: The xkb plugin can be used to show the current keyboard xfce4-xkb-plugin: layout and/or to select a layout from those defined in xfce4-xkb-plugin: the /etc/X11/xorg.conf file. -xfce4-xkb-plugin: -xfce4-xkb-plugin: -xfce4-xkb-plugin: -xfce4-xkb-plugin: -xfce4-xkb-plugin: -xfce4-xkb-plugin: +xfce4-xkb-plugin: +xfce4-xkb-plugin: +xfce4-xkb-plugin: +xfce4-xkb-plugin: +xfce4-xkb-plugin: +xfce4-xkb-plugin: diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild index b096ae073a..f708bf8ec6 100644 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild +++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfce4-xkb-plugin -# Copyright 2006-2007 Robby Workman (http://rlworkman.net) +# Copyright 2006-2009 Robby Workman, Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-xkb-plugin -VERSION=0.4.3 +VERSION=0.5.3.3 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,8 +35,13 @@ 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 @@ -45,7 +50,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -58,25 +63,31 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc/xfce \ --enable-shared=yes \ --enable-static=no \ - --enable-debug=no + --enable-debug=no \ + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG ( 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 + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL NEWS README \ + $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 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/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info index 62fdd363ac..e007054872 100644 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info +++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info @@ -1,8 +1,10 @@ PRGNAM="xfce4-xkb-plugin" -VERSION="0.4.3" +VERSION="0.5.3.3" HOMEPAGE="http://goodies.xfce.org/" -DOWNLOAD="http://goodies.xfce.org/releases/xfce4-xkb-plugin/xfce4-xkb-plugin-0.4.3.tar.bz2" -MD5SUM="e0375158339672f49c9e48a8b4669592" +DOWNLOAD="http://goodies.xfce.org/releases/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3.tar.gz" +DOWNLOAD_x86_64="" +MD5SUM="b233cc9de1cbace075eaf6e2c9a8e685" +MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" APPROVED="Erik Hanson" |