cleanup patches and pkgsrc support for the cd slave which hasn't been

built for a while,
cleanup unnecessary dependencies,
bump PKGREVISION

4 files changed, 3 insertions, 202 deletions

diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index ed478d8ec04..f5be74ab3f9 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/07/22 09:01:38 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/26 18:38:14 drochner Exp $
 
 DISTNAME=		gnome-media-2.26.0
+PKGREVISION=		1
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.26/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,37 +12,16 @@ COMMENT=		Set of audio/multimedia applications for GNOME2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=		gst-plugins0.10-pulse>=0.10.0:../../audio/gst-plugins0.10-pulse
-
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config xgettext
 
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
-CONFIGURE_ENV+=		CDROM_HOST="bsd"
-.endif
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-media
-PKG_SUPPORTED_OPTIONS+=	inet6
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
 GCONF_SCHEMAS+=	gnome-audio-profiles.schemas
 GCONF_SCHEMAS+=	gnome-sound-recorder.schemas
 
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
-.include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/GConf-ui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -55,17 +35,14 @@ BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.13.2
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.3
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-good/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gstreamer0.10+=		gstreamer0.10>=0.10.3
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.10.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnome-media/distinfo b/multimedia/gnome-media/distinfo
index 2f47e931ea1..30a8bc28dc1 100644
--- a/multimedia/gnome-media/distinfo
+++ b/multimedia/gnome-media/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/03/16 22:09:28 jmcneill Exp $
+$NetBSD: distinfo,v 1.9 2009/07/26 18:38:14 drochner Exp $
 
 SHA1 (gnome-media-2.26.0.tar.bz2) = 23ec588fdf5df3eef542278952fe78ed032d354a
 RMD160 (gnome-media-2.26.0.tar.bz2) = 0720cf0394148d8dc3cf6423a8b817a70f1486ed
 Size (gnome-media-2.26.0.tar.bz2) = 2662523 bytes
-SHA1 (patch-aa) = 022c909690b5521a93e1ce0eab025eb4c1598181
-SHA1 (patch-ab) = 5b48beaf188f916cc9052b3c1ac2978258f73e0d
 SHA1 (patch-ac) = f5ab6343f8b80a655ea2641dcbf61296f3643b98
