5 files changed, 19 insertions, 63 deletions

diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 254e4bab6f57..7f484515bee7 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -6,33 +6,37 @@
 #
 
 PORTNAME=	soundtracker
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.6
 CATEGORIES=	audio gnome
-MASTER_SITES=	ftp://ftp.soundtracker.org/pub/soundtracker/v0.6/
+MASTER_SITES=	http://www.soundtracker.org/dl/%SUBDIR%/
+MASTER_SITE_SUBDIR=	v${PORTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	esound gdkpixbuf
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomelibs}!=""
-USE_GNOME=	gnomelibs esound gnomeprefix gnomehack
-CONFIGURE_ARGS+=--enable-gnome
 PKGNAMESUFFIX=	-gnome
+USE_GNOME+=	gnomelibs gnomeprefix gnomehack
+CONFIGURE_ARGS+=	--enable-gnome
+PLIST_SUB+=	DATADIR="share/gnome"
 .else
-CONFIGURE_ARGS+=--disable-gnome
+CONFIGURE_ARGS+=	--disable-gnome
+PLIST_SUB+=	DATADIR="share"
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's| install-exec-local||g'
 
 .include <bsd.port.post.mk>
diff --git a/audio/soundtracker/distinfo b/audio/soundtracker/distinfo
index ed54f9caf230..735208694212 100644
--- a/audio/soundtracker/distinfo
+++ b/audio/soundtracker/distinfo
@@ -1 +1 @@
-MD5 (soundtracker-0.6.2.tar.gz) = 648eeec3d6f37ec772b77717a9f6ce95
+MD5 (soundtracker-0.6.6.tar.gz) = 6014b06c999a82a227e4d1ba43ae026c
diff --git a/audio/soundtracker/files/patch-aa b/audio/soundtracker/files/patch-aa
deleted file mode 100644
index 1401875b522e..000000000000
--- a/audio/soundtracker/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- app/Makefile.in.orig	Wed Jan 17 00:15:19 2001
-+++ app/Makefile.in	Wed Jan 17 00:25:59 2001
-@@ -501,15 +501,15 @@
- 
- 
- install-exec-local:
--	chown root.root $(bindir)/soundtracker
--	chmod +s $(bindir)/soundtracker
--	@echo ""
--	@echo "***"
--	@echo "*** Installing SoundTracker suid root."
--	@echo "*** This improves sound responsivity, but may be a security risk"
--	@echo "*** if this is a multi-user machine. See file INSTALL."
--	@echo "***"
-+	chown root:wheel $(bindir)/soundtracker
-+#	chmod +s $(bindir)/soundtracker
- 	@echo ""
-+#	@echo "***"
-+#	@echo "*** Installing SoundTracker suid root."
-+#	@echo "*** This improves sound responsivity, but may be a security risk"
-+#	@echo "*** if this is a multi-user machine. See file INSTALL."
-+#	@echo "***"
-+#	@echo ""
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-
diff --git a/audio/soundtracker/files/patch-ab b/audio/soundtracker/files/patch-ab
deleted file mode 100644
index 49daf94e67d5..000000000000
--- a/audio/soundtracker/files/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
---- app/Makefile.am.orig	Wed Jan 17 00:29:42 2001
-+++ app/Makefile.am	Wed Jan 17 00:30:10 2001
-@@ -47,15 +47,15 @@
- soundtracker_LDADD = drivers/libdrivers.a mixers/libmixers.a
- 
- install-exec-local:
--	chown root.root $(bindir)/soundtracker
--	chmod +s $(bindir)/soundtracker
--	@echo ""
--	@echo "***"
--	@echo "*** Installing SoundTracker suid root."
--	@echo "*** This improves sound responsivity, but may be a security risk"
--	@echo "*** if this is a multi-user machine. See file INSTALL."
--	@echo "***"
-+	chown root:wheel $(bindir)/soundtracker
-+#	chmod +s $(bindir)/soundtracker
- 	@echo ""
-+#	@echo "***"
-+#	@echo "*** Installing SoundTracker suid root."
-+#	@echo "*** This improves sound responsivity, but may be a security risk"
-+#	@echo "*** if this is a multi-user machine. See file INSTALL."
-+#	@echo "***"
-+#	@echo ""
- 
- stdir = $(datadir)/soundtracker
- 
diff --git a/audio/soundtracker/pkg-plist b/audio/soundtracker/pkg-plist
index 5fdb27f7cecc..bd6974ed78b9 100644
--- a/audio/soundtracker/pkg-plist
+++ b/audio/soundtracker/pkg-plist
@@ -1,9 +1,14 @@
 bin/soundtracker
 %%GNOME:%%share/gnome/apps/Multimedia/soundtracker.desktop
+%%DATADIR%%/soundtracker/soundtracker_splash.png
 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/it/LC_MESSAGES/soundtracker.mo
 share/locale/pl/LC_MESSAGES/soundtracker.mo
 share/locale/ja/LC_MESSAGES/soundtracker.mo
 share/locale/ru/LC_MESSAGES/soundtracker.mo
+share/locale/sl/LC_MESSAGES/soundtracker.mo
+share/locale/sv/LC_MESSAGES/soundtracker.mo
+@dirrm %%DATADIR%%/soundtracker