Remove configure substitutions that have been rolled into the gnomehack USE_GNOME

macro.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@834 df743ca5-7f9a-e211-a948-0013205c9059

59 files changed, 9 insertions, 211 deletions

diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index aa0db7fae..b319d2e7b 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -25,8 +25,4 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index ee57b5753..34d380409 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -39,8 +39,4 @@ RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
 pre-build:
 	@cd ${WRKSRC}/gnome-speech && ${GMAKE} clean
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/accessibility/gnomemag/Makefile b/accessibility/gnomemag/Makefile
index aa0db7fae..b319d2e7b 100644
--- a/accessibility/gnomemag/Makefile
+++ b/accessibility/gnomemag/Makefile
@@ -25,8 +25,4 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/accessibility/gnomespeech/Makefile b/accessibility/gnomespeech/Makefile
index ee57b5753..34d380409 100644
--- a/accessibility/gnomespeech/Makefile
+++ b/accessibility/gnomespeech/Makefile
@@ -39,8 +39,4 @@ RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
 pre-build:
 	@cd ${WRKSRC}/gnome-speech && ${GMAKE} clean
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index b5eb0978d..acfc47bdc 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -27,8 +27,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index d87fb34f0..d1efdf420 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -41,10 +41,6 @@ RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
 RUN_DEPENDS+=	bzip:${PORTSDIR}/archivers/bzip
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index d87fb34f0..d1efdf420 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -41,10 +41,6 @@ RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
 RUN_DEPENDS+=	bzip:${PORTSDIR}/archivers/bzip
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 710185188..fd25671d9 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -29,8 +29,4 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop gail
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 710185188..fd25671d9 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -29,8 +29,4 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop gail
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index b66d4fec2..5a4bd87c1 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -29,8 +29,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=	gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index b66d4fec2..5a4bd87c1 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -29,8 +29,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=	gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 4f43c5dba..6b4578463 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -28,8 +28,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=	bug-buddy.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 5c32e3df3..8552870f0 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -28,10 +28,6 @@ CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 post-install:
 	@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/apps
 	@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/schemas/apps
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 474f0f564..55485df82 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -48,7 +48,6 @@ LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 474f0f564..55485df82 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -48,7 +48,6 @@ LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index b20536136..2559f33fa 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -32,8 +32,4 @@ MAKE_ENV=	gnomelocaledir=${PREFIX}/share/locale
 
 MAN1=		bonobo-activation-server.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index aa48ca641..f466da950 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -27,8 +27,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|GETTEXT_PACKAGE=gedit-2.0|GETTEXT_PACKAGE=gedit-plugins|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|GETTEXT_PACKAGE=gedit-2.0|GETTEXT_PACKAGE=gedit-plugins|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index b82aa5fad..d2296d3b5 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -33,8 +33,4 @@ PLIST_SUB=	VERSION="2.4"
 
 MAN1=		gedit.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index 03937e27b..0dccaa63e 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -26,8 +26,4 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index 8985f8cc3..37f24508b 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -26,8 +26,4 @@ USE_GNOME=      gnomehack gnomeprefix libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 743c8b630..fb5e61126 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -29,8 +29,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 743c8b630..fb5e61126 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -29,8 +29,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 29b697357..cecd4c4f5 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -31,8 +31,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 LIB_DEPENDS+=	exif.8:${PORTSDIR}/graphics/libexif
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index c3a552ec6..f00e7771d 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -24,8 +24,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 	
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index ed5c40238..8cc71715a 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -30,8 +30,4 @@ CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 10ac86d33..9c97e009a 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -54,8 +54,4 @@ pre-everything::
 	@${ECHO_MSG} "	WITH_GIMP=yes	Build an svg plugin for gimp-devel (default: auto)"
 	@${ECHO_MSG} ""
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index 631d440f4..23dbf05d7 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -29,8 +29,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=	gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/multimedia/acme/Makefile b/multimedia/acme/Makefile
index 05ca41b65..ae609ef8b 100644
--- a/multimedia/acme/Makefile
+++ b/multimedia/acme/Makefile
@@ -26,8 +26,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/acme.c
 
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index 11f4d75df..03e153d84 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -24,8 +24,4 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 2a171a35a..ae09cd307 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -30,8 +30,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 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|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
 
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index c94bf36b9..cbcff125a 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -27,8 +27,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 2a171a35a..ae09cd307 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -30,8 +30,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 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|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
 
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index c94bf36b9..cbcff125a 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -27,8 +27,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 3c0b466d4..a70ffcc33 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -28,8 +28,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index b8d17cc1b..5999b1d80 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -25,8 +25,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index b242c31fc..6956296cf 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -36,10 +36,6 @@ CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 		--enable-static
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 post-install:
 	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
 
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index b242c31fc..6956296cf 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -36,10 +36,6 @@ CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 		--enable-static
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 post-install:
 	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
 
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index 0b97a7260..ea15024a7 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -29,8 +29,4 @@ CONFIGURE_ARGS=	--enable-shared --enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 633ba3abc..db2a781e3 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -31,8 +31,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 2011e341e..70c4f4d88 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -47,8 +47,6 @@ MAN1=		gdk-pixbuf-csource.1
 post-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
 		xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index d25f46713..2efd04735 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -28,8 +28,4 @@ USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 226fe7446..ab0b4feca 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -31,8 +31,4 @@ USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index cf1d9371b..09dafd882 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -28,8 +28,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 1b5efd79b..343666667 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -28,8 +28,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 CONFIGURE_ARGS=	--disable-python
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' \
 		${WRKSRC}/gnome-pty-helper/gnome-pty-helper.c
 
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index f9cfadaa3..e0c6b6478 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -29,8 +29,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index ce21fc6ed..083a55425 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -36,8 +36,4 @@ PLIST_SUB=      BATTERY="@comment "
 PLIST_SUB=      BATTERY=""
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 57f6d6ec1..d8c81106f 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -32,8 +32,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=	gnome-about.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|GNOME_DISTRIBUTOR=.*$$|GNOME_DISTRIBUTOR="FreeBSD GNOME Project"| ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		 's|GNOME_DISTRIBUTOR=.*$$|GNOME_DISTRIBUTOR="FreeBSD GNOME Project"|' \
+		 ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 88a8e8731..7c1c6528e 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -31,8 +31,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 MAN1=	gnome-panel.1 gnome-panel-preferences.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 1a43ad967..ffc57313d 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -29,8 +29,4 @@ MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
 	gnome-session-save.1
 MAN5=	default.session.5
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 3e358b1f1..4ccefd5c9 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -25,8 +25,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index ce21fc6ed..083a55425 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -36,8 +36,4 @@ PLIST_SUB=      BATTERY="@comment "
 PLIST_SUB=      BATTERY=""
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 57f6d6ec1..d8c81106f 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -32,8 +32,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=	gnome-about.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|GNOME_DISTRIBUTOR=.*$$|GNOME_DISTRIBUTOR="FreeBSD GNOME Project"| ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		 's|GNOME_DISTRIBUTOR=.*$$|GNOME_DISTRIBUTOR="FreeBSD GNOME Project"|' \
+		 ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 88a8e8731..7c1c6528e 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -31,8 +31,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 MAN1=	gnome-panel.1 gnome-panel-preferences.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 1a43ad967..ffc57313d 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -29,8 +29,4 @@ MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
 	gnome-session-save.1
 MAN5=	default.session.5
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 3e358b1f1..4ccefd5c9 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -25,8 +25,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/gswitchit/Makefile b/x11/gswitchit/Makefile
index 5930c8835..1656f7bf4 100644
--- a/x11/gswitchit/Makefile
+++ b/x11/gswitchit/Makefile
@@ -24,8 +24,4 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 2b3d68360..533536896 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -33,8 +33,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 32b497349..1f313d11e 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -24,8 +24,4 @@ CONFIGURE_ARGS=	--disable-doxygen
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 5e6458d21..f45811300 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -27,8 +27,6 @@ CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|\@prefix\@/share|\@datadir\@|g' \
 		${WRKSRC}/stylesheets/docbook/catalog.in