Extensive patchfile cleanups using sobomax's wonderful

post-extract rule

3 files changed, 8 insertions, 75 deletions

diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 5ea2dc2ed743..698ce4c3d9aa 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		glade.4:${PORTSDIR}/devel/libglade \
-		guile.6:${PORTSDIR}/lang/guile
+		guile.9:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -33,6 +33,13 @@ MAN1=		gide.1 gdbio.1
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
+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'
+
 post-patch:
 	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
 	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/src/*.c
diff --git a/devel/gide/files/patch-bc b/devel/gide/files/patch-bc
index ac3c8f68e710..f57ce5ac4dfb 100644
--- a/devel/gide/files/patch-bc
+++ b/devel/gide/files/patch-bc
@@ -1,14 +1,5 @@
 --- plugins/asciitable/Makefile.in.orig	Sun May 14 10:11:31 2000
 +++ plugins/asciitable/Makefile.in	Tue Jun 13 17:35:48 2000
-@@ -147,7 +147,7 @@
- 
- libgide_asciitable_la_SOURCES = plugin_asciitable.c
- 
--INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
 @@ -157,7 +157,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -20,15 +11,6 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 --- plugins/browser/Makefile.in.orig	Sun May 14 10:11:35 2000
 +++ plugins/browser/Makefile.in	Tue Jun 13 17:35:54 2000
-@@ -150,7 +150,7 @@
- 
- libgide_browser_la_SOURCES = plugin_browser.c
- 
--INCLUDES =  	-I$(GIDE_SRC_DIR) 	-I$(GIDE_SRC_DIR)/GtkEditor 	-I$(GIDE_SRC_DIR)/GtkSCText 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-DVERSION=\""$(VERSION)"\" 	-I$(includedir) 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(GIDE_SRC_DIR) 	-I$(GIDE_SRC_DIR)/GtkEditor 	-I$(GIDE_SRC_DIR)/GtkSCText 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-DVERSION=\""$(VERSION)"\" 	-I$(includedir) 	$(GNOME_INCLUDEDIR)
- 
- 
- libgide_browser_la_LIBADD =  	GtkSCB/libGtkSCB.la
 @@ -163,7 +163,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -40,15 +22,6 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 --- plugins/calculator/Makefile.in.orig	Sun May 14 10:11:33 2000
 +++ plugins/calculator/Makefile.in	Tue Jun 13 17:36:01 2000
-@@ -147,7 +147,7 @@
- 
- libgide_calculator_la_SOURCES = plugin_calculator.c
- 
--INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
 @@ -157,7 +157,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -60,15 +33,6 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 --- plugins/docstat/Makefile.in.orig	Sun May 14 10:11:34 2000
 +++ plugins/docstat/Makefile.in	Tue Jun 13 17:36:08 2000
-@@ -147,7 +147,7 @@
- 
- libgide_docstat_la_SOURCES = plugin_docstat.c
- 
--INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
 @@ -157,7 +157,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -80,15 +44,6 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 --- plugins/sample/Makefile.in.orig	Sun May 14 10:11:29 2000
 +++ plugins/sample/Makefile.in	Tue Jun 13 17:36:15 2000
-@@ -153,7 +153,7 @@
- 
- libgide_sample_la_SOURCES = plugin-sample.c
- 
--INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
 @@ -163,7 +163,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -100,15 +55,6 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 --- plugins/text/Makefile.in.orig	Sun May 14 10:11:32 2000
 +++ plugins/text/Makefile.in	Tue Jun 13 17:36:23 2000
-@@ -148,7 +148,7 @@
- libgide_text_la_SOURCES = plugin_text.c plugin_text_insert.c 			  plugin_text_delete.c plugin_text_replace.c 			  plugin_text_insert.h plugin_text_delete.h 			  plugin_text_replace.h
- 
- 
--INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(GIDE_SRC_DIR)					-I$(GIDE_SRC_DIR)/GtkEditor				-I$(GIDE_SRC_DIR)/GtkSCText				-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DVERSION=\""$(VERSION)"\"             			-I$(includedir)						$(GNOME_INCLUDEDIR)
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
 @@ -158,7 +158,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -118,14 +64,3 @@
  libgide_text_la_LIBADD = 
  libgide_text_la_OBJECTS =  plugin_text.lo plugin_text_insert.lo \
  plugin_text_delete.lo plugin_text_replace.lo
---- src/dialogs/Makefile.in.orig	Sun May 14 10:11:43 2000
-+++ src/dialogs/Makefile.in	Tue Jun 13 17:35:25 2000
-@@ -131,7 +131,7 @@
- 
- @GTKEDITOR_COMPILE_TRUE@EDITOR_INCLUDES = -I$(srcdir)/../GtkSCText/ -I$(srcdir)/../GtkEditor/
- 
--INCLUDES =  	$(GNOME_INCLUDEDIR) 					$(EDITOR_INCLUDES) 					$(EXTRA_GNOME_CFLAGS)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	        -DGIDE_GLADEDIR=\""$(gladedir)"\"           		-I$(srcdir)/..						-I$(includedir)
-+INCLUDES =  	$(GNOME_INCLUDEDIR) 					$(EDITOR_INCLUDES) 					$(EXTRA_GNOME_CFLAGS)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	        -DGIDE_GLADEDIR=\""$(gladedir)"\"           		-I$(srcdir)/..						-I$(includedir)
- 
- 
- noinst_LIBRARIES = libdialogs.a
diff --git a/devel/gide/files/patch-bd b/devel/gide/files/patch-bd
index 4c2242449d7f..a9b15c4b0390 100644
--- a/devel/gide/files/patch-bd
+++ b/devel/gide/files/patch-bd
@@ -1,14 +1,5 @@
 --- src/Makefile.in.orig	Sun May 14 10:11:41 2000
 +++ src/Makefile.in	Tue Jun 13 17:33:29 2000
-@@ -137,7 +137,7 @@
- # binaries
- bin_PROGRAMS = gide gdbio
- 
--CFLAGS = @CFLAGS@ 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-DGIDE_CFGDIR=\"$(pkgdatadir)\" 	-DGIDE_PLUGINDIR=\"$(libdir)/gide/plugins/$(VERSION)/\"
-+CFLAGS = @CFLAGS@ 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-DGIDE_CFGDIR=\"$(pkgdatadir)\" 	-DGIDE_PLUGINDIR=\"$(libdir)/gide/plugins/$(VERSION)/\"
- 
- 
- INCLUDES =  	$(GNOME_INCLUDEDIR) 	$(GUILE_INCS) 	$(EDITOR_INCLUDES) 	-I$(srcdir)/dialogs
 @@ -161,7 +161,7 @@