Update to 2.6.0 (which I forgot to commit yesterday night). Sorry, couldn't

find a suitable list of changes...

12 files changed, 96 insertions, 152 deletions

diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 1ae0a9664da..f7ff6f14f29 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/03/26 02:27:47 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/02 05:51:03 jmmv Exp $
 
-DISTNAME=		gnome-media-2.4.1.1
-PKGREVISION=		7
+DISTNAME=		gnome-media-2.6.0
 CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -27,18 +26,13 @@ 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-audio-profiles.schemas
 GCONF2_SCHEMAS+=	gnome-cd.schemas
-GCONF2_SCHEMAS+=	gnome-volume-control.schemas
 GCONF2_SCHEMAS+=	gnome-sound-recorder.schemas
 
 .include "../../audio/esound/buildlink3.mk"
diff --git a/multimedia/gnome2-media/PLIST b/multimedia/gnome2-media/PLIST
index b395021d172..e238700056e 100644
--- a/multimedia/gnome2-media/PLIST
+++ b/multimedia/gnome2-media/PLIST
@@ -1,17 +1,32 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/02 05:51:03 jmmv Exp $
 bin/cddb-slave2-properties
+bin/gnome-audio-profiles-properties
 bin/gnome-cd
 bin/gnome-sound-recorder
 bin/gnome-volume-control
 bin/gstreamer-properties
 bin/vumeter
 include/cddb-slave2/cddb-slave-client.h
+include/gnome-media/profiles/audio-profile-choose.h
+include/gnome-media/profiles/audio-profile-edit.h
+include/gnome-media/profiles/audio-profile.h
+include/gnome-media/profiles/audio-profiles-edit.h
+include/gnome-media/profiles/gnome-media-profiles.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
+lib/libglade/2.0/libgnome-media-profiles.a
+lib/libglade/2.0/libgnome-media-profiles.la
+lib/libglade/2.0/libgnome-media-profiles.so
+lib/libgnome-media-profiles.a
+lib/libgnome-media-profiles.la
+lib/libgnome-media-profiles.so
+lib/libgnome-media-profiles.so.0
+lib/libgnome-media-profiles.so.0.0
+lib/pkgconfig/gnome-media-profiles.pc
 libexec/CDDBSlave2
 libexec/cddb-track-editor
 share/applications/gnome-cd.desktop
@@ -20,12 +35,16 @@ share/applications/gnome-volume-control.desktop
 share/applications/reclevel.desktop
 share/applications/vumeter.desktop
 share/control-center-2.0/capplets/cddb-slave.desktop
+share/control-center-2.0/capplets/gstreamer-properties.desktop
 share/gconf/schemas/CDDB-Slave2.schemas
+share/gconf/schemas/gnome-audio-profiles.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-media/glade/gnome-audio-profiles.glade2
+share/gnome-media/pixmaps/mixer.png
+share/gnome-media/pixmaps/phone.png
+share/gnome-media/pixmaps/tone.png
+share/gnome-media/pixmaps/video.png
 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
@@ -199,6 +218,7 @@ 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/figures/gnome-volume-control_window.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
@@ -282,6 +302,11 @@ 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/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/C/legal.xml
+share/gstreamer-properties/glade/gstreamer-properties.glade
+share/gstreamer-properties/icons/gstreamer-properties.png
 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
