Move gnome2-media from audio to the multimedia category.

This is version 2.4.1.1nb4.

13 files changed, 818 insertions, 0 deletions

diff --git a/multimedia/gnome2-media/DESCR b/multimedia/gnome2-media/DESCR
new file mode 100644
index 00000000000..3fdb25c6983
--- /dev/null
+++ b/multimedia/gnome2-media/DESCR
@@ -0,0 +1,12 @@
+  This package contains gnome-media, a set of audio/multimedia tools
+for GNOME2.
+
+From the GNOME home page:
+
+GNOME stands for GNU Network Object Model Environment.  The GNOME
+project intends to build a complete, user-friendly desktop based
+entirely on free software.  GNOME is part of the GNU project, and
+GNOME is part of the OpenSource(tm) movement.  The desktop will
+consist of small utilities and larger applications which share a
+consistent look and feel.  GNOME uses GTK+ as the GUI toolkit for
+all GNOME-compliant applications.
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
new file mode 100644
index 00000000000..25cd190fc03
--- /dev/null
+++ b/multimedia/gnome2-media/Makefile
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/02/22 16:32:41 jmmv Exp $
+
+DISTNAME=		gnome-media-2.4.1.1
+PKGREVISION=		4
+CATEGORIES=		multimedia gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.4/}
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		rh@NetBSD.org
+HOMEPAGE=		http://www.gnome.org/
+COMMENT=		Set of audio/multimedia applications for GNOME2
+
+BUILD_USES_MSGFMT=	yes
+
+GNU_CONFIGURE=		yes
+USE_BUILDLINK3=		yes
+USE_PKGLOCALEDIR=	yes
+USE_LIBTOOL=		yes
+USE_X11=		yes
+USE_GNU_TOOLS+=		make
+USE_PERL5=		build
+
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ENV+=		XGETTEXT="${LOCALBASE}/bin/xgettext"
+
+.include "../../mk/bsd.prefs.mk"
+
+post-extract:
+	@cd ${WRKSRC}/gnome-cd && \
+	${MV} freebsd-cdrom.h bsd-cdrom.h && \
+	${MV} freebsd-cdrom.c bsd-cdrom.c
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+CONFIGURE_ENV+=		CDROM_HOST="bsd"
+.endif
+
+GCONF2_SCHEMAS=		CDDB-Slave2.schemas
+GCONF2_SCHEMAS+=	gnome-cd.schemas
+GCONF2_SCHEMAS+=	gnome-volume-control.schemas
+GCONF2_SCHEMAS+=	gnome-sound-recorder.schemas
+
+.include "../../audio/esound/buildlink3.mk"
+.include "../../multimedia/gst-plugins/buildlink3.mk"
+.include "../../multimedia/gstreamer/buildlink3.mk"
+.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf2-ui/buildlink3.mk"
+.include "../../devel/gail/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnome2-media/PLIST b/multimedia/gnome2-media/PLIST
new file mode 100644
index 00000000000..b395021d172
--- /dev/null
+++ b/multimedia/gnome2-media/PLIST
@@ -0,0 +1,504 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+bin/cddb-slave2-properties
+bin/gnome-cd
+bin/gnome-sound-recorder
+bin/gnome-volume-control
+bin/gstreamer-properties
+bin/vumeter
+include/cddb-slave2/cddb-slave-client.h
+lib/bonobo/servers/GNOME_Media_CDDBSlave2.server
+lib/libcddb-slave2.a
+lib/libcddb-slave2.la
+lib/libcddb-slave2.so
+lib/libcddb-slave2.so.0
+lib/libcddb-slave2.so.0.0
+libexec/CDDBSlave2
+libexec/cddb-track-editor
+share/applications/gnome-cd.desktop
+share/applications/gnome-sound-recorder.desktop
+share/applications/gnome-volume-control.desktop
+share/applications/reclevel.desktop
+share/applications/vumeter.desktop
+share/control-center-2.0/capplets/cddb-slave.desktop
+share/gconf/schemas/CDDB-Slave2.schemas
+share/gconf/schemas/gnome-cd.schemas
+share/gconf/schemas/gnome-sound-recorder.schemas
+share/gconf/schemas/gnome-volume-control.schemas
+share/gnome-media-2.0/icons/gstreamer-properties.png
+share/gnome-media-2.0/interfaces/gstreamer-properties.glade
+share/gnome-sound-recorder/ui/gsr.xml
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/C/figures/eject_button.png
+share/gnome/help/gnome-cd/C/figures/forward_button.png
+share/gnome/help/gnome-cd/C/figures/next_button.png
+share/gnome/help/gnome-cd/C/figures/pause_button.png
+share/gnome/help/gnome-cd/C/figures/play_button.png
+share/gnome/help/gnome-cd/C/figures/preferences_button.png
+share/gnome/help/gnome-cd/C/figures/previous_button.png
+share/gnome/help/gnome-cd/C/figures/rewind_button.png
+share/gnome/help/gnome-cd/C/figures/stop_button.png
+share/gnome/help/gnome-cd/C/gnome-cd.xml
+share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/de/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/de/figures/eject_button.png
+share/gnome/help/gnome-cd/de/figures/forward_button.png
+share/gnome/help/gnome-cd/de/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/de/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/de/figures/gnome-cd.png
+share/gnome/help/gnome-cd/de/figures/next_button.png
+share/gnome/help/gnome-cd/de/figures/pause_button.png
+share/gnome/help/gnome-cd/de/figures/play_button.png
+share/gnome/help/gnome-cd/de/figures/preferences_button.png
+share/gnome/help/gnome-cd/de/figures/previous_button.png
+share/gnome/help/gnome-cd/de/figures/rewind_button.png
+share/gnome/help/gnome-cd/de/figures/stop_button.png
+share/gnome/help/gnome-cd/de/gnome-cd.xml
+share/gnome/help/gnome-cd/de/legal.xml
+share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/es/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/es/figures/eject_button.png
+share/gnome/help/gnome-cd/es/figures/forward_button.png
+share/gnome/help/gnome-cd/es/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/es/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/es/figures/gnome-cd.png
+share/gnome/help/gnome-cd/es/figures/next_button.png
+share/gnome/help/gnome-cd/es/figures/pause_button.png
+share/gnome/help/gnome-cd/es/figures/play_button.png
+share/gnome/help/gnome-cd/es/figures/preferences_button.png
+share/gnome/help/gnome-cd/es/figures/previous_button.png
+share/gnome/help/gnome-cd/es/figures/rewind_button.png
+share/gnome/help/gnome-cd/es/figures/stop_button.png
+share/gnome/help/gnome-cd/es/gnome-cd.xml
+share/gnome/help/gnome-cd/es/legal.xml
+share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/fr/figures/eject_button.png
+share/gnome/help/gnome-cd/fr/figures/forward_button.png
+share/gnome/help/gnome-cd/fr/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/fr/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/fr/figures/gnome-cd.png
+share/gnome/help/gnome-cd/fr/figures/next_button.png
+share/gnome/help/gnome-cd/fr/figures/pause_button.png
+share/gnome/help/gnome-cd/fr/figures/play_button.png
+share/gnome/help/gnome-cd/fr/figures/preferences_button.png
+share/gnome/help/gnome-cd/fr/figures/previous_button.png
+share/gnome/help/gnome-cd/fr/figures/rewind_button.png
+share/gnome/help/gnome-cd/fr/figures/stop_button.png
+share/gnome/help/gnome-cd/fr/gnome-cd.xml
+share/gnome/help/gnome-cd/fr/legal.xml
+share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/it/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/it/figures/eject_button.png
+share/gnome/help/gnome-cd/it/figures/forward_button.png
+share/gnome/help/gnome-cd/it/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/it/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/it/figures/gnome-cd.png
+share/gnome/help/gnome-cd/it/figures/next_button.png
+share/gnome/help/gnome-cd/it/figures/pause_button.png
+share/gnome/help/gnome-cd/it/figures/play_button.png
+share/gnome/help/gnome-cd/it/figures/preferences_button.png
+share/gnome/help/gnome-cd/it/figures/previous_button.png
+share/gnome/help/gnome-cd/it/figures/rewind_button.png
+share/gnome/help/gnome-cd/it/figures/stop_button.png
+share/gnome/help/gnome-cd/it/gnome-cd.xml
+share/gnome/help/gnome-cd/it/legal.xml
+share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/ja/figures/eject_button.png
+share/gnome/help/gnome-cd/ja/figures/forward_button.png
+share/gnome/help/gnome-cd/ja/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/ja/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/ja/figures/gnome-cd.png
+share/gnome/help/gnome-cd/ja/figures/next_button.png
+share/gnome/help/gnome-cd/ja/figures/pause_button.png
+share/gnome/help/gnome-cd/ja/figures/play_button.png
+share/gnome/help/gnome-cd/ja/figures/preferences_button.png
+share/gnome/help/gnome-cd/ja/figures/previous_button.png
+share/gnome/help/gnome-cd/ja/figures/rewind_button.png
+share/gnome/help/gnome-cd/ja/figures/stop_button.png
+share/gnome/help/gnome-cd/ja/gnome-cd.xml
+share/gnome/help/gnome-cd/ja/legal.xml
+share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/ko/figures/eject_button.png
+share/gnome/help/gnome-cd/ko/figures/forward_button.png
+share/gnome/help/gnome-cd/ko/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/ko/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/ko/figures/gnome-cd.png
+share/gnome/help/gnome-cd/ko/figures/next_button.png
+share/gnome/help/gnome-cd/ko/figures/pause_button.png
+share/gnome/help/gnome-cd/ko/figures/play_button.png
+share/gnome/help/gnome-cd/ko/figures/preferences_button.png
+share/gnome/help/gnome-cd/ko/figures/previous_button.png
+share/gnome/help/gnome-cd/ko/figures/rewind_button.png
+share/gnome/help/gnome-cd/ko/figures/stop_button.png
+share/gnome/help/gnome-cd/ko/gnome-cd.xml
+share/gnome/help/gnome-cd/ko/legal.xml
+share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/sv/figures/eject_button.png
+share/gnome/help/gnome-cd/sv/figures/forward_button.png
+share/gnome/help/gnome-cd/sv/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/sv/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/sv/figures/gnome-cd.png
+share/gnome/help/gnome-cd/sv/figures/next_button.png
+share/gnome/help/gnome-cd/sv/figures/pause_button.png
+share/gnome/help/gnome-cd/sv/figures/play_button.png
+share/gnome/help/gnome-cd/sv/figures/preferences_button.png
+share/gnome/help/gnome-cd/sv/figures/previous_button.png
+share/gnome/help/gnome-cd/sv/figures/rewind_button.png
+share/gnome/help/gnome-cd/sv/figures/stop_button.png
+share/gnome/help/gnome-cd/sv/gnome-cd.xml
+share/gnome/help/gnome-cd/sv/legal.xml
+share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/zh_CN/figures/eject_button.png
+share/gnome/help/gnome-cd/zh_CN/figures/forward_button.png
+share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/zh_CN/figures/gnome-cd.png
+share/gnome/help/gnome-cd/zh_CN/figures/next_button.png
+share/gnome/help/gnome-cd/zh_CN/figures/pause_button.png
+share/gnome/help/gnome-cd/zh_CN/figures/play_button.png
+share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png
+share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png
+share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png
+share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png
+share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
+share/gnome/help/gnome-cd/zh_CN/legal.xml
+share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/zh_TW/figures/eject_button.png
+share/gnome/help/gnome-cd/zh_TW/figures/forward_button.png
+share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/zh_TW/figures/gnome-cd.png
+share/gnome/help/gnome-cd/zh_TW/figures/next_button.png
+share/gnome/help/gnome-cd/zh_TW/figures/pause_button.png
+share/gnome/help/gnome-cd/zh_TW/figures/play_button.png
+share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png
+share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png
+share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png
+share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png
+share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
+share/gnome/help/gnome-cd/zh_TW/legal.xml
+share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/C/legal.xml
+share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
+share/gnome/help/gnome-volume-control/C/figures/gmix.png
+share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/help/grecord/de/figures/grecord-prefs-path.png
+share/gnome/help/grecord/de/figures/grecord-prefs-play.png
+share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/de/figures/grecord.png
+share/gnome/help/grecord/de/figures/grecord_window.png
+share/gnome/help/grecord/de/grecord.xml
+share/gnome/help/grecord/de/legal.xml
+share/gnome/help/grecord/es/figures/grecord-prefs-path.png
+share/gnome/help/grecord/es/figures/grecord-prefs-play.png
+share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/es/figures/grecord.png
+share/gnome/help/grecord/es/figures/grecord_window.png
+share/gnome/help/grecord/es/grecord.xml
+share/gnome/help/grecord/es/legal.xml
+share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/fr/figures/grecord.png
+share/gnome/help/grecord/fr/figures/grecord_window.png
+share/gnome/help/grecord/fr/grecord.xml
+share/gnome/help/grecord/fr/legal.xml
+share/gnome/help/grecord/it/figures/grecord-prefs-path.png
+share/gnome/help/grecord/it/figures/grecord-prefs-play.png
+share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/it/figures/grecord.png
+share/gnome/help/grecord/it/figures/grecord_window.png
+share/gnome/help/grecord/it/grecord.xml
+share/gnome/help/grecord/it/legal.xml
+share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ja/figures/grecord.png
+share/gnome/help/grecord/ja/figures/grecord_window.png
+share/gnome/help/grecord/ja/grecord.xml
+share/gnome/help/grecord/ja/legal.xml
+share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ko/figures/grecord.png
+share/gnome/help/grecord/ko/figures/grecord_window.png
+share/gnome/help/grecord/ko/grecord.xml
+share/gnome/help/grecord/ko/legal.xml
+share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/sv/figures/grecord.png
+share/gnome/help/grecord/sv/figures/grecord_window.png
+share/gnome/help/grecord/sv/grecord.xml
+share/gnome/help/grecord/sv/legal.xml
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/zh_CN/figures/grecord.png
+share/gnome/help/grecord/zh_CN/figures/grecord_window.png
+share/gnome/help/grecord/zh_CN/grecord.xml
+share/gnome/help/grecord/zh_CN/legal.xml
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/zh_TW/figures/grecord.png
+share/gnome/help/grecord/zh_TW/figures/grecord_window.png
+share/gnome/help/grecord/zh_TW/grecord.xml
+share/gnome/help/grecord/zh_TW/legal.xml
+share/idl/GNOME_Media_CDDBSlave2.idl
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
+share/omf/gnome-media/gnome-cd-C.omf
+share/omf/gnome-media/gnome-cd-de.omf
+share/omf/gnome-media/gnome-cd-es.omf
+share/omf/gnome-media/gnome-cd-fr.omf
+share/omf/gnome-media/gnome-cd-it.omf
+share/omf/gnome-media/gnome-cd-ja.omf
+share/omf/gnome-media/gnome-cd-ko.omf
+share/omf/gnome-media/gnome-cd-sv.omf
+share/omf/gnome-media/gnome-cd-zh_CN.omf
+share/omf/gnome-media/gnome-cd-zh_TW.omf
+share/omf/gnome-media/gnome-volume-control-C.omf
+share/omf/gnome-media/grecord-C.omf
+share/omf/gnome-media/grecord-de.omf
+share/omf/gnome-media/grecord-es.omf
+share/omf/gnome-media/grecord-fr.omf
+share/omf/gnome-media/grecord-it.omf
+share/omf/gnome-media/grecord-ja.omf
+share/omf/gnome-media/grecord-ko.omf
+share/omf/gnome-media/grecord-sv.omf
+share/omf/gnome-media/grecord-zh_CN.omf
+share/omf/gnome-media/grecord-zh_TW.omf
+share/pixmaps/gnome-cd.png
+share/pixmaps/gnome-cd/cd.png
+share/pixmaps/gnome-cd/disc.png
+share/pixmaps/gnome-cd/media-eject.png
+share/pixmaps/gnome-cd/media-ffwd.png
+share/pixmaps/gnome-cd/media-next.png
+share/pixmaps/gnome-cd/media-pause.png
+share/pixmaps/gnome-cd/media-play.png
+share/pixmaps/gnome-cd/media-prev.png
+share/pixmaps/gnome-cd/media-record.png
+share/pixmaps/gnome-cd/media-rewind.png
+share/pixmaps/gnome-cd/media-stop.png
+share/pixmaps/gnome-cd/once.png
+share/pixmaps/gnome-cd/repeat.png
+share/pixmaps/gnome-cd/themes/None/None.theme
+share/pixmaps/gnome-cd/themes/None/a-eject-menu.png
+share/pixmaps/gnome-cd/themes/None/a-first-menu.png
+share/pixmaps/gnome-cd/themes/None/a-last-menu.png
+share/pixmaps/gnome-cd/themes/None/a-play-menu.png
+share/pixmaps/gnome-cd/themes/None/a-stop-menu.png
+share/pixmaps/gnome-cd/themes/None/bottom-left.png
+share/pixmaps/gnome-cd/themes/None/bottom-right.png
+share/pixmaps/gnome-cd/themes/None/bottom.png
+share/pixmaps/gnome-cd/themes/None/media-eject.png
+share/pixmaps/gnome-cd/themes/None/media-fwd.png
+share/pixmaps/gnome-cd/themes/None/media-next.png
+share/pixmaps/gnome-cd/themes/None/media-pause.png
+share/pixmaps/gnome-cd/themes/None/media-play.png
+share/pixmaps/gnome-cd/themes/None/media-prev.png
+share/pixmaps/gnome-cd/themes/None/media-rew.png
+share/pixmaps/gnome-cd/themes/None/media-stop.png
+share/pixmaps/gnome-cd/themes/None/middle-left.png
+share/pixmaps/gnome-cd/themes/None/middle-right.png
+share/pixmaps/gnome-cd/themes/None/middle.png
+share/pixmaps/gnome-cd/themes/None/top-left.png
+share/pixmaps/gnome-cd/themes/None/top-right.png
+share/pixmaps/gnome-cd/themes/None/top.png
+share/pixmaps/gnome-cd/themes/lcd/bottom-left.png
+share/pixmaps/gnome-cd/themes/lcd/bottom-right.png
+share/pixmaps/gnome-cd/themes/lcd/bottom.png
+share/pixmaps/gnome-cd/themes/lcd/lcd.theme
+share/pixmaps/gnome-cd/themes/lcd/middle-left.png
+share/pixmaps/gnome-cd/themes/lcd/middle-right.png
+share/pixmaps/gnome-cd/themes/lcd/middle.png
+share/pixmaps/gnome-cd/themes/lcd/top-left.png
+share/pixmaps/gnome-cd/themes/lcd/top-right.png
+share/pixmaps/gnome-cd/themes/lcd/top.png
+share/pixmaps/gnome-cd/themes/media/bottom-left.png
+share/pixmaps/gnome-cd/themes/media/bottom-right.png
+share/pixmaps/gnome-cd/themes/media/bottom.png
+share/pixmaps/gnome-cd/themes/media/media.theme
+share/pixmaps/gnome-cd/themes/media/middle-left.png
+share/pixmaps/gnome-cd/themes/media/middle-right.png
+share/pixmaps/gnome-cd/themes/media/middle.png
+share/pixmaps/gnome-cd/themes/media/top-left.png
+share/pixmaps/gnome-cd/themes/media/top-right.png
+share/pixmaps/gnome-cd/themes/media/top.png
+share/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png
+share/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
+share/pixmaps/gnome-cd/themes/red-lcd/bottom.png
+share/pixmaps/gnome-cd/themes/red-lcd/middle-left.png
+share/pixmaps/gnome-cd/themes/red-lcd/middle-right.png
+share/pixmaps/gnome-cd/themes/red-lcd/middle.png
+share/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme
+share/pixmaps/gnome-cd/themes/red-lcd/top-left.png
+share/pixmaps/gnome-cd/themes/red-lcd/top-right.png
+share/pixmaps/gnome-cd/themes/red-lcd/top.png
+share/pixmaps/gnome-cd/track.png
+share/pixmaps/gnome-grecord.png
+share/pixmaps/gnome-media/gnome-sound-recorder/media-play.png
+share/pixmaps/gnome-media/gnome-sound-recorder/media-rec.png
+share/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
+share/pixmaps/gnome-mixer.png
+share/pixmaps/gnome-reclevel.png
+share/pixmaps/gnome-vumeter.png
+share/pixmaps/gstreamer-properties.png
+@dirrm share/pixmaps/gnome-media/gnome-sound-recorder
+@dirrm share/pixmaps/gnome-media
+@dirrm share/pixmaps/gnome-cd/themes/red-lcd
+@dirrm share/pixmaps/gnome-cd/themes/media
+@dirrm share/pixmaps/gnome-cd/themes/lcd
+@dirrm share/pixmaps/gnome-cd/themes/None
+@dirrm share/pixmaps/gnome-cd/themes
+@dirrm share/pixmaps/gnome-cd
+@dirrm share/omf/gnome-media
+@comment @dirrm share/omf
+@comment @dirrm share/idl
+@dirrm share/gnome/help/grecord/zh_TW/figures
+@dirrm share/gnome/help/grecord/zh_TW
+@dirrm share/gnome/help/grecord/zh_CN/figures
+@dirrm share/gnome/help/grecord/zh_CN
+@dirrm share/gnome/help/grecord/sv/figures
+@dirrm share/gnome/help/grecord/sv
+@dirrm share/gnome/help/grecord/ko/figures
+@dirrm share/gnome/help/grecord/ko
+@dirrm share/gnome/help/grecord/ja/figures
+@dirrm share/gnome/help/grecord/ja
+@dirrm share/gnome/help/grecord/it/figures
+@dirrm share/gnome/help/grecord/it
+@dirrm share/gnome/help/grecord/fr/figures
+@dirrm share/gnome/help/grecord/fr
+@dirrm share/gnome/help/grecord/es/figures
+@dirrm share/gnome/help/grecord/es
+@dirrm share/gnome/help/grecord/de/figures
+@dirrm share/gnome/help/grecord/de
+@dirrm share/gnome/help/grecord
+@dirrm share/gnome/help/gnome-volume-control/C/figures
+@dirrm share/gnome/help/gnome-volume-control/C
+@dirrm share/gnome/help/gnome-volume-control
+@dirrm share/gnome/help/gnome-sound-recorder/C/figures
+@dirrm share/gnome/help/gnome-sound-recorder/C
+@dirrm share/gnome/help/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-cd/zh_TW/figures
+@dirrm share/gnome/help/gnome-cd/zh_TW
+@dirrm share/gnome/help/gnome-cd/zh_CN/figures
+@dirrm share/gnome/help/gnome-cd/zh_CN
+@dirrm share/gnome/help/gnome-cd/sv/figures
+@dirrm share/gnome/help/gnome-cd/sv
+@dirrm share/gnome/help/gnome-cd/ko/figures
+@dirrm share/gnome/help/gnome-cd/ko
+@dirrm share/gnome/help/gnome-cd/ja/figures
+@dirrm share/gnome/help/gnome-cd/ja
+@dirrm share/gnome/help/gnome-cd/it/figures
+@dirrm share/gnome/help/gnome-cd/it
+@dirrm share/gnome/help/gnome-cd/fr/figures
+@dirrm share/gnome/help/gnome-cd/fr
+@dirrm share/gnome/help/gnome-cd/es/figures
+@dirrm share/gnome/help/gnome-cd/es
+@dirrm share/gnome/help/gnome-cd/de/figures
+@dirrm share/gnome/help/gnome-cd/de
+@dirrm share/gnome/help/gnome-cd/C/figures
+@dirrm share/gnome/help/gnome-cd/C
+@dirrm share/gnome/help/gnome-cd
+@comment @dirrm share/gnome/help
+@dirrm share/gnome-sound-recorder/ui
+@dirrm share/gnome-sound-recorder
+@dirrm share/gnome-media-2.0/interfaces
+@dirrm share/gnome-media-2.0/icons
+@dirrm share/gnome-media-2.0
+@comment @dirrm share/gconf/schemas
+@comment @dirrm share/control-center-2.0/capplets
+@comment @dirrm share/applications
+@comment @dirrm lib/bonobo/servers
+@dirrm include/cddb-slave2
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo
new file mode 100644
index 00000000000..8a11fc3649a
--- /dev/null
+++ b/multimedia/gnome2-media/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/02/22 16:32:41 jmmv Exp $
+
+SHA1 (gnome-media-2.4.1.1.tar.bz2) = aa98c51b6d2e4234dc0a45f3a52b6fbcaa451edd
+Size (gnome-media-2.4.1.1.tar.bz2) = 2745842 bytes
+SHA1 (patch-aa) = 556cbe7ef1c4a5776bfa1bce020d77adcd56b225
+SHA1 (patch-ab) = fabc0807403f57bfd8adb8b3cf3cb098f7a75ea2
+SHA1 (patch-ac) = 26c7aec8f236134d422762464b486f0a2f345fc5
+SHA1 (patch-ad) = 9d0ad2316afb3e09530a929784f10fc4e97dae8b
+SHA1 (patch-ae) = ae58fa078e8b7c7bdfbe57e269ea29f3791928f8
+SHA1 (patch-af) = 2b5ce1e8e161133ea1c2a4578251627158132543
+SHA1 (patch-ag) = f9e648d7fb548e5eb7d8956c87958141ee0abbbf
+SHA1 (patch-ah) = 9df1f4facdd215809eb3cffc893ecfe057b5eb4c
+SHA1 (patch-ai) = b28674e81961b5e2b69e168031c5389ce443a799
diff --git a/multimedia/gnome2-media/patches/patch-aa b/multimedia/gnome2-media/patches/patch-aa
new file mode 100644
index 00000000000..631b3c65272
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+
+--- cddb-slave2/Makefile.in.orig	2003-12-09 09:24:28.000000000 +0000
++++ cddb-slave2/Makefile.in	2003-12-09 09:24:55.000000000 +0000
+@@ -243,7 +243,7 @@
+ 	cddb-slave-client.h
+ 
+ 
+-schemadir = $(sysconfdir)/gconf/schemas
++schemadir = @GCONF_SCHEMA_FILE_DIR@
+ schema_DATA = CDDB-Slave2.schemas
+ 
+ server_in_files = GNOME_Media_CDDBSlave2.server.in.in
diff --git a/multimedia/gnome2-media/patches/patch-ab b/multimedia/gnome2-media/patches/patch-ab
new file mode 100644
index 00000000000..83ae971a1ad
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+--- gmix/gmix.c.orig	2003-12-09 09:38:15.000000000 +0000
++++ gmix/gmix.c	2003-12-09 09:39:40.000000000 +0000
+@@ -60,7 +60,7 @@
+ #ifdef HAVE_LINUX_SOUNDCARD_H 
+ #include <linux/soundcard.h>
+ #else 
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif
+ #endif
+ 
diff --git a/multimedia/gnome2-media/patches/patch-ac b/multimedia/gnome2-media/patches/patch-ac
new file mode 100644
index 00000000000..0b8099497bc
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+
+--- gmix/prefs.c.orig	Tue May  7 00:52:42 2002
++++ gmix/prefs.c	Tue May  7 00:52:54 2002
+@@ -38,7 +38,7 @@
+ #ifdef HAVE_LINUX_SOUNDCARD_H 
+ #include <linux/soundcard.h>
+ #else 
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif
+ #endif
diff --git a/multimedia/gnome2-media/patches/patch-ad b/multimedia/gnome2-media/patches/patch-ad
new file mode 100644
index 00000000000..1102a0ada75
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+
+--- gmix/gmix.h.orig	Tue Jun 12 03:50:47 2001
++++ gmix/gmix.h
+@@ -36,6 +36,13 @@
+ } mixer_info;
+ #endif
+ 
++#if !defined(HAVE_MIXER_INFO) && !defined(SOUND_MIXER_INFO)
++typedef struct {
++	char id[20];
++	char name[40];
++} mixer_info;
++#endif
++
+ /* 
+  * All, that is known about a mixer-device
+  */
diff --git a/multimedia/gnome2-media/patches/patch-ae b/multimedia/gnome2-media/patches/patch-ae
new file mode 100644
index 00000000000..8b275022645
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+
+--- gmix/Makefile.in.orig	2003-12-09 09:27:39.000000000 +0000
++++ gmix/Makefile.in	2003-12-09 09:28:06.000000000 +0000
+@@ -183,7 +183,7 @@
+ 
+ pixmap_DATA = gnome-mixer.png
+ 
+-@BUILD_GMIX_TRUE@schemadir = @BUILD_GMIX_TRUE@$(sysconfdir)/gconf/schemas
++@BUILD_GMIX_TRUE@schemadir = @BUILD_GMIX_TRUE@@GCONF_SCHEMA_FILE_DIR@
+ @BUILD_GMIX_TRUE@schema_DATA = @BUILD_GMIX_TRUE@gnome-volume-control.schemas
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/multimedia/gnome2-media/patches/patch-af b/multimedia/gnome2-media/patches/patch-af
new file mode 100644
index 00000000000..38a1035f19e
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+
+--- grecord/Makefile.in.orig	2003-12-09 09:29:57.000000000 +0000
++++ grecord/Makefile.in	2003-12-09 09:30:29.000000000 +0000
+@@ -180,7 +180,7 @@
+ uidir = $(datadir)/gnome-sound-recorder/ui
+ ui_DATA = gsr.xml
+ 
+-schemadir = $(sysconfdir)/gconf/schemas
++schemadir =  @GCONF_SCHEMA_FILE_DIR@
+ schema_DATA = gnome-sound-recorder.schemas
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/multimedia/gnome2-media/patches/patch-ag b/multimedia/gnome2-media/patches/patch-ag
new file mode 100644
index 00000000000..188b41759ef
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-ag
@@ -0,0 +1,120 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+
+--- gnome-cd/bsd-cdrom.c.orig	2003-01-11 06:23:03.000000000 -0600
++++ gnome-cd/bsd-cdrom.c
+@@ -20,7 +20,7 @@
+ #endif
+ #include <errno.h>
+ 
+-#include "freebsd-cdrom.h"
++#include "bsd-cdrom.h"
+ 
+ #define CD_FRAMES	75
+ 
+@@ -166,7 +166,12 @@ freebsd_cdrom_update_cd (GnomeCDRom *cdr
+ {
+ 	FreeBSDCDRom *lcd = FREEBSD_CDROM (cdrom);
+ 	FreeBSDCDRomPrivate *priv;
++#ifdef __FreeBSD__
+ 	struct ioc_read_toc_single_entry tocentry;
++#else
++	struct ioc_read_toc_entry tocentries;
++	struct cd_toc_entry tocentry;
++#endif
+ 	int i, j;
+ 	GError *error;
+ 
+@@ -190,29 +195,53 @@ freebsd_cdrom_update_cd (GnomeCDRom *cdr
+ 
+ 	freebsd_cdrom_invalidate (lcd);
+ 	priv->track_info = g_malloc ((priv->number_tracks + 1) * sizeof (FreeBSDCDRomTrackInfo));
++#ifdef __FreeBSD__
+ 	for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
+ 		tocentry.track = j;
+ 		tocentry.address_format = CD_MSF_FORMAT;
++#else
++	tocentries.data_len = sizeof(tocentry);
++	tocentries.data = &tocentry;
++	for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
++		tocentries.starting_track = j;
++		tocentries.address_format = CD_MSF_FORMAT;
++#endif
+ 
+-		if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
++		if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
+ 			g_warning ("IOCtl failed");
+ 			continue;
+ 		}
+ 
+ 		priv->track_info[i].track = j;
++#ifdef __FreeBSD__
+ 		priv->track_info[i].audio_track = tocentry.entry.control == 0 ? 1 : 0;
+ 		ASSIGN_MSF (priv->track_info[i].address, tocentry.entry.addr.msf);
++#else
++		priv->track_info[i].audio_track = tocentry.control == 0 ? 1 : 0;
++		ASSIGN_MSF (priv->track_info[i].address, tocentry.addr.msf);
++#endif
+ 	}
+ 
++#ifdef __FreeBSD__
+ 	/* On FreeBSD, the leadout track is the track LAST_TRACK + 1. */
+ 	tocentry.track = priv->number_tracks + 1;
+ 	tocentry.address_format = CD_MSF_FORMAT;
+ 	if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
++#else
++	/* On NetBSD, the leadout track is the track 0xAA. */
++	tocentries.starting_track = 0xAA;
++	tocentries.address_format = CD_MSF_FORMAT;
++	if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
++#endif
+ 		g_warning ("Error getting leadout");
+ 		freebsd_cdrom_invalidate (lcd);
+ 		return;
+ 	}
++#ifdef __FreeBSD__
+ 	ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.entry.addr.msf);
++#else
++	ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.addr.msf);
++#endif
+ 	calculate_track_lengths (lcd);
+ 
+ 	freebsd_cdrom_close (lcd);
+@@ -232,11 +261,18 @@ freebsd_cdrom_eject (GnomeCDRom *cdrom,
+ 		return FALSE;
+ 	}
+ 
++#ifdef __FreeBSD__
+ 	if (gnome_cdrom_get_status (cdrom, &status, error) == FALSE) {
+ 		freebsd_cdrom_close (lcd);
+ 		g_free (status);
+ 		return FALSE;
+ 	}
++#else
++	status = g_new0 (GnomeCDRomStatus, 1);
++	status->volume = 0;
++	status->cd = GNOME_CDROM_STATUS_OK;
++	ioctl(cdrom->fd, CDIOCALLOW);
++#endif
+ 
+ 	if (status->cd != GNOME_CDROM_STATUS_TRAY_OPEN) {
+ 		if (ioctl (cdrom->fd, CDIOCEJECT, 0) < 0) {
+@@ -862,7 +898,19 @@ freebsd_cdrom_get_status (GnomeCDRom *cd
+ 		return FALSE;
+ 	}
+ #endif
++#ifdef __FreeBSD__
+ 	/* FIXME: Figure out how to do this on FreeBSD */
++#else
++	if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
++		realstatus->cd = GNOME_CDROM_STATUS_NO_DISC;
++		realstatus->audio = GNOME_CDROM_AUDIO_NOTHING;
++		realstatus->track = -1;
++
++		freebsd_cdrom_close (lcd);
++		return TRUE;
++	}
++	subchnl.track = 0;
++#endif
+ 	realstatus->cd = GNOME_CDROM_STATUS_OK;
+ 
+ 	subchnl.address_format = CD_MSF_FORMAT;
diff --git a/multimedia/gnome2-media/patches/patch-ah b/multimedia/gnome2-media/patches/patch-ah
new file mode 100644
index 00000000000..d2a8ed64b3c
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+
+--- gnome-cd/Makefile.in.orig	2003-12-14 02:55:53.000000000 -0600
++++ gnome-cd/Makefile.in
+@@ -224,7 +224,7 @@ Audio_in_files = gnome-cd.desktop.in
+ Audio_DATA = $(Audio_in_files:.desktop.in=.desktop)
+ Pixmap_DATA = gnome-cd.png
+ 
+-schemadir = $(sysconfdir)/gconf/schemas
++schemadir = @GCONF_SCHEMA_FILE_DIR@
+ schema_DATA = gnome-cd.schemas
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/multimedia/gnome2-media/patches/patch-ai b/multimedia/gnome2-media/patches/patch-ai
new file mode 100644
index 00000000000..727e2a9a8fc
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+
+--- configure.orig	2003-12-31 03:12:56.000000000 +0100
++++ configure	2003-12-31 03:13:45.000000000 +0100
+@@ -12832,9 +12832,11 @@
+ 
+ case "$host" in
+ *FreeBSD*)
+-	CDROM_HOST=freebsd
+ 	default_cd_device="/dev/acd0c"
+ 	;;
++*NetBSD*)
++	default_cd_device="/dev/rcd0d"
++	;;
+ *Linux*)
+ 	CDROM_HOST=linux
+ 	default_cd_device="/dev/cdrom"