Extensive patchfile cleanups using sobomax's wonderful

post-extract rule

6 files changed, 28 insertions, 80 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 66bd11e69dab..1c6e705d9d95 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -32,4 +32,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=		gedit.1
 
+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/editors/gedit/files/patch-ao b/editors/gedit/files/patch-ao
index ee22ad354593..fc344883c147 100644
--- a/editors/gedit/files/patch-ao
+++ b/editors/gedit/files/patch-ao
@@ -1,10 +1,5 @@
 --- plugins/browse/Makefile.in.orig	Sun Jun 11 03:00:15 2000
 +++ plugins/browse/Makefile.in	Sun Jun 11 11:15:17 2000
-@@ -128,3 +128,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -138,3 +138,3 @@
  LIBS = @LIBS@
 -libbrowse_la_LDFLAGS = 
@@ -12,11 +7,6 @@
  libbrowse_la_LIBADD = 
 --- plugins/convert/Makefile.in.orig	Sun Jun 11 03:00:17 2000
 +++ plugins/convert/Makefile.in	Sun Jun 11 11:15:25 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -147,3 +147,3 @@
  LIBS = @LIBS@
 -libconvert_la_LDFLAGS = 
@@ -24,11 +14,6 @@
  libconvert_la_LIBADD = 
 --- plugins/diff/Makefile.in.orig	Sun Jul  9 17:12:13 2000
 +++ plugins/diff/Makefile.in	Mon Jul 10 09:32:42 2000
-@@ -128,3 +128,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -144,3 +144,3 @@
  LIBS = @LIBS@
 -libdiff_la_LDFLAGS = 
@@ -36,11 +21,6 @@
  libdiff_la_LIBADD = 
 --- plugins/email/Makefile.in.orig	Sun Jun 11 03:00:16 2000
 +++ plugins/email/Makefile.in	Sun Jun 11 11:15:33 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -147,3 +147,3 @@
  LIBS = @LIBS@
 -libemail_la_LDFLAGS = 
@@ -48,11 +28,6 @@
  libemail_la_LIBADD = 
 --- plugins/reverse/Makefile.in.orig	Sun Jun 11 03:00:18 2000
 +++ plugins/reverse/Makefile.in	Sun Jun 11 11:15:40 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES = -I$(top_srcdir)/src 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
-+INCLUDES = -I$(top_srcdir)/src 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
- 
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
 -libreverse_la_LDFLAGS = 
@@ -60,11 +35,6 @@
  libreverse_la_LIBADD = 
 --- plugins/sample/Makefile.in.orig	Sun Jul  9 17:12:15 2000
 +++ plugins/sample/Makefile.in	Mon Jul 10 09:33:18 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src 					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src 					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
 -libsample_la_LDFLAGS = 
@@ -72,11 +42,6 @@
  libsample_la_LIBADD = 
 --- plugins/shell_output/Makefile.in.orig	Sun Jul  9 17:12:19 2000
 +++ plugins/shell_output/Makefile.in	Mon Jul 10 09:38:40 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -147,3 +147,3 @@
  LIBS = @LIBS@
 -libshell_output_la_LDFLAGS = 
@@ -84,11 +49,6 @@
  libshell_output_la_LIBADD = 
 --- plugins/time/Makefile.in.orig	Sun Jul  9 17:12:16 2000
 +++ plugins/time/Makefile.in	Mon Jul 10 09:33:38 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
- 
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
 -libtime_la_LDFLAGS = 
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 66bd11e69dab..1c6e705d9d95 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -32,4 +32,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=		gedit.1
 
+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/editors/gedit2/files/patch-ao b/editors/gedit2/files/patch-ao
index ee22ad354593..fc344883c147 100644
--- a/editors/gedit2/files/patch-ao
+++ b/editors/gedit2/files/patch-ao
@@ -1,10 +1,5 @@
 --- plugins/browse/Makefile.in.orig	Sun Jun 11 03:00:15 2000
 +++ plugins/browse/Makefile.in	Sun Jun 11 11:15:17 2000
-@@ -128,3 +128,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -138,3 +138,3 @@
  LIBS = @LIBS@
 -libbrowse_la_LDFLAGS = 
@@ -12,11 +7,6 @@
  libbrowse_la_LIBADD = 
 --- plugins/convert/Makefile.in.orig	Sun Jun 11 03:00:17 2000
 +++ plugins/convert/Makefile.in	Sun Jun 11 11:15:25 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -147,3 +147,3 @@
  LIBS = @LIBS@
 -libconvert_la_LDFLAGS = 
@@ -24,11 +14,6 @@
  libconvert_la_LIBADD = 
 --- plugins/diff/Makefile.in.orig	Sun Jul  9 17:12:13 2000
 +++ plugins/diff/Makefile.in	Mon Jul 10 09:32:42 2000
-@@ -128,3 +128,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -144,3 +144,3 @@
  LIBS = @LIBS@
 -libdiff_la_LDFLAGS = 
@@ -36,11 +21,6 @@
  libdiff_la_LIBADD = 
 --- plugins/email/Makefile.in.orig	Sun Jun 11 03:00:16 2000
 +++ plugins/email/Makefile.in	Sun Jun 11 11:15:33 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -147,3 +147,3 @@
  LIBS = @LIBS@
 -libemail_la_LDFLAGS = 
@@ -48,11 +28,6 @@
  libemail_la_LIBADD = 
 --- plugins/reverse/Makefile.in.orig	Sun Jun 11 03:00:18 2000
 +++ plugins/reverse/Makefile.in	Sun Jun 11 11:15:40 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES = -I$(top_srcdir)/src 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
-+INCLUDES = -I$(top_srcdir)/src 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
- 
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
 -libreverse_la_LDFLAGS = 
@@ -60,11 +35,6 @@
  libreverse_la_LIBADD = 
 --- plugins/sample/Makefile.in.orig	Sun Jul  9 17:12:15 2000
 +++ plugins/sample/Makefile.in	Mon Jul 10 09:33:18 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src 					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src 					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
 -libsample_la_LDFLAGS = 
@@ -72,11 +42,6 @@
  libsample_la_LIBADD = 
 --- plugins/shell_output/Makefile.in.orig	Sun Jul  9 17:12:19 2000
 +++ plugins/shell_output/Makefile.in	Mon Jul 10 09:38:40 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGEDIT_GLADEDIR=\""$(gladedir)"\"			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
 @@ -147,3 +147,3 @@
  LIBS = @LIBS@
 -libshell_output_la_LDFLAGS = 
@@ -84,11 +49,6 @@
  libshell_output_la_LIBADD = 
 --- plugins/time/Makefile.in.orig	Sun Jul  9 17:12:16 2000
 +++ plugins/time/Makefile.in	Mon Jul 10 09:33:38 2000
-@@ -130,3 +130,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(top_srcdir)/src					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)		$(GNOME_INCLUDEDIR)
- 
 @@ -140,3 +140,3 @@
  LIBS = @LIBS@
 -libtime_la_LDFLAGS = 
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index faaf6a50149a..c399504f634f 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -29,4 +29,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/editors/ghex2/Makefile b/editors/ghex2/Makefile
index faaf6a50149a..c399504f634f 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -29,4 +29,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>