Update to 2.4.1.

6 files changed, 14 insertions, 30 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 94eccef513e1..892ba14f9eef 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.4
@@ -25,9 +24,14 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop gail
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
+		${WRKSRC}/gnome-cd/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index aa956f748927..474385c6411c 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-2.4.0.tar.bz2) = aa5d6a04049ea7552086a6bea47bf375
+MD5 (gnome2/gnome-media-2.4.1.tar.bz2) = 0358911368dd468e30537a2a426513cf
diff --git a/audio/gnome-media/files/patch-cdda-slave2_cddb-slave-capplet.c b/audio/gnome-media/files/patch-cdda-slave2_cddb-slave-capplet.c
deleted file mode 100644
index 36a29281996b..000000000000
--- a/audio/gnome-media/files/patch-cdda-slave2_cddb-slave-capplet.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- cddb-slave2/cddb-slave-capplet.c.orig	Tue Aug  5 08:38:21 2003
-+++ cddb-slave2/cddb-slave-capplet.c	Sat Sep 27 23:20:31 2003
-@@ -838,9 +838,6 @@
- 	
- 	gtk_container_add (GTK_CONTAINER (sw), pd->freedb_server);
- 
--	g_signal_connect (G_OBJECT (pd->update), "clicked",
--			  G_CALLBACK (update_clicked), pd);
--
- 	/* create the update server list button */
- 	align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
- 
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 94eccef513e1..892ba14f9eef 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomemedia2
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.4
@@ -25,9 +24,14 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop gail
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
+		${WRKSRC}/gnome-cd/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index aa956f748927..474385c6411c 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-2.4.0.tar.bz2) = aa5d6a04049ea7552086a6bea47bf375
+MD5 (gnome2/gnome-media-2.4.1.tar.bz2) = 0358911368dd468e30537a2a426513cf
diff --git a/audio/gnomemedia2/files/patch-cdda-slave2_cddb-slave-capplet.c b/audio/gnomemedia2/files/patch-cdda-slave2_cddb-slave-capplet.c
deleted file mode 100644
index 36a29281996b..000000000000
--- a/audio/gnomemedia2/files/patch-cdda-slave2_cddb-slave-capplet.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- cddb-slave2/cddb-slave-capplet.c.orig	Tue Aug  5 08:38:21 2003
-+++ cddb-slave2/cddb-slave-capplet.c	Sat Sep 27 23:20:31 2003
-@@ -838,9 +838,6 @@
- 	
- 	gtk_container_add (GTK_CONTAINER (sw), pd->freedb_server);
- 
--	g_signal_connect (G_OBJECT (pd->update), "clicked",
--			  G_CALLBACK (update_clicked), pd);
--
- 	/* create the update server list button */
- 	align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-