Skip site navigation (1)Skip section navigation (2)
Date:      Thu,  8 Apr 2004 18:34:11 +0200 (CEST)
From:      Jean-Yves Lefort <jylefort@brutele.be>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/65330: Update port: audio/jamboree to 0.4
Message-ID:  <20040408163411.3501A22E5C@jsite.lefort.net>
Resent-Message-ID: <200404081640.i38Ge8FP074324@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         65330
>Category:       ports
>Synopsis:       Update port: audio/jamboree to 0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 08 09:40:08 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Yves Lefort
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 4.9-STABLE FreeBSD 4.9-STABLE #0: Thu Mar 18 01:32:50 CET 2004 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
Note: I suggest removing jamboree from EXCLUDE_PORTS in
http://www.freebsd.org/gnome/gnome_upgrade.sh, as this PR fixes
jamboree with GNOME 2.6 (specifically, with GStreamer 0.8).
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/audio/jamboree/Makefile jamboree/Makefile
--- /usr/ports/audio/jamboree/Makefile	Wed Apr  7 05:02:43 2004
+++ jamboree/Makefile	Thu Apr  8 18:25:12 2004
@@ -6,18 +6,16 @@
 #
 
 PORTNAME=	jamboree
-PORTVERSION=	0.3
-PORTREVISION=	3
+PORTVERSION=	0.4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.3
+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 \
-		gstplay-0.6:${PORTSDIR}/multimedia/gstreamer-plugins \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
@@ -25,7 +23,25 @@
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libglade2
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ARGS=	--disable-dbus
 
-.include <bsd.port.mk>
+OPTIONS=	XINE "use xine instead of GStreamer" 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
+.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 -ruN /usr/ports/audio/jamboree/distinfo jamboree/distinfo
--- /usr/ports/audio/jamboree/distinfo	Sat Apr  3 04:42:00 2004
+++ jamboree/distinfo	Thu Apr  8 18:21:04 2004
@@ -1,2 +1,2 @@
-MD5 (jamboree-0.3.tar.bz2) = f95185fcb460cee5601584a8936df162
-SIZE (jamboree-0.3.tar.bz2) = 349973
+MD5 (jamboree-0.4.tar.bz2) = 37e70e22f8abf6f7ce0b2c21c8090d2a
+SIZE (jamboree-0.4.tar.bz2) = 407718
diff -ruN /usr/ports/audio/jamboree/files/patch-intltool-merge.in jamboree/files/patch-intltool-merge.in
--- /usr/ports/audio/jamboree/files/patch-intltool-merge.in	Thu Jan  1 01:00:00 1970
+++ jamboree/files/patch-intltool-merge.in	Thu Apr  8 18:19:56 2004
@@ -0,0 +1,11 @@
+--- intltool-merge.in.orig	Thu Apr  8 17:53:53 2004
++++ intltool-merge.in	Thu Apr  8 17:55:14 2004
+@@ -996,7 +996,7 @@
+     if ($MULTIPLE_OUTPUT) {
+         for my $lang (sort keys %po_files_by_lang) {
+ 	    if ( ! -e $lang ) {
+-	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
++	        mkdir $lang, 0755 or die "Cannot create subdirectory $lang: $!\n";
+             }
+             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+             my $tree = readXml($FILE);
diff -ruN /usr/ports/audio/jamboree/files/patch-src::main-window.c jamboree/files/patch-src::main-window.c
--- /usr/ports/audio/jamboree/files/patch-src::main-window.c	Thu Jan  1 01:00:00 1970
+++ jamboree/files/patch-src::main-window.c	Thu Apr  8 18:11:26 2004
@@ -0,0 +1,11 @@
+--- 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 -ruN /usr/ports/audio/jamboree/files/patch-test::Makefile.in jamboree/files/patch-test::Makefile.in
--- /usr/ports/audio/jamboree/files/patch-test::Makefile.in	Wed Oct 15 02:31:30 2003
+++ jamboree/files/patch-test::Makefile.in	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- test/Makefile.in.orig	Wed Oct  8 17:27:16 2003
-+++ test/Makefile.in	Wed Oct  8 17:27:32 2003
-@@ -215,6 +215,7 @@
- jb_util_LDADD = \
- 	$(JAMBOREE_LIBS) 			\
- 	$(ID3TAG_LIBS)				\
-+	$(VORBIS_LIBS)				\
- 	$(VORBISFILE_LIBS)			\
- 	-lgdbm					\
- 	-lpopt
diff -ruN /usr/ports/audio/jamboree/pkg-plist jamboree/pkg-plist
--- /usr/ports/audio/jamboree/pkg-plist	Wed Oct 15 02:31:30 2003
+++ jamboree/pkg-plist	Thu Apr  8 18:24:14 2004
@@ -1,8 +1,12 @@
 bin/jamboree
 etc/gconf/gconf.xml.defaults/apps/jamboree/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/jamboree/columns/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/jamboree/control/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/jamboree/ui/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/columns/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/control/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/ui/%gconf.xml
 etc/gconf/schemas/jamboree.schemas
 share/gnome/applications/jamboree.desktop
 share/gnome/jamboree/column-chooser.glade
@@ -26,9 +30,26 @@
 share/gnome/jamboree/master-out.png
 share/gnome/jamboree/smart-playlist-dialog.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/es/LC_MESSAGES/jamboree.mo
+share/locale/fi/LC_MESSAGES/jamboree.mo
+share/locale/fr/LC_MESSAGES/jamboree.mo
+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/sr/LC_MESSAGES/jamboree.mo
+share/locale/sr@Latn/LC_MESSAGES/jamboree.mo
 share/locale/sv/LC_MESSAGES/jamboree.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/jamboree/columns
+@dirrm etc/gconf/gconf.xml.defaults/apps/jamboree/control
+@dirrm etc/gconf/gconf.xml.defaults/apps/jamboree/ui
 @dirrm etc/gconf/gconf.xml.defaults/apps/jamboree
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/columns
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/control
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/jamboree/ui
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/jamboree
 @dirrm share/gnome/jamboree

	
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040408163411.3501A22E5C>