diff --git a/multimedia/gnome-media/patches/patch-aa b/multimedia/gnome-media/patches/patch-aa
deleted file mode 100644
index fddf2a32085..00000000000
--- a/multimedia/gnome-media/patches/patch-aa
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/09/19 23:46:07 wiz Exp $
-
---- gnome-cd/bsd-cdrom.c.orig	2007-01-06 19:17:02.000000000 +0100
-+++ gnome-cd/bsd-cdrom.c
-@@ -166,7 +166,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
- {
- 	BSDCDRom *lcd = BSD_CDROM (cdrom);
- 	BSDCDRomPrivate *priv;
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	struct ioc_read_toc_single_entry tocentry;
- #else
- 	struct ioc_read_toc_entry tocentries;
-@@ -195,7 +195,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
- 
- 	bsd_cdrom_invalidate (lcd);
- 	priv->track_info = g_malloc ((priv->number_tracks + 1) * sizeof (BSDCDRomTrackInfo));
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
- 		tocentry.track = j;
- 		tocentry.address_format = CD_MSF_FORMAT;
-@@ -207,7 +207,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
- 		tocentries.address_format = CD_MSF_FORMAT;
- #endif
- 
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 		if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
- #else
- 		if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
-@@ -217,7 +217,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
- 		}
- 
- 		priv->track_info[i].track = j;
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 		priv->track_info[i].audio_track = tocentry.entry.control == 0 ? 1 : 0;
- 		ASSIGN_MSF (priv->track_info[i].address, tocentry.entry.addr.msf);
- #else
-@@ -226,7 +226,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
- #endif
- 	}
- 
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	/* On BSD, the leadout track is the track LAST_TRACK + 1. */
- 	tocentry.track = priv->number_tracks + 1;
- 	tocentry.address_format = CD_MSF_FORMAT;
-@@ -241,7 +241,7 @@ bsd_cdrom_update_cd (GnomeCDRom *cdrom)
- 		bsd_cdrom_invalidate (lcd);
- 		return;
- 	}
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	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);
-@@ -265,7 +265,7 @@ bsd_cdrom_eject (GnomeCDRom *cdrom,
- 		return FALSE;
- 	}
- 
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	if (gnome_cdrom_get_status (cdrom, &status, error) == FALSE) {
- 		bsd_cdrom_close (lcd);
- 		g_free (status);
-@@ -902,7 +902,7 @@ bsd_cdrom_get_status (GnomeCDRom *cdrom,
- 		return FALSE;
- 	}
- #endif
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	/* FIXME: Figure out how to do this on BSD */
- #else
- 	if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
diff --git a/multimedia/gnome-media/patches/patch-ab b/multimedia/gnome-media/patches/patch-ab
deleted file mode 100644
index f5cc41e3b57..00000000000
--- a/multimedia/gnome-media/patches/patch-ab
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/09/19 23:46:07 wiz Exp $
-
---- gnome-cd/gst-cdrom.c.orig	2007-01-22 15:01:38.000000000 +0100
-+++ gnome-cd/gst-cdrom.c
-@@ -36,14 +36,14 @@
- 
- #ifdef __linux__
- #include <linux/cdrom.h>
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__sun)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) || defined(__DragonFly__)
- #include <sys/cdio.h>
- #endif
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- #include <sys/cdrio.h>
- #endif
- 
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDIOCCAPABILITY
- # define GST_CDROM_IOCTL_EJECT_REQUEST         CDIOCEJECT
- #elif defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -851,7 +851,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
- /*
- 	GstCdparanoiaCDRom *lcd = GST_CDPARANOIA_CDROM (cdrom);
- 	GstCdparanoiaCDRomPrivate *priv;
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	struct ioc_read_toc_single_entry tocentry;
- #elif defined(__NetBSD__) || defined(__OpenBSD__)
- 	struct ioc_read_toc_entry tocentries;
-@@ -869,7 +869,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
- 		return;
- 	}
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
- #else
- 	if (ioctl (cdrom->fd, CDROMREADTOCHDR, priv->tochdr) < 0) {
-@@ -880,7 +880,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
- 		return;
- 	}
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	priv->track0 = priv->tochdr->starting_track;
- 	priv->track1 = priv->tochdr->ending_track;
- #else
-@@ -893,8 +893,8 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
- 	priv->track_info =
- 	    g_malloc ((priv->number_tracks +
- 		       1) * sizeof (GstCdparanoiaCDRomTrackInfo));
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) {
- 		tocentry.track = j;
- 		tocentry.address_format = CD_MSF_FORMAT;
-@@ -906,7 +906,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
- 		tocentries.address_format = CD_MSF_FORMAT;
- #endif
- 
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 		if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
- #else
- 		if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) {
-@@ -916,7 +916,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
- 		}
- 
- 		priv->track_info[i].track = j;
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 		priv->track_info[i].audio_track =
- 		    tocentry.entry.control != CDROM_DATA_TRACK ? 1 : 0;
- 		ASSIGN_MSF (priv->track_info[i].address,
-@@ -943,8 +943,8 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
- 			    tocentry.cdte_addr.msf);
- #endif
- 	}
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	tocentry.track = CDROM_LEADOUT;
- 	tocentry.address_format = CD_MSF_FORMAT;
- 	if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) {
-@@ -957,7 +957,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
- 		gst_cdparanoia_cdrom_invalidate (lcd);
- 		return;
- 	}
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 	ASSIGN_MSF (priv->track_info[priv->number_tracks].address,
- 		    tocentry.entry.addr.msf);
- #else