Update to 2.0.3.

6 files changed, 11 insertions, 15 deletions

diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index 6722bd1f7a9b..b7e3209ac8fa 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eel2
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME:S/2$//}
diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo
index 11f7c7508909..f4cfa6b25633 100644
--- a/x11-toolkits/eel2/distinfo
+++ b/x11-toolkits/eel2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eel-2.0.2.tar.bz2) = 1ca31507cf27c2ee0dd762101ca66668
+MD5 (gnome2/eel-2.0.3.tar.bz2) = 570f9184ff5286fd0ac924f368354396
diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist
index ce96d0c2d6a2..3644ae565b5d 100644
--- a/x11-toolkits/eel2/pkg-plist
+++ b/x11-toolkits/eel2/pkg-plist
@@ -89,6 +89,7 @@ share/locale/ro/LC_MESSAGES/eel-2.0.mo
 share/locale/ru/LC_MESSAGES/eel-2.0.mo
 share/locale/sk/LC_MESSAGES/eel-2.0.mo
 share/locale/sl/LC_MESSAGES/eel-2.0.mo
+share/locale/sq/LC_MESSAGES/eel-2.0.mo
 share/locale/sv/LC_MESSAGES/eel-2.0.mo
 share/locale/ta/LC_MESSAGES/eel-2.0.mo
 share/locale/tr/LC_MESSAGES/eel-2.0.mo
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 75f0c054b8e1..98105e4bf511 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/${PORTNAME}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,22 +21,17 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_BISON=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-html-dir=${PREFIX}/share/doc \
-		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 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[)]/locale|(prefix)/share/locale|g ; \
-		 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 71ed8a96843e..20d2de404704 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-2.0.1.tar.bz2) = 4ad5d0f3a06f283bd9ef0a7ebd3ce952
+MD5 (gnome2/libgnomeui-2.0.3.tar.bz2) = 42a71b6fd6731c6d7fc88beb0cf65c16
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 7f4ee902c32b..eff1f8925cf5 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -1,4 +1,3 @@
-bin/gnome_segv2
 include/libgnomeui-2.0/gnome.h
 include/libgnomeui-2.0/libgnomeui/gnome-about.h
 include/libgnomeui-2.0/libgnomeui/gnome-app-helper.h
@@ -47,6 +46,7 @@ lib/libgnomeui-2.a
 lib/libgnomeui-2.so
 lib/libgnomeui-2.so.0
 libdata/pkgconfig/libgnomeui-2.0.pc
+libexec/gnome_segv2
 share/doc/libgnomeui/c4.html
 share/doc/libgnomeui/gnomeabout.html
 share/doc/libgnomeui/gnomeapp.html
@@ -104,6 +104,7 @@ share/gnome/pixmaps/gnome-info.png
 share/gnome/pixmaps/gnome-question.png
 share/gnome/pixmaps/gnome-warning.png
 share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
@@ -138,4 +139,3 @@ share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
-@unexec /bin/rmdir %D/share/gnome/pixmaps 2>/dev/null || /usr/bin/true