@@ -295,6 +320,7 @@ ${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_CA/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
@@ -306,6 +332,7 @@ ${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/hr/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
@@ -320,6 +347,7 @@ ${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/pa/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
@@ -331,6 +359,8 @@ ${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/ta/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/th/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
@@ -358,6 +388,7 @@ 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/omf/gnome-media/gstreamer-properties-C.omf
 share/pixmaps/gnome-cd.png
 share/pixmaps/gnome-cd/cd.png
 share/pixmaps/gnome-cd/disc.png
@@ -428,7 +459,7 @@ 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-record.png
 share/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
 share/pixmaps/gnome-mixer.png
 share/pixmaps/gnome-reclevel.png
@@ -442,9 +473,16 @@ share/pixmaps/gstreamer-properties.png
 @dirrm share/pixmaps/gnome-cd/themes/None
 @dirrm share/pixmaps/gnome-cd/themes
 @dirrm share/pixmaps/gnome-cd
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-media
-@comment @dirrm share/omf
-@comment @dirrm share/idl
+@comment in scrollkeeper: @dirrm share/omf
+@comment in ORBit2: @dirrm share/idl
+@dirrm share/gstreamer-properties/icons
+@dirrm share/gstreamer-properties/glade
+@dirrm share/gstreamer-properties
+@dirrm share/gnome/help/gstreamer-properties/C/figures
+@dirrm share/gnome/help/gstreamer-properties/C
+@dirrm share/gnome/help/gstreamer-properties
 @dirrm share/gnome/help/grecord/zh_TW/figures
 @dirrm share/gnome/help/grecord/zh_TW
 @dirrm share/gnome/help/grecord/zh_CN/figures
@@ -491,14 +529,17 @@ share/pixmaps/gstreamer-properties.png
 @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
+@comment in gnome2-dirs: @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 share/gnome-media/pixmaps
+@dirrm share/gnome-media/glade
+@dirrm share/gnome-media
+@comment in GConf2: @dirrm share/gconf/schemas
+@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
+@comment in xdg-dirs: @dirrm share/applications
+@comment in libglade2: @dirrm lib/libglade/2.0
+@comment in libbonobo: @dirrm lib/bonobo/servers
+@dirrm include/gnome-media/profiles
+@dirrm include/gnome-media
 @dirrm include/cddb-slave2
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo
index 8a11fc3649a..d3d4cdff3de 100644
--- a/multimedia/gnome2-media/distinfo
+++ b/multimedia/gnome2-media/distinfo
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/22 16:32:41 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/04/02 05:51:03 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
+SHA1 (gnome-media-2.6.0.tar.bz2) = 41f64e9c800df461133a1eac8853954c1bdb5da2
+Size (gnome-media-2.6.0.tar.bz2) = 2943852 bytes
+SHA1 (patch-aa) = 8ba862f280caec8295b95f84b7f53c0fbd2f04a7
+SHA1 (patch-ag) = 0d847b2721a58c40767dcf2963c54cc2ec09000f
+SHA1 (patch-ai) = 5eb11da18015ac4d4c3a85bc38b75e59f1890a7e
diff --git a/multimedia/gnome2-media/patches/patch-aa b/multimedia/gnome2-media/patches/patch-aa
index 631b3c65272..cccc71efa58 100644
--- a/multimedia/gnome2-media/patches/patch-aa
+++ b/multimedia/gnome2-media/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/02 05:51:03 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
- 
+http://bugzilla.gnome.org/show_bug.cgi?id=137198
+
+--- gstreamer-properties/Makefile.in.orig	2004-03-09 09:19:42.000000000 +0100
++++ gstreamer-properties/Makefile.in
+@@ -239,7 +239,7 @@ desktop_icons_DATA = gstreamer-propertie
+ gladedir = $(datadir)/gstreamer-properties/glade
+ glade_DATA = gstreamer-properties.glade 
  
--schemadir = $(sysconfdir)/gconf/schemas
-+schemadir = @GCONF_SCHEMA_FILE_DIR@
- schema_DATA = CDDB-Slave2.schemas
+-desktopdir = $(datadir)/applications
++desktopdir = $(datadir)/control-center-2.0/capplets
+ Desktop_in_files = gstreamer-properties.desktop.in
+ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
  
- 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
deleted file mode 100644
index 83ae971a1ad..00000000000
--- a/multimedia/gnome2-media/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 0b8099497bc..00000000000
--- a/multimedia/gnome2-media/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 1102a0ada75..00000000000
--- a/multimedia/gnome2-media/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 8b275022645..00000000000
--- a/multimedia/gnome2-media/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 38a1035f19e..00000000000
--- a/multimedia/gnome2-media/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
index 188b41759ef..0205bef16e3 100644
--- a/multimedia/gnome2-media/patches/patch-ag
+++ b/multimedia/gnome2-media/patches/patch-ag
@@ -1,16 +1,9 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+$NetBSD: patch-ag,v 1.2 2004/04/02 05:51:03 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
- 
+http://bugzilla.gnome.org/show_bug.cgi?id=135139
+
+--- gnome-cd/freebsd-cdrom.c.orig	2003-01-11 06:23:03.000000000 -0600
++++ gnome-cd/freebsd-cdrom.c
 @@ -166,7 +166,12 @@ freebsd_cdrom_update_cd (GnomeCDRom *cdr
  {
  	FreeBSDCDRom *lcd = FREEBSD_CDROM (cdrom);
diff --git a/multimedia/gnome2-media/patches/patch-ah b/multimedia/gnome2-media/patches/patch-ah
deleted file mode 100644
index d2a8ed64b3c..00000000000
--- a/multimedia/gnome2-media/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
index 727e2a9a8fc..c3e2f2a4aea 100644
--- a/multimedia/gnome2-media/patches/patch-ai
+++ b/multimedia/gnome2-media/patches/patch-ai
@@ -1,17 +1,18 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/02/22 16:32:45 jmmv Exp $
+$NetBSD: patch-ai,v 1.2 2004/04/02 05:51:03 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"
+http://bugzilla.gnome.org/show_bug.cgi?id=135139
+
+--- configure.orig	2003-12-31 04:10:36.000000000 +0100
++++ configure
+@@ -23197,6 +23197,11 @@ case "$host" in
+ 	CDROM_HOST_LINUX=true
+ 	default_cd_device="/dev/cdrom"
  	;;
 +*NetBSD*)
++	CDROM_HOST=freebsd
++	CDROM_HOST_FREEBSD=true
 +	default_cd_device="/dev/rcd0d"
 +	;;
- *Linux*)
- 	CDROM_HOST=linux
- 	default_cd_device="/dev/cdrom"
+ *SunOS*)
+ 	CDROM_HOST=solaris
+ 	CDROM_HOST_SOLARIS=true