5 files changed, 24 insertions, 22 deletions

diff --git a/misc/gnomeusersguide/Makefile b/misc/gnomeusersguide/Makefile
index c7608ee0d5c3..5a2444de2eee 100644
--- a/misc/gnomeusersguide/Makefile
+++ b/misc/gnomeusersguide/Makefile
@@ -21,7 +21,13 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
+		--datadir=${PREFIX}/share/gnome
+
+post-extract:
+	@${PERL} -pi -e 's|-lpthread|-pthread|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/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile
index 57efddb91aa9..e87071ccd9af 100644
--- a/misc/gnomeutils/Makefile
+++ b/misc/gnomeutils/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
 		gtop.1:${PORTSDIR}/devel/libgtop \
-		guile.6:${PORTSDIR}/lang/guile \
+		guile.9:${PORTSDIR}/lang/guile \
 		glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
 
@@ -31,4 +31,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
+post-extract:
+	@${PERL} -pi -e 's|-lpthread|-pthread|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/misc/gnomeutils/files/patch-aa b/misc/gnomeutils/files/patch-aa
index 149087c84669..6f97cad1373c 100644
--- a/misc/gnomeutils/files/patch-aa
+++ b/misc/gnomeutils/files/patch-aa
@@ -1,14 +1,5 @@
 --- configure.orig	Fri May 19 14:49:06 2000
 +++ configure	Tue May 30 13:31:24 2000
-@@ -5101,7 +5101,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -6350,17 +6350,13 @@
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index 57efddb91aa9..e87071ccd9af 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
 		gtop.1:${PORTSDIR}/devel/libgtop \
-		guile.6:${PORTSDIR}/lang/guile \
+		guile.9:${PORTSDIR}/lang/guile \
 		glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
 
@@ -31,4 +31,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
+post-extract:
+	@${PERL} -pi -e 's|-lpthread|-pthread|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/misc/gnomeutils2/files/patch-aa b/misc/gnomeutils2/files/patch-aa
index 149087c84669..6f97cad1373c 100644
--- a/misc/gnomeutils2/files/patch-aa
+++ b/misc/gnomeutils2/files/patch-aa
@@ -1,14 +1,5 @@
 --- configure.orig	Fri May 19 14:49:06 2000
 +++ configure	Tue May 30 13:31:24 2000
-@@ -5101,7 +5101,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -6350,17 +6350,13 @@
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6