4 files changed, 8 insertions, 25 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 3399d915fbd2..f6f8db416198 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.1/sources/gnome-media
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -26,18 +25,14 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index faeb4dfceccb..8e4dad05ad49 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-2.0.0.tar.bz2) = 814f7fcbcf72b5b2408477ef01e62ee7
+MD5 (gnome2/gnome-media-2.0.2.tar.bz2) = 206a5dfd984aa38719d01316f61476bd
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 365074327769..000000000000
--- a/audio/gnome-media/files/patch-gnome-cd_freebsd-cdrom.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-cd/freebsd-cdrom.c.orig	Tue Jun 11 15:43:37 2002
-+++ gnome-cd/freebsd-cdrom.c	Tue Jun 11 15:43:55 2002
-@@ -75,7 +75,7 @@
- static void
- freebsd_cdrom_finalize (GObject *object)
- {
--	FreeBSDCDrom *cdrom = (FreeBSDCDrom *) object;
-+	FreeBSDCDRom *cdrom = (FreeBSDCDRom *) object;
- 
- 	g_free (cdrom->priv);
- 
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 6b53ab5ea8c0..1947c246eaa4 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -1,6 +1,4 @@
-bin/CDDBSlave2
 bin/cddb-slave2-properties
-bin/cddb-track-editor
 bin/gnome-cd
 bin/gnome-sound-recorder
 bin/gnome-volume-control
@@ -22,6 +20,8 @@ lib/libcddb-slave2.a
 lib/libcddb-slave2.so
 lib/libcddb-slave2.so.0
 libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
+libexec/CDDBSlave2
+libexec/cddb-track-editor
 share/gnome/applications/gnome-cd.desktop
 share/gnome/applications/gnome-sound-recorder.desktop
 share/gnome/applications/gnome-volume-control.desktop
@@ -233,7 +233,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
 @dirrm share/gnome/pixmaps/gnome-cd/themes
 @dirrm share/gnome/pixmaps/gnome-cd
-@dirrm share/gnome/omf/gnome-media
 @dirrm share/gnome/help/grecord/C/figures
 @dirrm share/gnome/help/grecord/C
 @dirrm share/gnome/help/grecord