5 files changed, 11 insertions, 28 deletions

diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index 9dbf216431af..78df6d10f929 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -14,21 +14,16 @@ DISTNAME=	gnome-iconedit-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack bonobo gnomeprint
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-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|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/gnomeiconedit/files/patch-ab b/graphics/gnomeiconedit/files/patch-ab
deleted file mode 100644
index 31c7139b0073..000000000000
--- a/graphics/gnomeiconedit/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Sat Jan 22 11:35:29 2000
-+++ po/Makefile.in.in	Fri Jan 28 16:08:48 2000
-@@ -18,7 +18,7 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
diff --git a/graphics/gnomeiconedit/files/patch-src::Makefile.in b/graphics/gnomeiconedit/files/patch-src::Makefile.in
index c0e2e07a4997..98b99558f1b5 100644
--- a/graphics/gnomeiconedit/files/patch-src::Makefile.in
+++ b/graphics/gnomeiconedit/files/patch-src::Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/Makefile.in	2001/12/19 10:47:52	1.1
-+++ src/Makefile.in	2001/12/19 10:54:53
+--- src/Makefile.in.orig	Mon Aug  5 00:12:19 2002
++++ src/Makefile.in	Mon Aug  5 00:13:01 2002
 @@ -118,7 +118,7 @@
  
  bin_PROGRAMS = gnome-iconedit $(COMPONENT)
  
 -INCLUDES =   -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
-+INCLUDES =   $(GDK_PIXBUF_CFLAGS)	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
++INCLUDES =   $(GDK_PIXBUF_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
  
  
  CORBA_GENERATED =  	Iconedit.h			Iconedit-stubs.c		Iconedit-skels.c		Iconedit-common.c	
diff --git a/graphics/gnomeiconedit/pkg-plist b/graphics/gnomeiconedit/pkg-plist
index d9b8ed76c1da..e05764d0b20f 100644
--- a/graphics/gnomeiconedit/pkg-plist
+++ b/graphics/gnomeiconedit/pkg-plist
@@ -23,6 +23,7 @@ share/locale/de/LC_MESSAGES/gnome-iconedit.mo
 share/locale/en_GB/LC_MESSAGES/gnome-iconedit.mo
 share/locale/fr/LC_MESSAGES/gnome-iconedit.mo
 share/locale/ko/LC_MESSAGES/gnome-iconedit.mo
+share/locale/ru/LC_MESSAGES/gnome-iconedit.mo
 share/locale/sv/LC_MESSAGES/gnome-iconedit.mo
 share/locale/tr/LC_MESSAGES/gnome-iconedit.mo
 share/locale/wa/LC_MESSAGES/gnome-iconedit.mo
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index a6f0a1852224..6fa991d76c08 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -14,16 +14,14 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gdkpixbuf gnomeprint
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+	@${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|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>