5 files changed, 14 insertions, 75 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 5a0e07959981..9834f8e5f892 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.79 2005/09/04 21:49:55 marcus Exp $
+#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.95 2006/04/13 07:52:30 bland Exp $
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.12.0
-PORTREVISION=	1
+PORTVERSION=	2.14.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.12
+MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,16 +18,16 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the GNOME 2 desktop
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
 		gail nautiluscdburner
-USE_GSTREAMER=	esound cdparanoia gconf
+USE_GSTREAMER=	esound gconf good
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -42,9 +41,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
 		${WRKSRC}/gnome-cd/Makefile.in
 .if ${OSVERSION} > 501107
-	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0|' ${WRKSRC}/configure
-.else
-	@${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|acd0c|acd0|' ${WRKSRC}/configure
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index c1d48b7bf36d..595a5ad12fa6 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.12.0.tar.bz2) = 74d9a78f7269602e033ab1a4a144afdf
-SHA256 (gnome2/gnome-media-2.12.0.tar.bz2) = 47956491973b0ace77e22f93f4141fd5a49c294f68f427e00fb4df8c1dc542ad
-SIZE (gnome2/gnome-media-2.12.0.tar.bz2) = 3444233
+MD5 (gnome2/gnome-media-2.14.0.tar.bz2) = e1304b3fb5e069025bb2c1ea3f9f8b62
+SHA256 (gnome2/gnome-media-2.14.0.tar.bz2) = f43324636c0ee8b7485a9a5d2baf8e3fb5db0cc87c55afdb350774dfafc8b280
+SIZE (gnome2/gnome-media-2.14.0.tar.bz2) = 2933013
diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure
deleted file mode 100644
index e2224d9308de..000000000000
--- a/audio/gnome-media/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Jun  1 17:42:05 2004
-+++ configure	Tue Jun  1 18:38:15 2004
-@@ -24584,7 +24584,7 @@
- *FreeBSD*)
- 	CDROM_HOST=bsd
- 	CDROM_HOST_BSD=true
--	default_cd_device="/dev/acd0c"
-+	default_cd_device="/dev/%%CDROM%%"
- 	;;
- *NetBSD*)
- 	CDROM_HOST=bsd
diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
deleted file mode 100644
index 8d49db7bc871..000000000000
--- a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- gnome-cd/gst-cdparanoia-cdrom.c.orig	Mon Apr  4 16:25:49 2005
-+++ gnome-cd/gst-cdparanoia-cdrom.c	Mon Apr  4 16:26:14 2005
-@@ -1224,6 +1224,16 @@
- 		*status = NULL;
- 		return FALSE;
- 	}
-+#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;
-+
-+		gst_cdparanoia_cdrom_close (lcd);
-+		return TRUE;
-+	}
-+	realstatus->cd = GNOME_CDROM_STATUS_OK;
- #endif
- 
- 	gst_cdparanoia_cdrom_close (lcd);
-@@ -1421,15 +1431,18 @@
- 		return FALSE;
- 	}
- 
-+#if !defined(__FreeBSD__)
-+	/* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM
-+	 * device.
-+	 */
-+
- 	fd = open (device, O_RDONLY | O_NONBLOCK);
- 	if (fd < 0) {
- 		return FALSE;
- 	}
- 
- 	/* Fire a harmless ioctl at the device. */
--#if defined(__FreeBSD__)
--	if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) {
--#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- 	if (ioctl (fd, CDIOCGETVOL, 0) < 0) {
- #else
- 	if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) {
-@@ -1441,6 +1454,7 @@
- 	}
- 
- 	close (fd);
-+#endif /* __FreeBSD__ */
- 
- 	return TRUE;
- }
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index e531ad4428e7..a52495291e52 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -472,6 +472,7 @@ share/locale/id/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ku/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
@@ -505,6 +506,7 @@ share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes/media
@@ -524,8 +526,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/help/grecord/zh_CN
 @dirrm share/gnome/help/grecord/sv/figures
 @dirrm share/gnome/help/grecord/sv
-@dirrm share/gnome/help/gnome-cd/nl/figures
-@dirrm share/gnome/help/gnome-cd/nl
 @dirrm share/gnome/help/grecord/ko/figures
 @dirrm share/gnome/help/grecord/ko
 @dirrm share/gnome/help/grecord/ja/figures
@@ -557,6 +557,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/help/gnome-cd/uk
 @dirrm share/gnome/help/gnome-cd/sv/figures
 @dirrm share/gnome/help/gnome-cd/sv
+@dirrm share/gnome/help/gnome-cd/nl/figures
+@dirrm share/gnome/help/gnome-cd/nl
 @dirrm share/gnome/help/gnome-cd/ko/figures
 @dirrm share/gnome/help/gnome-cd/ko
 @dirrm share/gnome/help/gnome-cd/ja/figures