5 files changed, 15 insertions, 87 deletions

diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile
index 2ab09f0a6e5e..eba7656c6260 100644
--- a/audio/jamboree/Makefile
+++ b/audio/jamboree/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jamboree
-PORTVERSION=	0.4
-PORTREVISION=	3
+PORTVERSION=	0.5
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
@@ -15,34 +14,23 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	jylefort@brutele.be
 COMMENT=	A simple GNOME music player
 
-LIB_DEPENDS+=	id3tag:${PORTSDIR}/audio/libid3tag \
-		vorbis.3:${PORTSDIR}/audio/libvorbis \
-		gdbm.3:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libglade2
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libglade2 gstreamerplugins
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--disable-dbus
 
-OPTIONS=	XINE "use xine instead of GStreamer" off
+OPTIONS=	DBUS "D-BUS support" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_XINE)
-LIB_DEPENDS+=		xine.9:${PORTSDIR}/multimedia/libxine
-CONFIGURE_ARGS+=	--enable-xine
-.else
-USE_GNOME+=		gstreamerplugins
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=		dbus-1:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=	--enable-dbus
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -Ee \
-		's/GST_VER=0\.7\.4/GST_VER=0.8/; s/(gstreamer(-[a-z]+)?|gst-inspect)-0\.7/\1-0.8/g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/audio/jamboree/distinfo b/audio/jamboree/distinfo
index be1dea244395..b0043bb13076 100644
--- a/audio/jamboree/distinfo
+++ b/audio/jamboree/distinfo
@@ -1,2 +1,2 @@
-MD5 (jamboree-0.4.tar.bz2) = 37e70e22f8abf6f7ce0b2c21c8090d2a
-SIZE (jamboree-0.4.tar.bz2) = 407718
+MD5 (jamboree-0.5.tar.bz2) = 23a0b5e3eda5e73bf838af66ba4b3180
+SIZE (jamboree-0.5.tar.bz2) = 430659
diff --git a/audio/jamboree/files/patch-ltmain.sh b/audio/jamboree/files/patch-ltmain.sh
deleted file mode 100644
index bdf599516455..000000000000
--- a/audio/jamboree/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Sat Feb  7 05:49:19 2004
-+++ ltmain.sh	Thu Apr  8 11:15:20 2004
-@@ -1349,7 +1349,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1364,8 +1364,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3059,6 +3067,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5531,10 +5542,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/audio/jamboree/files/patch-src::main-window.c b/audio/jamboree/files/patch-src::main-window.c
deleted file mode 100644
index 764025c97bc5..000000000000
--- a/audio/jamboree/files/patch-src::main-window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main-window.c.orig	Thu Apr  8 17:49:42 2004
-+++ src/main-window.c	Thu Apr  8 17:51:01 2004
-@@ -2337,7 +2337,7 @@
- 					GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
- 					NULL);
- 
--  gtk_file_chooser_set_folder_mode (GTK_FILE_CHOOSER (dialog), TRUE);
-+  gtk_file_chooser_set_action (GTK_FILE_CHOOSER (dialog), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
- 
-   start_dir = gconf_client_get_string (gconf_client,
- 				       GCONF_PATH "/default_add_folder",
diff --git a/audio/jamboree/pkg-plist b/audio/jamboree/pkg-plist
index 4b4f4af8d599..02bc93407fa7 100644
--- a/audio/jamboree/pkg-plist
+++ b/audio/jamboree/pkg-plist
@@ -3,7 +3,6 @@ bin/jamboree
 etc/gconf/schemas/jamboree.schemas
 @exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/jamboree.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/jamboree.desktop
-share/gnome/jamboree/column-chooser.glade
 share/gnome/jamboree/jamboree-next.png
 share/gnome/jamboree/jamboree-note.png
 share/gnome/jamboree/jamboree-pause.png
@@ -12,7 +11,7 @@ share/gnome/jamboree/jamboree-playlist-library.png
 share/gnome/jamboree/jamboree-playlist-regular.png
 share/gnome/jamboree/jamboree-playlist-smart.png
 share/gnome/jamboree/jamboree-prev.png
-share/gnome/jamboree/jamboree-shuffle.png
+share/gnome/jamboree/jamboree-random.png
 share/gnome/jamboree/jamboree-small-blank.png
 share/gnome/jamboree/jamboree-small-pause.png
 share/gnome/jamboree/jamboree-stop.png
@@ -21,13 +20,15 @@ share/gnome/jamboree/jamboree-volume-medium.png
 share/gnome/jamboree/jamboree-volume-min.png
 share/gnome/jamboree/jamboree-volume-zero.png
 share/gnome/jamboree/jamboree.glade
-share/gnome/jamboree/master-out.png
 share/gnome/jamboree/smart-playlist-dialog.glade
+share/gnome/jamboree/song-properties.glade
 share/gnome/pixmaps/jamboree.png
 share/locale/az/LC_MESSAGES/jamboree.mo
 share/locale/ca/LC_MESSAGES/jamboree.mo
 share/locale/cs/LC_MESSAGES/jamboree.mo
 share/locale/de/LC_MESSAGES/jamboree.mo
+share/locale/en_CA/LC_MESSAGES/jamboree.mo
+share/locale/en_GB/LC_MESSAGES/jamboree.mo
 share/locale/es/LC_MESSAGES/jamboree.mo
 share/locale/fi/LC_MESSAGES/jamboree.mo
 share/locale/fr/LC_MESSAGES/jamboree.mo
@@ -35,6 +36,7 @@ share/locale/hr/LC_MESSAGES/jamboree.mo
 share/locale/nl/LC_MESSAGES/jamboree.mo
 share/locale/no/LC_MESSAGES/jamboree.mo
 share/locale/pt/LC_MESSAGES/jamboree.mo
+share/locale/pt_BR/LC_MESSAGES/jamboree.mo
 share/locale/sr/LC_MESSAGES/jamboree.mo
 share/locale/sr@Latn/LC_MESSAGES/jamboree.mo
 share/locale/sv/LC_MESSAGES/jamboree.mo