6 files changed, 56 insertions, 35 deletions
diff --git a/audio/gtkpod/README b/audio/gtkpod/README
index 4dd127fe0c..18a9b0c7d1 100644
--- a/audio/gtkpod/README
+++ b/audio/gtkpod/README
@@ -2,9 +2,4 @@ gtkpod is a platform independent Graphical User Interface for Apple's
 iPod using GTK2. It supports the first to fifth Generation including 
 the iPod mini, iPod Photo, iPod Shuffle, iPod nano, and iPod Video.
 
-Requires libgnomecanvas available at SlackBuilds.org.
-
-If you would like to add an AAC support to gtkpod, you will have to install
-libmp4v2 library, which can be obtained at SlackBuilds.org as well. 
-
-Make sure to install libmp4v2 prior to running gtkpod configure.
+This requires libgnomecanvas and optionally libmp4v2.
diff --git a/audio/gtkpod/doinst.sh b/audio/gtkpod/doinst.sh
new file mode 100644
index 0000000000..1f8ff67ded
--- /dev/null
+++ b/audio/gtkpod/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/audio/gtkpod/gtkpod.SlackBuild b/audio/gtkpod/gtkpod.SlackBuild
index 81abea6b2b..6d87b0c1e1 100644
--- a/audio/gtkpod/gtkpod.SlackBuild
+++ b/audio/gtkpod/gtkpod.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for gtkpod
+
 # Written by Alex Lysenka <me@alkos333.net> 
 # All rights reserved.
 # 
@@ -23,31 +24,34 @@
 # (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
-set -e
-
 PRGNAM=gtkpod
-VERSION=0.99.12
+VERSION=0.99.14
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 if [ "$ARCH" = "i486" ]; then
-	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
-rm -rf $PKG
-rm -rf $TMP/$PRGNAM-$VERSION
+set -e
+
+rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .  
@@ -55,26 +59,30 @@ chmod -R u+w,go+r-w,a-s .
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/usr/share/applications
+install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS COPYING ChangeLog INSTALL NEWS README TODOandBUGS.txt TROUBLESHOOTING $PKG/usr/doc/$PRGNAM-$VERSION
+cp \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO* TROUBLESHOOTING \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild 
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
-# desktop icon.
-mkdir -p $PKG/usr/share/applications
-install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-/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/audio/gtkpod/gtkpod.desktop b/audio/gtkpod/gtkpod.desktop
index eeedecc9dd..9499db44ab 100644
--- a/audio/gtkpod/gtkpod.desktop
+++ b/audio/gtkpod/gtkpod.desktop
@@ -1,11 +1,10 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Type=Application
 Terminal=false
 Name=gtkpod
 Comment=Manage songs on your Apple iPod
 Comment[de]=Verwalte Musik auf deinem Apple iPod
 Exec=gtkpod
-Icon=/usr/share/gtkpod/pixmaps/gtkpod-icon-32x32.png
+Icon=gtkpod
 Categories=AudioVideo;
diff --git a/audio/gtkpod/gtkpod.info b/audio/gtkpod/gtkpod.info
index c7c30ffa65..ad3a5dd8d0 100644
--- a/audio/gtkpod/gtkpod.info
+++ b/audio/gtkpod/gtkpod.info
@@ -1,8 +1,10 @@
 PRGNAM="gtkpod"
-VERSION="0.99.12"
+VERSION="0.99.14"
 HOMEPAGE="http://www.gtkpod.org"
-DOWNLOAD="http://downloads.sourceforge.net/gtkpod/gtkpod-0.99.12.tar.gz"
-MD5SUM="13162a7e9912028922aafcf81d908394"
+DOWNLOAD="http://downloads.sourceforge.net/gtkpod/gtkpod-0.99.14.tar.gz"
+MD5SUM="f7948eceb955b302f4c47da4c0e1ec12"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Alex Lysenka"
 EMAIL="me@alkos333.net"
 APPROVED="BP{k}"
diff --git a/audio/gtkpod/slack-desc b/audio/gtkpod/slack-desc
index bc3e848068..876cc6a0f9 100644
--- a/audio/gtkpod/slack-desc
+++ b/audio/gtkpod/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
       |-----handy-ruler------------------------------------------------------|
 gtkpod: gtkpod (a GTK2 GUI for the Apple iPod)
 gtkpod:
@@ -6,7 +13,7 @@ gtkpod: Apple's iPod using GTK2.  It supports the first to fifth
 gtkpod: Generation including the iPod mini, iPod Photo, iPod Shuffle,
 gtkpod: iPod nano, and iPod Video.
 gtkpod:
+gtkpod: Homepage:  http://www.gtkpod.org
 gtkpod:
 gtkpod:
-gtkpod: Homepage:  http://www.gtkpod.org
 gtkpod: