desktop/dwm: Updated for version 5.7.2

1 files changed, 31 insertions, 29 deletions

diff --git a/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild
index 1f384cc3c0..8a8f3323ec 100644
--- a/desktop/dwm/dwm.SlackBuild
+++ b/desktop/dwm/dwm.SlackBuild
@@ -2,47 +2,39 @@
 
 # Slackware build script for dwm
 
-# Written by Tom Canich <tcanich@canich.net>
-# Released under the BSD
 # Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following 
-#               disclaimer in the documentation and/or other materials 
-#               provided with the distribution.
-#     * Neither the name of Tom Canich nor the names of other 
-#               contributors may be used to endorse or promote
-#               products 
-#               derived from this software without specific prior
-#               written 
-#               permission.
+#   * Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following 
+#     disclaimer in the documentation and/or other materials 
+#     provided with the distribution.
+#   * Neither the name of Tom Canich nor the names of other contributors
+#     may be used to endorse or promote products derived from this
+#     software without specific prior written prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY Tom Canich ''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 Tom Canich BE LIABLE FOR 
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL
+# 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.
-#
-# Modified by the SlackBuilds.org project
 
 
 PRGNAM=dwm
-VERSION=${VERSION:-5.5}
+VERSION=${VERSION:-5.7.2}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -54,10 +46,13 @@ INSTALL="/bin/ginstall -o root -g root"
 
 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
@@ -69,21 +64,28 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-for i in `ls $CWD/patches`; do
+# Apply our patch add custom CFLAGS first:
+patch -p1 < $CWD/add_OPTS_to_config.mk.diff
+
+# Now apply any other patches that users might have added
+for i in $(ls $CWD/patches); do
 	echo "Applying patch $i"
 	patch -p0 < $CWD/patches/$i
 done
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make PREFIX=/usr
-make install DESTDIR=$PKG
+make install \
+  OPTS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  MANPREFIX=/usr/man \
+  X11INC=/usr/include/X11 \
+  X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 \
+  DESTDIR=$PKG
 
 ( cd $PKG
   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
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 ( cd $PKG/usr/man
@@ -92,12 +94,12 @@ make install DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/README* $PKG/usr/doc/$PRGNAM-$VERSION
-cp -r $CWD/patches $PKG/usr/doc/$PRGNAM-$VERSION/patches
+cp $CWD/README $CWD/README.SBo $PKG/usr/doc/$PRGNAM-$VERSION
+cp -r $CWD/patches $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}