desktop/dmenu: Updated for version 3.9

4 files changed, 52 insertions, 26 deletions

diff --git a/desktop/dmenu/README b/desktop/dmenu/README
index 598e35ce74..56803cb4a5 100644
--- a/desktop/dmenu/README
+++ b/desktop/dmenu/README
@@ -1,4 +1,3 @@
 dmenu - dynamic menu
 
 dmenu is a generic and efficient menu for X.
-
diff --git a/desktop/dmenu/dmenu.SlackBuild b/desktop/dmenu/dmenu.SlackBuild
index 212098c5ba..5dff1991e5 100644
--- a/desktop/dmenu/dmenu.SlackBuild
+++ b/desktop/dmenu/dmenu.SlackBuild
@@ -1,13 +1,32 @@
 #!/bin/sh
 
 # Slackware build script for dmenu
-# Written by core <eroc@linuxmail.org>
+
+# Copyright (c) 2008, Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 1.- Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dmenu
-VERSION=3.0
+VERSION=3.9
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -17,31 +36,39 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 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 a-s,u+rw,go-w .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
-# Fix the prefix and manpage directory
-sed -i 's/PREFIX = \/usr\/local/PREFIX = \/usr/' config.mk || exit 1
-sed -i s#'MANPREFIX = ${PREFIX}/share/man'#'MANPREFIX = ${PREFIX}/man'# config.mk || exit 1
-# .. and the CFLAGS
-sed -i 's/CFLAGS = -Os /CFLAGS += /g' config.mk || exit 1
+# Fix the prefix, mandir and CFLAGS
+sed -i \
+  -e 's/^PREFIX = \/usr\/local/PREFIX = \/usr/' \
+  -e 's/^MANPREFIX = ${PREFIX}\/share\/man/MANPREFIX = ${PREFIX}\/man/' \
+  -e 's/^CFLAGS = /CFLAGS +=/' \
+  config.mk
 
-CFLAGS="$SLKCFLAGS" make || exit 1
-make install DESTDIR=$PKG || exit 1
+CFLAGS=${SLKCFLAGS} make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find $PKG | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+( find $PKG | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  find $PKG | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
 
-( cd $PKG/usr/man || exit
+( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
diff --git a/desktop/dmenu/dmenu.info b/desktop/dmenu/dmenu.info
index 244cb8fcca..85a06b0a4c 100644
--- a/desktop/dmenu/dmenu.info
+++ b/desktop/dmenu/dmenu.info
@@ -1,8 +1,8 @@
 PRGNAM="dmenu"
-VERSION="3.0"
-HOMEPAGE="http://www.suckless.org/wiki/tools/xlib"
-DOWNLOAD="http://www.suckless.org/download/dmenu-3.0.tar.gz"
-MD5SUM="3af235515243abf626116782d3228064"
-MAINTAINER="core"
-EMAIL="eroc@linuxmail.org"
-APPROVED="BP{k}"
+VERSION="3.9"
+HOMEPAGE="http://www.suckless.org/programs/dmenu.html"
+DOWNLOAD="http://code.suckless.org/dl/tools/dmenu-3.9.tar.gz"
+MD5SUM="36d546dd4ac21660b20cdb056f5cb341"
+MAINTAINER="Antonio Hernández Blas"
+EMAIL="hba.nihilismus@gmail.com"
+APPROVED="dsomero"
diff --git a/desktop/dmenu/slack-desc b/desktop/dmenu/slack-desc
index cf224c1e73..1f87dd5dae 100644
--- a/desktop/dmenu/slack-desc
+++ b/desktop/dmenu/slack-desc
@@ -10,7 +10,7 @@ dmenu: dmenu (dynamic menu for X)
 dmenu:
 dmenu: dmenu is a generic and efficient menu for X.
 dmenu:
-dmenu: Homepage: http://www.suckless.org/wiki/tools/xlib
+dmenu: Homepage: http://www.suckless.org/programs/dmenu.html
 dmenu:
 dmenu:
 dmenu: