3 files changed, 32 insertions, 52 deletions
diff --git a/source/xap/audacious/audacious.SlackBuild b/source/xap/audacious/audacious.SlackBuild
index b18a0670..45b5c171 100755
--- a/source/xap/audacious/audacious.SlackBuild
+++ b/source/xap/audacious/audacious.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,18 +22,24 @@
 
 
 PKGNAM=audacious
-VERSION=${VERSION:-1.5.1}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -53,16 +59,18 @@ elif [ "$ARCH" = "arm" ]; then
 elif [ "$ARCH" = "armel" ]; then
   SLKCFLAGS="-O2 -march=armv4t"
   LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
+rm -rf $PKG
+mkdir -p $TMP $PKG
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-# Fix command line options handling:
-zcat $CWD/audacious.handle_cmd_line_options.diff.gz | patch -p1 || exit 1
-
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -78,8 +86,7 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --enable-ipv6 \
-  --enable-chardet \
+  --docdir=/usr/doc/${PKGNAM}-$VERSION \
   --disable-altivec \
   --program-prefix= \
   --program-suffix= \
@@ -90,6 +97,13 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Fix broken symlinks pointing into the build directory
+( cd $PKG/usr/bin
+  rm -f audacious audtool
+  ln -s audacious2 audacious
+  ln -s audtool2 audtool
+)
+
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -120,11 +134,11 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING INSTALL Mercurial-Access NEWS README \
+  AUTHORS COPYING INSTALL Mercurial-Access NEWS README doc/* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
-#zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/source/xap/audacious/audacious.handle_cmd_line_options.diff b/source/xap/audacious/audacious.handle_cmd_line_options.diff
deleted file mode 100644
index 6ccb2243..00000000
--- a/source/xap/audacious/audacious.handle_cmd_line_options.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./src/audacious/main.c.orig	2008-05-23 17:00:34.000000000 -0500
-+++ ./src/audacious/main.c	2009-04-10 17:03:00.000000000 -0500
-@@ -315,7 +315,7 @@
- }
- 
- static void
--handle_cmd_line_options()
-+handle_cmd_line_options(gboolean skip)
- {
-     gchar **filenames = options.filenames;
- #ifdef USE_DBUS
-@@ -430,7 +430,7 @@
-     } /* is_running */
-     else
- #endif
--    { /* !is_running */
-+    if (!skip) { /* !is_running */
-         if (filenames != NULL)
-         {
-             gint pos = 0;
-@@ -715,7 +715,7 @@
- 
-     signal_handlers_init();
- 
--    handle_cmd_line_options();
-+    handle_cmd_line_options(TRUE);
- 
-     if (options.headless == FALSE)
-     {
-@@ -735,6 +735,8 @@
-     plugin_system_init();
-     playlist_system_init();
- 
-+    handle_cmd_line_options(FALSE);
-+
- #ifdef USE_DBUS
-     init_dbus();
- #endif
diff --git a/source/xap/audacious/doinst.sh b/source/xap/audacious/doinst.sh
new file mode 100644
index 00000000..4e8ba707
--- /dev/null
+++ b/source/xap/audacious/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+