Extensive patchfile cleanups using sobomax's wonderful

post-extract rule

6 files changed, 21 insertions, 159 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 52ff91c7cb86..2d6d0d40b3f5 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -27,4 +27,11 @@ CONFIGURE_ARGS=	--without-ncurses \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		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/audio/gnome-media/files/patch-ac b/audio/gnome-media/files/patch-ac
index d234ced223d5..550d1e6d083c 100644
--- a/audio/gnome-media/files/patch-ac
+++ b/audio/gnome-media/files/patch-ac
@@ -1,67 +1,14 @@
 --- cddbslave/Makefile.in.orig	Wed May 24 14:53:10 2000
 +++ cddbslave/Makefile.in	Tue May 30 15:13:02 2000
-@@ -125,3 +125,3 @@
- 
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
 @@ -139,3 +139,3 @@
  
 -gnomedatadir = $(datadir)/gnome
 +gnomedatadir = $(datadir)
  
---- gmix/Makefile.in.orig	Wed May 24 14:53:13 2000
-+++ gmix/Makefile.in	Tue May 30 15:11:42 2000
-@@ -125,3 +125,3 @@
- 
--Audiodir = $(datadir)/gnome/apps/Multimedia
-+Audiodir = $(datadir)/apps/Multimedia
- pixmapdir = $(datadir)/pixmaps
-@@ -131,3 +131,3 @@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		$(GNOME_INCLUDEDIR) 					-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		$(GNOME_INCLUDEDIR) 					-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-
---- grecord/Makefile.in.orig	Wed May 24 14:53:19 2000
-+++ grecord/Makefile.in	Tue May 30 15:39:21 2000
-@@ -130,3 +130,3 @@
- 
--Applicationsdir = $(datadir)/gnome/apps/Multimedia
-+Applicationsdir = $(datadir)/apps/Multimedia
- Applications_DATA = Soundrecorder.desktop
---- grecord/src/Makefile.in.orig	Wed May 24 14:53:21 2000
-+++ grecord/src/Makefile.in	Tue May 30 15:39:42 2000
-@@ -125,3 +125,3 @@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)		-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)		-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"
- 
 --- tcd/Makefile.in.orig	Wed May 24 14:53:16 2000
 +++ tcd/Makefile.in	Tue May 30 15:12:38 2000
-@@ -125,3 +125,3 @@
- 
--Audiodir = $(datadir)/gnome/apps/Multimedia
-+Audiodir = $(datadir)/apps/Multimedia
- Pixmapdir = $(datadir)/pixmaps
 @@ -147,3 +147,3 @@
  
 -tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS)
 +tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS)
  
-@@ -151,3 +151,3 @@
- 
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER)		-DGNOME_ICONDIR=\""$(Pixmapdir)"\"
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER)		-DGNOME_ICONDIR=\""$(Pixmapdir)"\"
- 
---- vu-meter/Makefile.in.orig	Wed May 24 14:53:11 2000
-+++ vu-meter/Makefile.in	Tue May 30 15:11:23 2000
-@@ -125,3 +125,3 @@
- 
--Audiodir = $(datadir)/gnome/apps/Multimedia
-+Audiodir = $(datadir)/apps/Multimedia
- 
-@@ -129,3 +129,3 @@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	$(GNOME_INCLUDEDIR)				-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	$(GNOME_INCLUDEDIR)				-DGNOME_ICONDIR=\""$(pixmapdir)"\"
- 
diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile
index 52ff91c7cb86..2d6d0d40b3f5 100644
--- a/audio/gnomemedia/Makefile
+++ b/audio/gnomemedia/Makefile
@@ -27,4 +27,11 @@ CONFIGURE_ARGS=	--without-ncurses \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		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/audio/gnomemedia/files/patch-ac b/audio/gnomemedia/files/patch-ac
index d234ced223d5..550d1e6d083c 100644
--- a/audio/gnomemedia/files/patch-ac
+++ b/audio/gnomemedia/files/patch-ac
@@ -1,67 +1,14 @@
 --- cddbslave/Makefile.in.orig	Wed May 24 14:53:10 2000
 +++ cddbslave/Makefile.in	Tue May 30 15:13:02 2000
-@@ -125,3 +125,3 @@
- 
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
 @@ -139,3 +139,3 @@
  
 -gnomedatadir = $(datadir)/gnome
 +gnomedatadir = $(datadir)
  
---- gmix/Makefile.in.orig	Wed May 24 14:53:13 2000
-+++ gmix/Makefile.in	Tue May 30 15:11:42 2000
-@@ -125,3 +125,3 @@
- 
--Audiodir = $(datadir)/gnome/apps/Multimedia
-+Audiodir = $(datadir)/apps/Multimedia
- pixmapdir = $(datadir)/pixmaps
-@@ -131,3 +131,3 @@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		$(GNOME_INCLUDEDIR) 					-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		$(GNOME_INCLUDEDIR) 					-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-
---- grecord/Makefile.in.orig	Wed May 24 14:53:19 2000
-+++ grecord/Makefile.in	Tue May 30 15:39:21 2000
-@@ -130,3 +130,3 @@
- 
--Applicationsdir = $(datadir)/gnome/apps/Multimedia
-+Applicationsdir = $(datadir)/apps/Multimedia
- Applications_DATA = Soundrecorder.desktop
---- grecord/src/Makefile.in.orig	Wed May 24 14:53:21 2000
-+++ grecord/src/Makefile.in	Tue May 30 15:39:42 2000
-@@ -125,3 +125,3 @@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)		-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)		-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"
- 
 --- tcd/Makefile.in.orig	Wed May 24 14:53:16 2000
 +++ tcd/Makefile.in	Tue May 30 15:12:38 2000
