3 files changed, 18 insertions, 36 deletions
diff --git a/libraries/libdockapp/Fixup-examples-sharedir.patch b/libraries/libdockapp/Fixup-examples-sharedir.patch
deleted file mode 100644
index 7dda9e1ce30a2..0000000000000
--- a/libraries/libdockapp/Fixup-examples-sharedir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Don't hardcode SHAREDIR - use prefix/datadir (with DESTDIR as needed)
-  to ease packaging...
-
-Signed-off-by: Robby Workman <rworkman@slackware.com>
-
-diff -Nur libdockapp-0.6.2.orig/examples/Makefile.in libdockapp-0.6.2/examples/Makefile.in
---- libdockapp-0.6.2.orig/examples/Makefile.in	2008-05-01 04:17:34.000000000 -0500
-+++ libdockapp-0.6.2/examples/Makefile.in	2009-05-16 02:04:30.843730264 -0500
-@@ -161,7 +161,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SHAREDIR = $(DESTDIR)/usr/local/share
-+SHAREDIR = $(DESTDIR)/@datadir@
- BASICDIR = basic
- BASICSRC = basic/Imakefile basic/README basic/ball_red.xpm basic/basic.c
- RECTDIR = rectangles
diff --git a/libraries/libdockapp/libdockapp.SlackBuild b/libraries/libdockapp/libdockapp.SlackBuild
index 26636a8afc4de..e937f71dd2da9 100644
--- a/libraries/libdockapp/libdockapp.SlackBuild
+++ b/libraries/libdockapp/libdockapp.SlackBuild
@@ -6,13 +6,13 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=libdockapp
-VERSION=${VERSION:-0.6.2}
+VERSION=${VERSION:-0.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -23,8 +23,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -42,19 +42,17 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf dockapps-b9baa8f
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd dockapps-b9baa8f
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
-
-# Fixup the SHAREDIR in examples/Makefile.in
-patch -p1 < $CWD/Fixup-examples-sharedir.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+autoreconf -fi
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -63,12 +61,13 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-debug \
+  --enable-static=no \
   --build=$ARCH-slackware-linux
 
 make XFONTDIR="\$(DESTDIR)/usr/share/fonts"
 make install DESTDIR=$PKG XFONTDIR="\$(DESTDIR)/usr/share/fonts"
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libdockapp/libdockapp.info b/libraries/libdockapp/libdockapp.info
index 9b9d11776ff90..aaed40321057a 100644
--- a/libraries/libdockapp/libdockapp.info
+++ b/libraries/libdockapp/libdockapp.info
@@ -1,8 +1,8 @@
 PRGNAM="libdockapp"
-VERSION="0.6.2"
-HOMEPAGE="http://solfertje.student.utwente.nl/~dalroi/libdockapp/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/libdockapp-0.6.2.tar.bz2"
-MD5SUM="05a9a5f295d956397e6bb53bad3a0322"
+VERSION="0.7.2"
+HOMEPAGE="http://www.dockapps.net/libdockapp"
+DOWNLOAD="http://www.dockapps.net/download/libdockapp-0.7.2.tar.gz"
+MD5SUM="219e042f8200448eaa34bdf4fc4aa820"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""