7 files changed, 28 insertions, 90 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 7eeb0111b18d..d32b2c82c54d 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.6.2
-PORTREVISION=	6
+PORTVERSION=	2.8.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.8
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -29,6 +28,9 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier gnomedesktop \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	CDDB-Slave2.schemas gnome-audio-profiles.schemas \
+		gnome-cd.schemas gnome-sound-recorder.schemas
+
 .include <bsd.port.pre.mk>
 
 post-patch:
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index e7537e8abaa2..57f2938ee07f 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-media-2.6.2.tar.bz2) = 1eb2d95f29ae908a6fd3c5295e3d740d
-SIZE (gnome2/gnome-media-2.6.2.tar.bz2) = 2970530
+MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1
+SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171
diff --git a/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h b/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h
new file mode 100644
index 000000000000..1ec1fc50f5d5
--- /dev/null
+++ b/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h
@@ -0,0 +1,11 @@
+--- cddb-slave2/gnet-private.h.orig	Tue Aug 31 19:58:18 2004
++++ cddb-slave2/gnet-private.h	Tue Aug 31 20:02:23 2004
+@@ -68,7 +68,7 @@
+ #include <resolv.h>
+ #include <netdb.h>
+ 
+-#ifndef __socklen_t_defined
++#if !defined(__socklen_t_defined) && !defined(__FreeBSD__)
+ typedef guint32 socklen_t;
+ #endif
+ 
diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure
index 2c6ea537ce3a..e2224d9308de 100644
--- a/audio/gnome-media/files/patch-configure
+++ b/audio/gnome-media/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Wed Dec 31 00:49:17 2003
-+++ configure	Wed Dec 31 00:49:57 2003
-@@ -23190,7 +23190,7 @@
+--- configure.orig	Tue Jun  1 17:42:05 2004
++++ configure	Tue Jun  1 18:38:15 2004
+@@ -24584,7 +24584,7 @@
  *FreeBSD*)
- 	CDROM_HOST=freebsd
- 	CDROM_HOST_FREEBSD=true
+ 	CDROM_HOST=bsd
+ 	CDROM_HOST_BSD=true
 -	default_cd_device="/dev/acd0c"
 +	default_cd_device="/dev/%%CDROM%%"
  	;;
- *Linux*)
- 	CDROM_HOST=linux
+ *NetBSD*)
+ 	CDROM_HOST=bsd
diff --git a/audio/gnome-media/files/patch-gnome-cd_cddb.c b/audio/gnome-media/files/patch-gnome-cd_cddb.c
deleted file mode 100644
index 45422866cac8..000000000000
--- a/audio/gnome-media/files/patch-gnome-cd_cddb.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gnome-cd/cddb.c.orig	Sun May  9 11:19:57 2004
-+++ gnome-cd/cddb.c	Sun Aug 22 16:18:18 2004
-@@ -197,7 +197,6 @@
- 	}
- 
- 	info = g_hash_table_lookup (cddb_cache, discid);
--	g_free (discid);
- 
- 	if (info != NULL) {
- 		gcd->disc_info = info;
-@@ -228,6 +227,8 @@
- 				 data->nsecs, "GnomeCD", VERSION);
- 	
- 	gnome_cdrom_free_cddb_data (data);
-+	g_free (discid);
-+	g_free (offsets);
- }
- 
- int
diff --git a/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c
deleted file mode 100644
index 47ce9e0aa32b..000000000000
--- a/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- gnome-cd/freebsd-cdrom.c.orig	Mon Jan  5 23:12:49 2004
-+++ gnome-cd/freebsd-cdrom.c	Sun Aug 22 01:06:01 2004
-@@ -896,6 +896,8 @@
- 
- 	ASSIGN_MSF (realstatus->relative, blank_msf);
- 	ASSIGN_MSF (realstatus->absolute, blank_msf);
-+	ASSIGN_MSF (realstatus->length, blank_msf);
-+
- 	realstatus->track = 1;
- 	switch (subchnl.data->header.audio_status) {
- 	case CD_AS_PLAY_IN_PROGRESS:
-@@ -903,6 +905,11 @@
- 		ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf);
- 		ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf);
- 		realstatus->track = subchnl.data->what.position.track_number;
-+		if(priv && realstatus->track>0 &&
-+		   realstatus->track<=priv->number_tracks){
-+			/* track_info may not be initialized */
-+			ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length);
-+		}
- 		break;
- 
- 	case CD_AS_PLAY_PAUSED:
-@@ -910,6 +917,11 @@
- 		ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf);
- 		ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf);
- 		realstatus->track = subchnl.data->what.position.track_number;
-+		if(priv && realstatus->track>0 &&
-+		   realstatus->track<=priv->number_tracks){
-+			/* track_info may not be initialized */
-+			ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length);
-+		}
- 		break;
- 
- 	case CD_AS_PLAY_COMPLETED:
-@@ -917,6 +929,11 @@
- 		ASSIGN_MSF (realstatus->relative, subchnl.data->what.position.reladdr.msf);
- 		ASSIGN_MSF (realstatus->absolute, subchnl.data->what.position.absaddr.msf);
- 		realstatus->track = subchnl.data->what.position.track_number;
-+		if(priv && realstatus->track>0 &&
-+		   realstatus->track<=priv->number_tracks){
-+			/* track_info may not be initialized */
-+			ASSIGN_MSF (realstatus->length, priv->track_info[realstatus->track-1].length);
-+		}
- 		break;
- 
- 	case CD_AS_AUDIO_INVALID:
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 4b4de1a7d70a..df50a2c387c1 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -5,18 +5,6 @@ bin/gnome-sound-recorder
 bin/gnome-volume-control
 bin/gstreamer-properties
 bin/vumeter
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/CDDB-Slave2.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/CDDB-Slave2.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/CDDB-Slave2.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-audio-profiles.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-audio-profiles.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-audio-profiles.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-cd.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-cd.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-cd.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-sound-recorder.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-sound-recorder.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-sound-recorder.schemas > /dev/null || /usr/bin/true
 include/cddb-slave2/cddb-slave-client.h
 include/gnome-media/profiles/audio-profile-choose.h
 include/gnome-media/profiles/audio-profile-edit.h
@@ -435,6 +423,7 @@ share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
@@ -466,6 +455,7 @@ share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-media-2.0.mo
@@ -483,6 +473,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/tk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo