desktop/wmakerconf: Updated for version 2.12

5 files changed, 23 insertions, 16 deletions

diff --git a/desktop/wmakerconf/README b/desktop/wmakerconf/README
index d476fd1bf545..4853bb11a717 100644
--- a/desktop/wmakerconf/README
+++ b/desktop/wmakerconf/README
@@ -1,4 +1,4 @@
 WMakerConf (short for Window Maker Configurator) is a configuration
 utility for the Window Maker window manager.
 
-WMakerConf requires installed Window Maker.
+WMakerConf requires WindowMaker to be installed (it's part of Slackware).
diff --git a/desktop/wmakerconf/doinst.sh b/desktop/wmakerconf/doinst.sh
index b46adf0f45ce..2e82bb7622c6 100644
--- a/desktop/wmakerconf/doinst.sh
+++ b/desktop/wmakerconf/doinst.sh
@@ -1,4 +1,3 @@
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
diff --git a/desktop/wmakerconf/slack-desc b/desktop/wmakerconf/slack-desc
index 242c308fd678..e35b910a1bed 100644
--- a/desktop/wmakerconf/slack-desc
+++ b/desktop/wmakerconf/slack-desc
@@ -7,13 +7,13 @@
 
           |-----handy-ruler------------------------------------------------------|
 wmakerconf: WMakerConf (GTK+ based configuration tool for Window Maker)
-wmakerconf: 
+wmakerconf:
 wmakerconf: WMakerConf (short for Window Maker Configurator) is a configuration
 wmakerconf: utility for the Window Maker window manager.
-wmakerconf: 
-wmakerconf: 
-wmakerconf: 
-wmakerconf: 
-wmakerconf: 
-wmakerconf: 
-wmakerconf: 
+wmakerconf:
+wmakerconf:
+wmakerconf:
+wmakerconf:
+wmakerconf:
+wmakerconf:
+wmakerconf:
diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild
index 25fb6e066f91..3cd4ea60d1e8 100644
--- a/desktop/wmakerconf/wmakerconf.SlackBuild
+++ b/desktop/wmakerconf/wmakerconf.SlackBuild
@@ -18,10 +18,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
@@ -31,7 +34,7 @@ mkdir -p $TMP $PKG $OUTPUT
 
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM\_$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -44,10 +47,13 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
+  --with-wmakeretcprefix=/etc/X11 \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --disable-debug
+  --disable-debug \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -65,8 +71,9 @@ make install DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL MANUAL NEWS NLS-TEAM1 README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL MANUAL NEWS NLS-TEAM1 README TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -74,5 +81,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/wmakerconf/wmakerconf.info b/desktop/wmakerconf/wmakerconf.info
index 38cc797b5ec3..8334af6321e3 100644
--- a/desktop/wmakerconf/wmakerconf.info
+++ b/desktop/wmakerconf/wmakerconf.info
@@ -3,6 +3,8 @@ VERSION="2.12"
 HOMEPAGE="http://starplot.org/wmakerconf/"
 DOWNLOAD="http://downloads.sourceforge.net/wmakerconf/wmakerconf_2.12.tar.gz"
 MD5SUM="252114b5ee5fc5bec99477497ee045cc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Cezary M. Kruk"
 EMAIL="c.kruk@bigfoot.com"
 APPROVED="dsomero"