4 files changed, 22 insertions, 26 deletions

diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 4ed607e9045f..b16685918492 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	soundtracker
-PORTVERSION=	0.6.6
+PORTVERSION=	0.6.7
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.soundtracker.org/dl/%SUBDIR%/
 MASTER_SITE_SUBDIR=	v${PORTVERSION:R}
@@ -14,29 +14,24 @@ MASTER_SITE_SUBDIR=	v${PORTVERSION:R}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mod player/tracking tool which supports XM and MOD formats
 
+LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
+
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
-USE_GNOME=	esound gdkpixbuf
-USE_REINPLACE=	yes
+USE_GNOME=	esound gdkpixbuf gnomehack gnometarget
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 500034
-CONFIGURE_ARGS+=	--disable-asm
-.endif
-
 .if ${HAVE_GNOME:Mgnomelibs}!=""
 PKGNAMESUFFIX=	-gnome
-USE_GNOME+=	gnomelibs gnomeprefix gnomehack
+USE_GNOME+=	gnomelibs gnomeprefix
 CONFIGURE_ARGS+=	--enable-gnome
-PLIST_SUB+=	DATADIR="share/gnome"
+DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
 CONFIGURE_ARGS+=	--disable-gnome
-PLIST_SUB+=	DATADIR="share"
 .endif
 
 post-patch:
diff --git a/audio/soundtracker/distinfo b/audio/soundtracker/distinfo
index 735208694212..0f1a8476dd02 100644
--- a/audio/soundtracker/distinfo
+++ b/audio/soundtracker/distinfo
@@ -1 +1 @@
-MD5 (soundtracker-0.6.6.tar.gz) = 6014b06c999a82a227e4d1ba43ae026c
+MD5 (soundtracker-0.6.7.tar.gz) = 9a5685e0a79fb10066d29baed652d324
diff --git a/audio/soundtracker/files/patch-ac b/audio/soundtracker/files/patch-ac
deleted file mode 100644
index cc779d362918..000000000000
--- a/audio/soundtracker/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jan 17 00:11:18 2001
-+++ configure	Wed Jan 17 00:11:54 2001
-@@ -3667,7 +3667,7 @@
- echo "configure:3668: checking for Gnome compile flags" >&5
-   GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null`
-   GNOME_VER=`$gnomepath --version |$sedpath 's/gnome-libs //'`
--  GNOME_MAJOR=`echo $GNOME_VER |$sedpath 's/\([0-9]**\).\([0-9]**\).\([0-9]**\)/\1/'`
-+  GNOME_MAJOR=`echo $GNOME_VER |$sedpath 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-   if test "_$GNOME_MAJOR" = "_0"; then
-     gnome=no
-     echo "$ac_t""old Gnome found, building without it." 1>&6
diff --git a/audio/soundtracker/pkg-plist b/audio/soundtracker/pkg-plist
index bd6974ed78b9..0ac476a0168e 100644
--- a/audio/soundtracker/pkg-plist
+++ b/audio/soundtracker/pkg-plist
@@ -1,14 +1,26 @@
 bin/soundtracker
 %%GNOME:%%share/gnome/apps/Multimedia/soundtracker.desktop
-%%DATADIR%%/soundtracker/soundtracker_splash.png
+share/locale/da/LC_MESSAGES/soundtracker.mo
 share/locale/de/LC_MESSAGES/soundtracker.mo
 share/locale/es/LC_MESSAGES/soundtracker.mo
 share/locale/fr/LC_MESSAGES/soundtracker.mo
 share/locale/gl/LC_MESSAGES/soundtracker.mo
+share/locale/hr/LC_MESSAGES/soundtracker.mo
 share/locale/it/LC_MESSAGES/soundtracker.mo
-share/locale/pl/LC_MESSAGES/soundtracker.mo
 share/locale/ja/LC_MESSAGES/soundtracker.mo
+share/locale/pl/LC_MESSAGES/soundtracker.mo
 share/locale/ru/LC_MESSAGES/soundtracker.mo
+share/locale/sk/LC_MESSAGES/soundtracker.mo
 share/locale/sl/LC_MESSAGES/soundtracker.mo
 share/locale/sv/LC_MESSAGES/soundtracker.mo
-@dirrm %%DATADIR%%/soundtracker
+%%DATADIR%%/downarrow.xpm
+%%DATADIR%%/flat.xpm
+%%DATADIR%%/lock.xpm
+%%DATADIR%%/muted.png
+%%DATADIR%%/play.xpm
+%%DATADIR%%/play_cur.xpm
+%%DATADIR%%/rightarrow.xpm
+%%DATADIR%%/sharp.xpm
+%%DATADIR%%/soundtracker_splash.png
+%%DATADIR%%/stop.xpm
+@dirrm %%DATADIR%%