-@@ -125,3 +125,3 @@
- 
--Audiodir = $(datadir)/gnome/apps/Multimedia
-+Audiodir = $(datadir)/apps/Multimedia
- Pixmapdir = $(datadir)/pixmaps
 @@ -147,3 +147,3 @@
  
 -tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS)
 +tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS)
  
-@@ -151,3 +151,3 @@
- 
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER)		-DGNOME_ICONDIR=\""$(Pixmapdir)"\"
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER)		-DGNOME_ICONDIR=\""$(Pixmapdir)"\"
- 
---- vu-meter/Makefile.in.orig	Wed May 24 14:53:11 2000
-+++ vu-meter/Makefile.in	Tue May 30 15:11:23 2000
-@@ -125,3 +125,3 @@
- 
--Audiodir = $(datadir)/gnome/apps/Multimedia
-+Audiodir = $(datadir)/apps/Multimedia
- 
-@@ -129,3 +129,3 @@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	$(GNOME_INCLUDEDIR)				-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	$(GNOME_INCLUDEDIR)				-DGNOME_ICONDIR=\""$(pixmapdir)"\"
- 
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 52ff91c7cb86..2d6d0d40b3f5 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -27,4 +27,11 @@ CONFIGURE_ARGS=	--without-ncurses \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		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/audio/gnomemedia2/files/patch-ac b/audio/gnomemedia2/files/patch-ac
index d234ced223d5..550d1e6d083c 100644
--- a/audio/gnomemedia2/files/patch-ac
+++ b/audio/gnomemedia2/files/patch-ac
@@ -1,67 +1,14 @@
 --- cddbslave/Makefile.in.orig	Wed May 24 14:53:10 2000
 +++ cddbslave/Makefile.in	Tue May 30 15:13:02 2000
-@@ -125,3 +125,3 @@
- 
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
 @@ -139,3 +139,3 @@
  
 -gnomedatadir = $(datadir)/gnome
 +gnomedatadir = $(datadir)
  
---- gmix/Makefile.in.orig	Wed May 24 14:53:13 2000
-+++ gmix/Makefile.in	Tue May 30 15:11:42 2000
-@@ -125,3 +125,3 @@
- 
--Audiodir = $(datadir)/gnome/apps/Multimedia
-+Audiodir = $(datadir)/apps/Multimedia
- pixmapdir = $(datadir)/pixmaps
-@@ -131,3 +131,3 @@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		$(GNOME_INCLUDEDIR) 					-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		$(GNOME_INCLUDEDIR) 					-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-
---- grecord/Makefile.in.orig	Wed May 24 14:53:19 2000
-+++ grecord/Makefile.in	Tue May 30 15:39:21 2000
-@@ -130,3 +130,3 @@
- 
--Applicationsdir = $(datadir)/gnome/apps/Multimedia
-+Applicationsdir = $(datadir)/apps/Multimedia
- Applications_DATA = Soundrecorder.desktop
---- grecord/src/Makefile.in.orig	Wed May 24 14:53:21 2000
-+++ grecord/src/Makefile.in	Tue May 30 15:39:42 2000
-@@ -125,3 +125,3 @@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)		-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)		-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"
- 
 --- tcd/Makefile.in.orig	Wed May 24 14:53:16 2000
 +++ tcd/Makefile.in	Tue May 30 15:12:38 2000
-@@ -125,3 +125,3 @@
- 
--Audiodir = $(datadir)/gnome/apps/Multimedia
-+Audiodir = $(datadir)/apps/Multimedia
- Pixmapdir = $(datadir)/pixmaps
 @@ -147,3 +147,3 @@
  
 -tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS)
 +tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS)
  
-@@ -151,3 +151,3 @@
- 
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER)		-DGNOME_ICONDIR=\""$(Pixmapdir)"\"
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER)		-DGNOME_ICONDIR=\""$(Pixmapdir)"\"
- 
---- vu-meter/Makefile.in.orig	Wed May 24 14:53:11 2000
-+++ vu-meter/Makefile.in	Tue May 30 15:11:23 2000
-@@ -125,3 +125,3 @@
- 
--Audiodir = $(datadir)/gnome/apps/Multimedia
-+Audiodir = $(datadir)/apps/Multimedia
- 
-@@ -129,3 +129,3 @@
- 
--INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	$(GNOME_INCLUDEDIR)				-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	$(GNOME_INCLUDEDIR)				-DGNOME_ICONDIR=\""$(pixmapdir)"\"
-