4 files changed, 20 insertions, 36 deletions

diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index d644bb798a01..74984aba434e 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS+=	gnet-config:${PORTSDIR}/net/gnet
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack libglade libpanel gdkpixbuf
 GNU_CONFIGURE=	yes
 USE_GMAKE=		yes
 .if defined(WITH_DANTE)
@@ -44,11 +45,8 @@ CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-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>
diff --git a/net-im/gnomeicu/files/patch-po::Makefile.in.in b/net-im/gnomeicu/files/patch-po::Makefile.in.in
index eb27fe3afb48..62a7c83e66ea 100644
--- a/net-im/gnomeicu/files/patch-po::Makefile.in.in
+++ b/net-im/gnomeicu/files/patch-po::Makefile.in.in
@@ -1,20 +1,14 @@
---- po/Makefile.in.in.orig	Sun Dec 23 17:47:08 2001
-+++ po/Makefile.in.in	Fri Dec 28 15:46:57 2001
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2002/07/20 11:41:22	1.1
++++ po/Makefile.in.in	2002/07/20 11:41:34
 @@ -106,7 +106,7 @@
  	@catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
 -	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed -E 's/\.g?mo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
  	  dir=$(localedir)/$$lang/LC_MESSAGES; \
  	  $(mkinstalldirs) $(DESTDIR)$$dir; \
  	  if test -r $$cat; then \
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index d644bb798a01..74984aba434e 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS+=	gnet-config:${PORTSDIR}/net/gnet
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack libglade libpanel gdkpixbuf
 GNU_CONFIGURE=	yes
 USE_GMAKE=		yes
 .if defined(WITH_DANTE)
@@ -44,11 +45,8 @@ CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-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>
diff --git a/net-im/gnomeicu2/files/patch-po::Makefile.in.in b/net-im/gnomeicu2/files/patch-po::Makefile.in.in
index eb27fe3afb48..62a7c83e66ea 100644
--- a/net-im/gnomeicu2/files/patch-po::Makefile.in.in
+++ b/net-im/gnomeicu2/files/patch-po::Makefile.in.in
@@ -1,20 +1,14 @@
---- po/Makefile.in.in.orig	Sun Dec 23 17:47:08 2001
-+++ po/Makefile.in.in	Fri Dec 28 15:46:57 2001
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2002/07/20 11:41:22	1.1
++++ po/Makefile.in.in	2002/07/20 11:41:34
 @@ -106,7 +106,7 @@
  	@catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
 -	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed -E 's/\.g?mo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
  	  dir=$(localedir)/$$lang/LC_MESSAGES; \
  	  $(mkinstalldirs) $(DESTDIR)$$dir; \
  	  if test -r $$cat; then \