Update to GNOME 2.0 RC2.

6 files changed, 13 insertions, 12 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index c5c5bce84e0d..d5c25d37c53e 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	eog2
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DISTNAME=	eog-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,6 +21,7 @@ LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
@@ -30,11 +31,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@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/graphics/eog2/distinfo b/graphics/eog2/distinfo
index a14269401fa8..a097bb17acd3 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eog-1.0.0.tar.bz2) = bda45849d387b28afc3106bbe6ece5ca
+MD5 (gnome2/eog-1.0.1.tar.bz2) = 0870d7a21aa33bc6c959ec8a83d0e003
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 1bd18926250d..a5dea57150df 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libart_lgpl2
 PORTVERSION=	2.3.8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 1bd18926250d..a5dea57150df 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libart_lgpl2
 PORTVERSION=	2.3.8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 661710bbe8cd..f7548057fac6 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libgnomecanvas
 PORTVERSION=	2.0.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 59c0a25a08f4..e7a40cfc65bb 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	librsvg2
 PORTVERSION=	1.1.6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc2
 DIST_SUBDIR=	gnome2
 DISTNAME=	librsvg-${PORTVERSION}