Update to 0.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2619 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 47 insertions, 31 deletions

diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
index baf5d0ade..e99eaed4b 100644
--- a/audio/marlin/Makefile
+++ b/audio/marlin/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	marlin
-PORTVERSION=	0.2
-PORTREVISION=	2
+PORTVERSION=	0.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,17 +13,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Sample editor for GNOME 2 using Gstreamer backend
 
-LIB_DEPENDS=	musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
+LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		uuid.1:${PORTSDIR}/sysutils/e2fsprogs
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnometarget gstreamerplugins
+USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget gstreamerplugins
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lcam"
 
-BROKEN=	"Doesn't build with latest gstreamer"
-
 .include <bsd.port.mk>
diff --git a/audio/marlin/distinfo b/audio/marlin/distinfo
index 457aa4a4b..52705c247 100644
--- a/audio/marlin/distinfo
+++ b/audio/marlin/distinfo
@@ -1,2 +1,2 @@
-MD5 (marlin-0.2.tar.gz) = d7ccc875a5478526aacedfa57019e8da
-SIZE (marlin-0.2.tar.gz) = 636755
+MD5 (marlin-0.4.tar.gz) = 9788cc788831512d033e59a461c1f892
+SIZE (marlin-0.4.tar.gz) = 934070
diff --git a/audio/marlin/files/patch-configure b/audio/marlin/files/patch-configure
deleted file mode 100644
index 75fd9721a..000000000
--- a/audio/marlin/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Nov 17 01:21:29 2003
-+++ configure	Mon Nov 17 01:22:07 2003
-@@ -8129,6 +8129,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/marlin/files/patch-marlin_marlin-sample-view.c b/audio/marlin/files/patch-marlin_marlin-sample-view.c
deleted file mode 100644
index 71a617693..000000000
--- a/audio/marlin/files/patch-marlin_marlin-sample-view.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- marlin/marlin-sample-view.c.orig	Mon Nov 17 12:40:57 2003
-+++ marlin/marlin-sample-view.c	Mon Nov 17 12:41:18 2003
-@@ -1615,8 +1615,8 @@
- #endif
- 		if (red_dotted == NULL) {
- 			GdkColor red = {0, 65535, 0, 0};
--			red_dotted = gdk_gc_new (widget->window);
- 			GdkColormap *cmap = gdk_colormap_get_system ();
-+			red_dotted = gdk_gc_new (widget->window);
- 
- 			gdk_gc_copy (red_dotted, widget->style->black_gc);
- 
diff --git a/audio/marlin/files/patch-src_marlin-window-menu.c b/audio/marlin/files/patch-src_marlin-window-menu.c
new file mode 100644
index 000000000..adb7bd3e7
--- /dev/null
+++ b/audio/marlin/files/patch-src_marlin-window-menu.c
@@ -0,0 +1,11 @@
+--- src/marlin-window-menu.c.orig	Wed Aug  4 23:47:26 2004
++++ src/marlin-window-menu.c	Wed Aug  4 23:47:43 2004
+@@ -634,7 +634,7 @@
+ 	GtkWidget *editor, *dialog;
+ 	EphyToolbarsModel *model;
+ 	Toolbar *toolbar;
+-	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;
++	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));
+ 	char *xml;
+ 
+ 	toolbar = marlin_window_get_toolbar (MARLIN_WINDOW (data));
diff --git a/audio/marlin/pkg-plist b/audio/marlin/pkg-plist
index 2071b0aa7..23f2c0a00 100644
--- a/audio/marlin/pkg-plist
+++ b/audio/marlin/pkg-plist
@@ -4,7 +4,9 @@ etc/gconf/schemas/marlin.schemas
 @exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/marlin.schemas > /dev/null || /usr/bin/true
 include/libmarlin/marlin-a11y-helper.h
 include/libmarlin/marlin-block.h
+include/libmarlin/marlin-cross-fader.h
 include/libmarlin/marlin-cursors.h
+include/libmarlin/marlin-file-chooser.h
 include/libmarlin/marlin-file-selection.h
 include/libmarlin/marlin-file-utils.h
 include/libmarlin/marlin-gst-extras.h
@@ -40,6 +42,7 @@ lib/libmarlinx.so.0
 lib/libmarlin.a
 lib/libmarlin.so
 lib/libmarlin.so.0
+share/gnome/applications/marlin.desktop
 share/gnome/help/marlin/C/figures/marlin-main-window.png
 share/gnome/help/marlin/C/figures/new_sample_dialog.png
 share/gnome/help/marlin/C/figures/new_sample_dialog_cancel.png
@@ -54,6 +57,7 @@ share/gnome/marlin/ui/toolbars.xml
 share/gnome/marlin/ui/toolbar-popup-ui.xml
 share/gnome/omf/marlin/marlin-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/marlin/marlin-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/pixmaps/marlin/hand-open.png
 share/gnome/pixmaps/marlin/marlin-cdda-extract.png
 share/gnome/pixmaps/marlin/marlin-ffwd.png
 share/gnome/pixmaps/marlin/marlin-icon.png
@@ -71,7 +75,33 @@ share/gnome/pixmaps/marlin/marlin-selection-grow.png
 share/gnome/pixmaps/marlin/marlin-selection-shrink.png
 share/gnome/pixmaps/marlin/marlin-select-all.png
 share/gnome/pixmaps/marlin/marlin-select-none.png
+share/gnome/pixmaps/marlin/marlin-sound-properties.png
 share/gnome/pixmaps/marlin/marlin-stop.png
+share/gnome/pixmaps/marlin/marlin-zoom-in-h.png
+share/gnome/pixmaps/marlin/marlin-zoom-in-v.png
+share/gnome/pixmaps/marlin/marlin-zoom-out-h.png
+share/gnome/pixmaps/marlin/marlin-zoom-out-v.png
+share/locale/ca/LC_MESSAGES/marlin.mo
+share/locale/cs/LC_MESSAGES/marlin.mo
+share/locale/de/LC_MESSAGES/marlin.mo
+share/locale/el/LC_MESSAGES/marlin.mo
+share/locale/en_CA/LC_MESSAGES/marlin.mo
+share/locale/en_GB/LC_MESSAGES/marlin.mo
+share/locale/es/LC_MESSAGES/marlin.mo
+share/locale/fr/LC_MESSAGES/marlin.mo
+share/locale/ga/LC_MESSAGES/marlin.mo
+share/locale/hr/LC_MESSAGES/marlin.mo
+share/locale/ko/LC_MESSAGES/marlin.mo
+share/locale/nl/LC_MESSAGES/marlin.mo
+share/locale/no/LC_MESSAGES/marlin.mo
+share/locale/pa/LC_MESSAGES/marlin.mo
+share/locale/pt/LC_MESSAGES/marlin.mo
+share/locale/pt_BR/LC_MESSAGES/marlin.mo
+share/locale/sr/LC_MESSAGES/marlin.mo
+share/locale/sr@Latn/LC_MESSAGES/marlin.mo
+share/locale/sv/LC_MESSAGES/marlin.mo
+share/locale/tr/LC_MESSAGES/marlin.mo
+share/locale/zh_CN/LC_MESSAGES/marlin.mo
 @dirrm share/gnome/pixmaps/marlin
 @dirrm share/gnome/omf/marlin
 @dirrm share/gnome/marlin/ui