- Update to 0.3.0 [1]

- Add WITH_FAAD to OPTIONS for use of
  aac/mp4 audio.

PR:		ports/81118 [1]
Submitted by:	Ports Fury [1]

5 files changed, 25 insertions, 64 deletions

diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index b8a574e4488..e9e431e10b0 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tunesbrowser
-PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTVERSION=	0.3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://craz.net/programs/itunes/files/
 
@@ -17,19 +16,27 @@ COMMENT=	Simple iTunes-like music player
 LIB_DEPENDS=	opendaap.0:${PORTSDIR}/devel/libopendaap
 
 USE_BZIP2=	yes
-USE_INC_LIBTOOL_VER=15
 USE_X_PREFIX=	yes
-USE_GNOME=	libglade2 gnometarget gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnomeprefix gnometarget libglade2
+WANT_GNOME=	yes
 USE_GSTREAMER=	mad
+GNU_CONFIGURE=	yes
 
 MAN1=		tunesbrowser.1
 
-DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
+OPTIONS=	FAAD "Enable AAC/MP4 Audio output" Off
 
-pre-everything::
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Warning: ${PORTNAME} is extremelly buggy, especially'
-	@${ECHO_MSG} '===> on the FreeBSD 4.x branch, and may not run at all'
-	@${ECHO_MSG} '===>'
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if defined(WITH_FAAD)
+USE_GSTREAMER+=	faad
+.endif
+
+.if ${HAVE_GNOME:Mlibgnome}!=""
+PKGNAMESUFFIX=	-gnome
+USE_GNOME+=	libgnome
+.else
+CONFIGURE_ARGS+=	--disable-gnome
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/tunesbrowser/distinfo b/audio/tunesbrowser/distinfo
index fa907bced71..c44645f6e23 100644
--- a/audio/tunesbrowser/distinfo
+++ b/audio/tunesbrowser/distinfo
@@ -1,2 +1,2 @@
-MD5 (tunesbrowser-0.2.0.tar.bz2) = e0fa00ca89ded223033430f4c54a83f9
-SIZE (tunesbrowser-0.2.0.tar.bz2) = 208472
+MD5 (tunesbrowser-0.3.0.tar.bz2) = dacfc3f7209c3165be9a9211dfb7bf0e
+SIZE (tunesbrowser-0.3.0.tar.bz2) = 222593
diff --git a/audio/tunesbrowser/files/patch-audioplayer.c b/audio/tunesbrowser/files/patch-audioplayer.c
deleted file mode 100644
index 1d55d6b29d3..00000000000
--- a/audio/tunesbrowser/files/patch-audioplayer.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- audioplayer.c.orig	Mon Dec 20 03:03:55 2004
-+++ audioplayer.c	Wed Feb  2 21:42:19 2005
-@@ -106,7 +106,8 @@
- 
- static void async_cmd_cb_gst_setup_clock(__UNUSED__ void *data)
- {
--    GstClock *clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
-+    GstClock *clock;
-+    clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
-     songstarted = gst_clock_get_time(clock) / GST_SECOND;
- }
- 
-@@ -157,8 +158,10 @@
- 
- static void cb_iterate(GstBin *bin, __UNUSED__ gpointer data)
- {
--    GstClock *clock = gst_bin_get_clock(bin);
--    int seconds = gst_clock_get_time(clock) / GST_SECOND;
-+    GstClock *clock;
-+    int seconds;
-+    clock = gst_bin_get_clock(bin);
-+    seconds = gst_clock_get_time(clock) / GST_SECOND; 
- 
-     seconds = seconds - songstarted;
- 
diff --git a/audio/tunesbrowser/files/patch-main.c b/audio/tunesbrowser/files/patch-main.c
index 76f78d25045..09ec0d727e5 100644
--- a/audio/tunesbrowser/files/patch-main.c
+++ b/audio/tunesbrowser/files/patch-main.c
@@ -1,29 +1,6 @@
---- main.c.orig	Mon Jan  3 21:58:29 2005
-+++ main.c	Wed Feb  2 21:56:11 2005
-@@ -38,7 +38,7 @@
- {
-     fprintf(stderr, "Oops! TunesBrowser has crashed. Sorry about that!\n");
-     fprintf(stderr, "This probably won't be of any use unless you feel like debugging,\n");
--    fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_ptr);
-+    fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_value.sigval_ptr);
- #if 0
-     fprintf(stderr, "\n\nRaised SIGSTOP. You can now attach a debugger.\n");
-     fprintf(stderr, "Attach to PID %i\n", getpid());
-@@ -66,11 +66,11 @@
-     int ret;
- 
-     sa.sa_handler = (void*)sighandler_sigsegv;
--    sa.sa_flags = SA_NOMASK | SA_SIGINFO;
-+    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
-     ret = sigaction(SIGSEGV, &sa, NULL);
- 
-     sa.sa_handler = (void*)sighandler_sigpipe;
--    sa.sa_flags = SA_NOMASK | SA_SIGINFO;
-+    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
-     ret = sigaction(SIGPIPE, &sa, NULL);
- }
- 
-@@ -94,7 +94,7 @@
+--- main.c.orig	Mon May 16 14:27:54 2005
++++ main.c	Mon May 16 14:28:12 2005
+@@ -129,7 +129,7 @@
  
      gtk_init(&argc, &argv);
  
diff --git a/audio/tunesbrowser/pkg-plist b/audio/tunesbrowser/pkg-plist
index a9a8abe1fd8..3cad123d02f 100644
--- a/audio/tunesbrowser/pkg-plist
+++ b/audio/tunesbrowser/pkg-plist
@@ -3,5 +3,7 @@ share/gnome/tunesbrowser/comp.blue.png
 share/gnome/tunesbrowser/comp.red.png
 share/gnome/tunesbrowser/sound1.png
 share/gnome/tunesbrowser/sound2.png
+share/gnome/tunesbrowser/soundfile.png
+share/gnome/tunesbrowser/tips.txt
 share/gnome/tunesbrowser/tunesbrowser.glade
 @dirrm share/gnome/tunesbrowser