Update to 0.3.10

PR:		16823
Submitted by:	maintainer

6 files changed, 43 insertions, 12 deletions

diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 9147c6fc07ca..c7d585ba49b0 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   soundtracker
-# Version required:    0.3.8
+# Version required:    0.3.10
 # Date created:        28 November 1999
 # Whom:                kzentner
 #
 # $FreeBSD$
 #
 
-DISTNAME=	soundtracker-0.3.8
+DISTNAME=	soundtracker-0.3.10
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.soundtracker.org/pub/soundtracker/v0.3/
 
@@ -14,15 +14,27 @@ MAINTAINER=	kzentner@u.washington.edu
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+.if defined(USE_GNOME)
+LIB_DEPENDS+=	gnome.3:${PORTSIDR}/x11/gnomelibs
+.endif
+
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
+USE_X_PREFIX=   yes
+
 .if defined(USE_GNOME)
 CONFIGURE_ARGS+=	--enable-gnome
+PLIST=			${PKGDIR}/PLIST.gnome
+.else
+CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LIBS="-L${LOCALBASE}/lib"
+
 post-install:
 	@strip ${PREFIX}/bin/soundtracker
 
diff --git a/audio/soundtracker/distinfo b/audio/soundtracker/distinfo
index fb22f8d69029..3761848c915a 100644
--- a/audio/soundtracker/distinfo
+++ b/audio/soundtracker/distinfo
@@ -1 +1 @@
-MD5 (soundtracker-0.3.8.tar.gz) = 960764d7e728819f8e3c466f723fcd42
+MD5 (soundtracker-0.3.10.tar.gz) = 6f31c7049c5d0906068015232f7867a3
diff --git a/audio/soundtracker/files/patch-ad b/audio/soundtracker/files/patch-ad
index ca7018c127fa..2a309fafb126 100644
--- a/audio/soundtracker/files/patch-ad
+++ b/audio/soundtracker/files/patch-ad
@@ -1,7 +1,11 @@
---- app/Makefile.in.orig	Mon Nov 29 01:49:07 1999
-+++ app/Makefile.in		Mon Nov 29 01:49:59 1999
-@@ -466,3 +466,3 @@
+--- app/Makefile.in.orig	Fri Feb 18 23:15:50 2000
++++ app/Makefile.in 		Fri Feb 18 23:18:29 2000
+@@ -475,6 +475,6 @@
+ 
  install-exec-local:
 -	chown root.root $(bindir)/soundtracker
+-	chmod +s $(bindir)/soundtracker
 +	chown root.wheel $(bindir)/soundtracker
- 	chmod +s $(bindir)/soundtracker
++#	chmod +s $(bindir)/soundtracker
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/audio/soundtracker/files/patch-ae b/audio/soundtracker/files/patch-ae
index 79ddb7bc4e5f..a9a4b06174f3 100644
--- a/audio/soundtracker/files/patch-ae
+++ b/audio/soundtracker/files/patch-ae
@@ -1,7 +1,11 @@
---- app/Makefile.am.orig	Mon Nov 29 01:49:43 1999
-+++ app/Makefile.am		Mon Nov 29 01:49:53 1999
-@@ -42,3 +42,3 @@
+--- app/Makefile.am.orig    Fri Feb 18 23:16:48 2000
++++ app/Makefile.am 	Fri Feb 18 23:18:42 2000
+@@ -44,6 +44,6 @@
+ 
  install-exec-local:
 -	chown root.root $(bindir)/soundtracker
+-	chmod +s $(bindir)/soundtracker
 +	chown root.wheel $(bindir)/soundtracker
- 	chmod +s $(bindir)/soundtracker
++#	chmod +s $(bindir)/soundtracker
+ 
+ stdir = $(datadir)/soundtracker
diff --git a/audio/soundtracker/files/patch-af b/audio/soundtracker/files/patch-af
new file mode 100644
index 000000000000..bd820f7c6a3c
--- /dev/null
+++ b/audio/soundtracker/files/patch-af
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Jan 26 11:32:32 2000
++++ configure	Sat Feb 19 22:02:00 2000
+@@ -3585,7 +3585,7 @@
+ echo "configure:3586: 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 c0c6ca291af3..ee258b61a976 100644
--- a/audio/soundtracker/pkg-plist
+++ b/audio/soundtracker/pkg-plist
@@ -2,6 +2,6 @@ bin/soundtracker
 share/locale/de/LC_MESSAGES/soundtracker.mo
 share/locale/es/LC_MESSAGES/soundtracker.mo
 share/locale/it/LC_MESSAGES/soundtracker.mo
-share/locale/ja/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