update to 2.18.0

This moves this pkg to the new stable gnome branch, too much to list here.

5 files changed, 141 insertions, 65 deletions

diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index cc05d3dff48..fc07978a1bd 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2007/03/21 12:05:50 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2007/04/11 18:05:07 drochner Exp $
 
-DISTNAME=		gnome-media-2.16.1
-PKGREVISION=		2
+DISTNAME=		gnome-media-2.18.0
 CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.16/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo
index 5a91713b076..37c8917baa7 100644
--- a/multimedia/gnome2-media/distinfo
+++ b/multimedia/gnome2-media/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.16 2006/09/15 15:23:00 jmmv Exp $
+$NetBSD: distinfo,v 1.17 2007/04/11 18:05:07 drochner Exp $
 
-SHA1 (gnome-media-2.16.1.tar.bz2) = 2d48e2a04b22cc11e6d59f365d30df2011499adb
-RMD160 (gnome-media-2.16.1.tar.bz2) = a9bf63a7f225d5bf92e5d432149ba15d53209d64
-Size (gnome-media-2.16.1.tar.bz2) = 2973824 bytes
-SHA1 (patch-aa) = b003369a8295bf8b87300ed5b32003674d8e159c
-SHA1 (patch-ab) = d1d813b1b419a3388e972fc2b54efa707d6d3f52
+SHA1 (gnome-media-2.18.0.tar.bz2) = 954b4d5069e29d60f28f63d3e2b7cd654247948f
+RMD160 (gnome-media-2.18.0.tar.bz2) = 7968d0cd5c00b0b36cbdc9c6c0eb1e5a35936e5f
+Size (gnome-media-2.18.0.tar.bz2) = 3007639 bytes
+SHA1 (patch-aa) = 022c909690b5521a93e1ce0eab025eb4c1598181
+SHA1 (patch-ab) = 5b48beaf188f916cc9052b3c1ac2978258f73e0d
+SHA1 (patch-ac) = f720c2e252ab6576868f212cd51cd3cd4ef24d47
diff --git a/multimedia/gnome2-media/patches/patch-aa b/multimedia/gnome2-media/patches/patch-aa
index 229f107d998..eaf4d35ae26 100644
--- a/multimedia/gnome2-media/patches/patch-aa
+++ b/multimedia/gnome2-media/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2006/06/30 03:16:38 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2007/04/11 18:05:07 drochner Exp $
 
---- gnome-cd/bsd-cdrom.c.orig	2006-06-22 09:05:38.000000000 -0700
+--- 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;
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#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;
@@ -15,8 +15,8 @@ $NetBSD: patch-aa,v 1.6 2006/06/30 03:16:38 joerg Exp $
  
  	bsd_cdrom_invalidate (lcd);
  	priv->track_info = g_malloc ((priv->number_tracks + 1) * sizeof (BSDCDRomTrackInfo));
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#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;
@@ -24,8 +24,8 @@ $NetBSD: patch-aa,v 1.6 2006/06/30 03:16:38 joerg Exp $
  		tocentries.address_format = CD_MSF_FORMAT;
  #endif
  
--#ifdef __FreeBSD__
-+#ifdef __FreeBSD__) || defined(__DragonFly__)
+-#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) {
@@ -33,8 +33,8 @@ $NetBSD: patch-aa,v 1.6 2006/06/30 03:16:38 joerg Exp $
  		}
  
  		priv->track_info[i].track = j;
--#ifdef __FreeBSD__
-+#ifdef __FreeBSD__) || defined(__DragonFly__)
+-#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
@@ -42,8 +42,8 @@ $NetBSD: patch-aa,v 1.6 2006/06/30 03:16:38 joerg Exp $
  #endif
  	}
  
--#ifdef __FreeBSD__
-+#ifdef __FreeBSD__) || defined(__DragonFly__)
+-#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;
@@ -51,8 +51,8 @@ $NetBSD: patch-aa,v 1.6 2006/06/30 03:16:38 joerg Exp $
  		bsd_cdrom_invalidate (lcd);
  		return;
  	}
--#ifdef __FreeBSD__
-+#ifdef __FreeBSD__) || defined(__DragonFly__)
+-#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);
@@ -60,8 +60,8 @@ $NetBSD: patch-aa,v 1.6 2006/06/30 03:16:38 joerg Exp $
  		return FALSE;
  	}
  
--#ifdef __FreeBSD__
-+#ifdef __FreeBSD__) || defined(__DragonFly__)
+-#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);
@@ -69,8 +69,8 @@ $NetBSD: patch-aa,v 1.6 2006/06/30 03:16:38 joerg Exp $
  		return FALSE;
  	}
  #endif
--#ifdef __FreeBSD__
-+#ifdef __FreeBSD__) || defined(__DragonFly__)
+-#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/gnome2-media/patches/patch-ab b/multimedia/gnome2-media/patches/patch-ab
index 076134c7f3b..9168c1685fc 100644
--- a/multimedia/gnome2-media/patches/patch-ab
+++ b/multimedia/gnome2-media/patches/patch-ab
@@ -1,98 +1,98 @@
-$NetBSD: patch-ab,v 1.5 2006/06/30 03:16:38 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2007/04/11 18:05:07 drochner Exp $
 
