-USE_X_PREFIX -> USE_XLIB.

-Mark it as BROKEN, it doesn't build with new nautilus-cd-burner.
-Bump the PORTREVISION.


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

10 files changed, 235 insertions, 0 deletions

diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
new file mode 100644
index 000000000..f7a94fe80
--- /dev/null
+++ b/audio/marlin/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for:	marlin
+# Date created:				16 Nov 2003
+# Whom:					Pav Lucistnik <pav@FreeBSD.org>
+#
+# $FreeBSD$
+
+PORTNAME=	marlin
+PORTVERSION=	0.9
+PORTREVISION=	4
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	pav@FreeBSD.org
+COMMENT=	Sample editor for GNOME 2 using Gstreamer backend
+
+LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
+		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+
+BROKEN= does not build with new nautilus-cd-burner
+
+USE_XLIB=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack gnometarget intlhack libgnomeui nautiluscdburner
+USE_GSTREAMER80=	flac gconf mad vorbis
+INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lcam"
+
+GCONF_SCHEMAS=	marlin.schemas
+
+.if !defined(PACKAGE_BUILDING) || defined(WITH_LAME)
+USE_GSTREAMER+=	lame
+.endif
+
+.include <bsd.port.mk>
diff --git a/audio/marlin/distinfo b/audio/marlin/distinfo
new file mode 100644
index 000000000..e95e5a051
--- /dev/null
+++ b/audio/marlin/distinfo
@@ -0,0 +1,3 @@
+MD5 (marlin-0.9.tar.gz) = 2b6e43f3e5cc19d677025b04376d332b
+SHA256 (marlin-0.9.tar.gz) = f7198cd69d18979b49bb736cd9e0344d0da063313a4304ab5b8c66564f1bd3e3
+SIZE (marlin-0.9.tar.gz) = 1145273
diff --git a/audio/marlin/files/patch-marlin-marlin-channel.h b/audio/marlin/files/patch-marlin-marlin-channel.h
new file mode 100644
index 000000000..a099f3cd3
--- /dev/null
+++ b/audio/marlin/files/patch-marlin-marlin-channel.h
@@ -0,0 +1,10 @@
+--- marlin/marlin-channel.h.orig	Sat Oct 11 01:02:22 2003
++++ marlin/marlin-channel.h	Sun Nov 16 23:53:22 2003
+@@ -22,6 +22,7 @@
+ #ifndef __MARLIN_CHANNEL_H__
+ #define __MARLIN_CHANNEL_H__
+ 
++#include <sys/types.h>
+ #include <glib.h>
+ 
+ #include <marlin/marlin-types.h>
diff --git a/audio/marlin/files/patch-marlin-marlin-sample-view.c b/audio/marlin/files/patch-marlin-marlin-sample-view.c
new file mode 100644
index 000000000..1b593f512
--- /dev/null
+++ b/audio/marlin/files/patch-marlin-marlin-sample-view.c
@@ -0,0 +1,12 @@
+--- marlin/marlin-sample-view.c.orig	Tue Jul 12 17:57:56 2005
++++ marlin/marlin-sample-view.c	Wed Jul 13 17:51:32 2005
+@@ -179,6 +179,9 @@
+ static void scroll_to (MarlinSampleView *view,
+ 		       int x);
+ 
++void marlin_sample_view_vzoom_in (MarlinSampleView *view);
++void marlin_sample_view_vzoom_out (MarlinSampleView *view);
++
+ /* Stuff to register the coverage enum */
+ #define MARLIN_TYPE_COVERAGE (coverage_get_type ())
+ static GType
diff --git a/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
new file mode 100644
index 000000000..3d8ff6e7f
--- /dev/null
+++ b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
@@ -0,0 +1,18 @@
+--- src/libegg/egg-toolbar-editor.c.orig	Sat Jul  3 16:37:44 2004
++++ src/libegg/egg-toolbar-editor.c	Sat Jul  3 16:38:00 2004
+@@ -102,12 +102,12 @@
+ static gint
+ compare_actions (gconstpointer a, gconstpointer b)
+ {
+-  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
+-  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+-
+   GValue value_a = { 0, }, value_b = { 0, };
+   const char *short_label_a, *short_label_b;
+   int ret;
++
++  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
++  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+ 
+   g_value_init (&value_a, G_TYPE_STRING);
+   g_object_get_property (G_OBJECT (a), "short_label", &value_a);
diff --git a/audio/marlin/files/patch-src-marlin-window.c b/audio/marlin/files/patch-src-marlin-window.c
new file mode 100644
index 000000000..81b37e3c5
--- /dev/null
+++ b/audio/marlin/files/patch-src-marlin-window.c
@@ -0,0 +1,10 @@
+--- src/marlin-window.c.orig	Wed Jul 13 13:06:02 2005
++++ src/marlin-window.c	Wed Jul 13 17:50:41 2005
+@@ -213,6 +213,7 @@
+ void marlin_window_set_edit_name (MarlinWindow *window);
+ void marlin_window_pause_sample (MarlinWindow *window);
+ void marlin_window_save_sample_as (MarlinWindow *window);
++void marlin_window_repeat_sample (MarlinWindow *window);
+ 
+ static GtkWindowClass *parent_class = NULL;
+ static guint signals[LAST_SIGNAL];
diff --git a/audio/marlin/files/patch-src_marlin-cdda-record.c b/audio/marlin/files/patch-src_marlin-cdda-record.c
new file mode 100644
index 000000000..2420b3909
--- /dev/null
+++ b/audio/marlin/files/patch-src_marlin-cdda-record.c
@@ -0,0 +1,11 @@
+--- src/marlin-cdda-record.c.orig	Mon Nov 17 12:45:49 2003
++++ src/marlin-cdda-record.c	Mon Nov 17 12:46:17 2003
+@@ -506,7 +506,7 @@
+ 		if (res) {
+ 			if (i > 0) {
+ 				char *start_str, *finish_str, *length_str;
+-				gint64 length = time - time_count;;
++				gint64 length = time - time_count;
+ 				char *full;
+ 				
+ 				cdda->track_starts[i] = time;
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..47139a1d8
--- /dev/null
+++ b/audio/marlin/files/patch-src_marlin-window-menu.c
@@ -0,0 +1,12 @@
+--- src/marlin-window-menu.c.orig	Thu Aug  5 12:47:19 2004
++++ src/marlin-window-menu.c	Wed Aug 11 22:06:41 2004
+@@ -634,8 +634,8 @@
+ 	GtkWidget *editor, *dialog;
+ 	EphyToolbarsModel *model;
+ 	Toolbar *toolbar;
+-	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;
+ 	char *xml;
++	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;
+ 
+ 	toolbar = marlin_window_get_toolbar (MARLIN_WINDOW (data));
+ 	model = marlin_get_toolbars_model ();
diff --git a/audio/marlin/pkg-descr b/audio/marlin/pkg-descr
new file mode 100644
index 000000000..a9542529e
--- /dev/null
+++ b/audio/marlin/pkg-descr
@@ -0,0 +1,5 @@
+Marlin is a audio sample editor for GNOME 2. It uses Gstreamer as a backend
+to provide support for numerous file formats. Marlin can also record
+from microphone or rip audio from CD.
+
+WWW: http://marlin.sourceforge.net/
diff --git a/audio/marlin/pkg-plist b/audio/marlin/pkg-plist
new file mode 100644
index 000000000..086b159bb
--- /dev/null
+++ b/audio/marlin/pkg-plist
@@ -0,0 +1,116 @@
+bin/marlin
+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.h
+include/libmarlin/marlin-file-chooser.h
+include/libmarlin/marlin-file-utils.h
+include/libmarlin/marlin-gst-extras.h
+include/libmarlin/marlin-channel.h
+include/libmarlin/marlin-level-ruler.h
+include/libmarlin/marlin-load-pipeline.h
+include/libmarlin/marlin-marker-model.h
+include/libmarlin/marlin-marker-view.h
+include/libmarlin/marlin-msgport.h
+include/libmarlin/marlin-mt.h
+include/libmarlin/marlin-object.h
+include/libmarlin/marlin-operation.h
+include/libmarlin/marlin-overview-bar.h
+include/libmarlin/marlin-pipeline.h
+include/libmarlin/marlin-play-pipeline.h
+include/libmarlin/marlin-position-spinner.h
+include/libmarlin/marlin-program.h
+include/libmarlin/marlin-read-write-lock.h
+include/libmarlin/marlin-record-pipeline.h
+include/libmarlin/marlin-sample.h
+include/libmarlin/marlin-sample-drawing.h
+include/libmarlin/marlin-sample-element.h
+include/libmarlin/marlin-sample-selection.h
+include/libmarlin/marlin-sample-view.h
+include/libmarlin/marlin-save-pipeline.h
+include/libmarlin/marlin-stock.h
+include/libmarlin/marlin-time-line.h
+include/libmarlin/marlin-types.h
+include/libmarlin/marlin-undo-manager.h
+include/libmarlin/marlin-undoable.h
+include/libmarlin/marlin-utils.h
+include/libmarlin/marlin-x-utils.h
+lib/libmarlinx.a
+lib/libmarlinx.la
+lib/libmarlinx.so
+lib/libmarlinx.so.0
+lib/libmarlin.a
+lib/libmarlin.la
+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
+share/gnome/help/marlin/C/figures/new_sample_dialog_create.png
+share/gnome/help/marlin/C/figures/new_sample_dialog_help.png
+share/gnome/help/marlin/C/figures/new_sample_dialog_channels.png
+share/gnome/help/marlin/C/figures/new_sample_dialog_rate.png
+share/gnome/help/marlin/C/legal.xml
+share/gnome/help/marlin/C/marlin.xml
+share/gnome/marlin/ui/marlin.xml
+share/gnome/marlin/ui/toolbars.xml
+share/gnome/marlin/ui/toolbar-popup-ui.xml
+share/gnome/omf/marlin/marlin-C.omf
+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
+share/gnome/pixmaps/marlin/marlin-logo.png
+share/gnome/pixmaps/marlin/marlin-new-sample.png
+share/gnome/pixmaps/marlin/marlin-next.png
+share/gnome/pixmaps/marlin/marlin-paste-as-new.png
+share/gnome/pixmaps/marlin/marlin-pause.png
+share/gnome/pixmaps/marlin/marlin-play.png
+share/gnome/pixmaps/marlin/marlin-previous.png
+share/gnome/pixmaps/marlin/marlin-record.png
+share/gnome/pixmaps/marlin/marlin-repeat.png
+share/gnome/pixmaps/marlin/marlin-rewind.png
+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/it/LC_MESSAGES/marlin.mo
+share/locale/ko/LC_MESSAGES/marlin.mo
+share/locale/nb/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/rw/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
+@dirrm share/gnome/marlin
+@dirrm share/gnome/help/marlin/C/figures
+@dirrm share/gnome/help/marlin/C
+@dirrm share/gnome/help/marlin
+@dirrm include/libmarlin