---- gnome-cd/gst-cdrom.c.orig	2006-06-23 00:01:07.000000000 -0700
+--- gnome-cd/gst-cdrom.c.orig	2007-01-22 15:01:38.000000000 +0100
 +++ gnome-cd/gst-cdrom.c
-@@ -33,14 +33,14 @@
+@@ -36,14 +36,14 @@
  
  #ifdef __linux__
  #include <linux/cdrom.h>
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+-#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__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  #include <sys/cdrio.h>
  #endif
  
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#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__)
-@@ -844,7 +844,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+@@ -851,7 +851,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
  /*
  	GstCdparanoiaCDRom *lcd = GST_CDPARANOIA_CDROM (cdrom);
  	GstCdparanoiaCDRomPrivate *priv;
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#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;
-@@ -862,7 +862,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+@@ -869,7 +869,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
  		return;
  	}
  
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+-#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) {
-@@ -873,7 +873,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+@@ -880,7 +880,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
  		return;
  	}
  
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+-#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
-@@ -886,8 +886,8 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+@@ -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__)
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#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;
-@@ -899,7 +899,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+@@ -906,7 +906,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
  		tocentries.address_format = CD_MSF_FORMAT;
  #endif
  
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#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) {
-@@ -909,7 +909,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+@@ -916,7 +916,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
  		}
  
  		priv->track_info[i].track = j;
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#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,
-@@ -936,8 +936,8 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+@@ -943,8 +943,8 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
  			    tocentry.cdte_addr.msf);
  #endif
  	}
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#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) {
-@@ -950,7 +950,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
+@@ -957,7 +957,7 @@ gst_cdrom_update_cd (GnomeCDRom * gnome_
  		gst_cdparanoia_cdrom_invalidate (lcd);
  		return;
  	}
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#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
diff --git a/multimedia/gnome2-media/patches/patch-ac b/multimedia/gnome2-media/patches/patch-ac
new file mode 100644
index 00000000000..74ada37d4de
--- /dev/null
+++ b/multimedia/gnome2-media/patches/patch-ac
@@ -0,0 +1,76 @@
+$NetBSD: patch-ac,v 1.3 2007/04/11 18:05:07 drochner Exp $
+
+--- configure.orig	2007-04-05 20:11:16.000000000 +0200
++++ configure
+@@ -5808,7 +5808,7 @@ if test "${enable_cddbslave+set}" = set;
+ else
+   enable_cddbslave=yes
+ fi;
+-if test "x$enable_cddbslave" == "xyes"; then
++if test "x$enable_cddbslave" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for CDDBSLAVE" >&5
+@@ -6750,7 +6750,7 @@ if test "${enable_profiles+set}" = set; 
+ else
+   enable_profiles=yes
+ fi;
+-if test "x$enable_profiles" == "xyes"; then
++if test "x$enable_profiles" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for GMP" >&5
+@@ -6967,7 +6967,7 @@ echo "$as_me: WARNING:  Grecord will be 
+   PROGRAMS_GRECORD_ERROR="	gnome media profiles is disabled"
+ fi
+ 
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" == "xyes"; then
++if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" = "xyes"; then
+   PROGRAMS_GRECORD="grecord"
+ 
+   gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
+@@ -24186,7 +24186,7 @@ if test "${enable_vumeter+set}" = set; t
+ else
+   enable_vumeter=yes
+ fi;
+-if test -n "$we_have_esd" && test "x$enable_vumeter" == "xyes"; then
++if test -n "$we_have_esd" && test "x$enable_vumeter" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for VUMETER" >&5
+@@ -24304,7 +24304,7 @@ if test "${enable_gnomecd+set}" = set; t
+ else
+   enable_gnomecd=yes
+ fi;
+-if test "x$enable_gnomecd" == "xyes"; then
++if test "x$enable_gnomecd" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for GNOMECD" >&5
+@@ -24640,7 +24640,7 @@ fi
+ 
+ 
+ 
+-if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" == "xyes" ; then
++if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" = "xyes" ; then
+   cdrom_header=""
+ 
+ for ac_header in linux/cdrom.h
+@@ -25510,7 +25510,7 @@ if test "${enable_gstprops+set}" = set; 
+ else
+   enable_gstprops=yes
+ fi;
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" == "xyes";
++if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" = "xyes";
+ then
+       COMMON_MODULES="gconf-2.0 libgnomeui-2.0 libglade-2.0 >= 1.99.12 gstreamer-$GST_MAJORMINOR"
+ 
+@@ -25673,7 +25673,7 @@ if test "${enable_gstmix+set}" = set; th
+ else
+   enable_gstmix=yes
+ fi;
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" == "xyes";
++if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" = "xyes";
+ then
+ 
+ pkg_failed=no