Extensive patchfile cleanups using sobomax's wonderful

post-extract rule

8 files changed, 38 insertions, 152 deletions

diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 97587191e04a..cafdfe23a1a9 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -41,6 +41,13 @@ pre-extract:
 	@${ECHO} "You can add gnomepilot support by defining WITH_GNOMEPILOT"
 .endif
 
+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'
+
 .if defined(WITH_GNOMEPILOT)
 post-install:
 	@${CAT} ${PKGDIR}/PLIST.pilot >> ${TMPPLIST}
diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab
index a90fec35121a..a64463dc909a 100644
--- a/deskutils/gnome-pim/files/patch-ab
+++ b/deskutils/gnome-pim/files/patch-ab
@@ -1,79 +1,17 @@
 --- gncal/Makefile.in.orig	Sat May 20 20:52:50 2000
-+++ gncal/Makefile.in	Fri Jun  2 12:41:34 2000
-@@ -141,12 +141,12 @@
- gnorbadir = $(sysconfdir)/CORBA/servers
- gnorba_DATA = gnomecal.gnorba
++++ gncal/Makefile.in	Wed Aug  2 10:27:30 2000
+@@ -143,3 +143,3 @@
  
--help_base = $(datadir)/gnome/help/cal
+-help_base = $(datadir)/help/cal
 +help_base = $(datadir)/help/gnomecal
  
- @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = 		calendar-conduit-control-applet			calendar-pilot-sync
- bin_PROGRAMS = gnomecal $(extra_pilot_bins)
- 
--INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
- 
- GNOMECAL_CORBA_GENERATED =  	GnomeCal.h			GnomeCal.c			GnomeCal-common.c		GnomeCal-skels.c		GnomeCal-stubs.c
-@@ -172,7 +172,7 @@
- libcalendar_conduit_la_SOURCES =  	GnomeCal-common.c		GnomeCal-stubs.c		calendar-conduit.c		calobj.c 			alarm.c				calendar.c 			timeutil.c
- 
+@@ -174,3 +174,3 @@
  
 -libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir)
 +libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir) -avoid-version
  
- 
- libcalendar_conduit_la_LIBADD =  	../libversit/libversit.la 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 	$(GNOME_LIBDIR) 	$(GNOME_LIBS)
-@@ -221,7 +221,7 @@
- @HAVE_GNOME_PILOT_TRUE@ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = calendar-conduit-control-applet.desktop 
- 
--@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
- @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
- 
- @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
-@@ -233,7 +233,7 @@
- appicondir = $(datadir)/pixmaps
- appicon_DATA = gnome-calendar-conduit.png
- 
--Productivitydir = $(datadir)/gnome/apps/Applications
-+Productivitydir = $(datadir)/apps/Applications
- 
- Productivity_DATA = gncal.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- gnomecard/Makefile.in.orig	Sat May 20 20:52:58 2000
 +++ gnomecard/Makefile.in	Fri Jun  2 12:42:28 2000
-@@ -135,9 +135,9 @@
- 
- nSUBDIRS = help
- 
--xpmhelp_base = $(datadir)/gnome/help/cal
-+xpmhelp_base = $(datadir)/help/cal
- 
--INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
-+INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
- 
- 
- @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = 		address-conduit-capplet	
-@@ -183,7 +183,7 @@
- 
- @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = 	address-conduit-capplet.desktop 
- 
--@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
- @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
- 
- @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
-@@ -192,7 +192,7 @@
- EXTRA_DIST =  	addr.xpm		addrtool.xpm		cardedit.xpm		cardnew.xpm		cardfind.xpm		email.xpm		expl.xpm		first.xpm		geo.xpm			ident.xpm		last.xpm		org.xpm			sec.xpm			tel.xpm			teltool.xpm		phone.xpm		world.xpm		gnome-card.xpm  	gnomecard.desktop 	address-conduit-capplet.desktop 	gnomecard.conduit 	gnome-gnomecard.png 	gnomecard.gnorba 	ChangeLog 	BUGS
- 
- 
--Productivitydir = $(datadir)/gnome/apps/Applications
-+Productivitydir = $(datadir)/apps/Applications
- 
- Productivity_DATA = gnomecard.desktop
- 
 @@ -206,7 +206,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 57efddb91aa9..e87071ccd9af 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/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/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa
index 149087c84669..6f97cad1373c 100644
--- a/deskutils/gnome-utils/files/patch-aa
+++ b/deskutils/gnome-utils/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/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 97587191e04a..cafdfe23a1a9 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -41,6 +41,13 @@ pre-extract:
 	@${ECHO} "You can add gnomepilot support by defining WITH_GNOMEPILOT"
 .endif
 
+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'
+
 .if defined(WITH_GNOMEPILOT)
 post-install:
 	@${CAT} ${PKGDIR}/PLIST.pilot >> ${TMPPLIST}
diff --git a/deskutils/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab
index a90fec35121a..a64463dc909a 100644
--- a/deskutils/gnomepim/files/patch-ab
+++ b/deskutils/gnomepim/files/patch-ab
@@ -1,79 +1,17 @@
 --- gncal/Makefile.in.orig	Sat May 20 20:52:50 2000
-+++ gncal/Makefile.in	Fri Jun  2 12:41:34 2000
-@@ -141,12 +141,12 @@
- gnorbadir = $(sysconfdir)/CORBA/servers
- gnorba_DATA = gnomecal.gnorba
++++ gncal/Makefile.in	Wed Aug  2 10:27:30 2000
+@@ -143,3 +143,3 @@
  
--help_base = $(datadir)/gnome/help/cal
+-help_base = $(datadir)/help/cal
 +help_base = $(datadir)/help/gnomecal
  
- @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = 		calendar-conduit-control-applet			calendar-pilot-sync
- bin_PROGRAMS = gnomecal $(extra_pilot_bins)
- 
--INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-I$(includedir)		$(GNOME_INCLUDEDIR) 	$(GNOME_CONDUIT_INCLUDEDIR) 	$(PISOCK_INCLUDEDIR)         -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
- 
- GNOMECAL_CORBA_GENERATED =  	GnomeCal.h			GnomeCal.c			GnomeCal-common.c		GnomeCal-skels.c		GnomeCal-stubs.c
-@@ -172,7 +172,7 @@
- libcalendar_conduit_la_SOURCES =  	GnomeCal-common.c		GnomeCal-stubs.c		calendar-conduit.c		calobj.c 			alarm.c				calendar.c 			timeutil.c
- 
+@@ -174,3 +174,3 @@
  
 -libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir)
 +libcalendar_conduit_la_LDFLAGS =  	-rpath $(libdir) -avoid-version
  
- 
- libcalendar_conduit_la_LIBADD =  	../libversit/libversit.la 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 	$(GNOME_LIBDIR) 	$(GNOME_LIBS)
-@@ -221,7 +221,7 @@
- @HAVE_GNOME_PILOT_TRUE@ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = calendar-conduit-control-applet.desktop 
- 
--@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
- @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
- 
- @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
-@@ -233,7 +233,7 @@
- appicondir = $(datadir)/pixmaps
- appicon_DATA = gnome-calendar-conduit.png
- 
--Productivitydir = $(datadir)/gnome/apps/Applications
-+Productivitydir = $(datadir)/apps/Applications
- 
- Productivity_DATA = gncal.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 --- gnomecard/Makefile.in.orig	Sat May 20 20:52:58 2000
 +++ gnomecard/Makefile.in	Fri Jun  2 12:42:28 2000
-@@ -135,9 +135,9 @@
- 
- nSUBDIRS = help
- 
--xpmhelp_base = $(datadir)/gnome/help/cal
-+xpmhelp_base = $(datadir)/help/cal
- 
--INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
-+INCLUDES =  	-I$(includedir)						$(GNOME_INCLUDEDIR)				        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		$(PISOCK_INCLUDEDIR)                            	-I../../gcalendar
- 
- 
- @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = 		address-conduit-capplet	
-@@ -183,7 +183,7 @@
- 
- @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = 	address-conduit-capplet.desktop 
- 
--@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
- @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA)
- 
- @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/
-@@ -192,7 +192,7 @@
- EXTRA_DIST =  	addr.xpm		addrtool.xpm		cardedit.xpm		cardnew.xpm		cardfind.xpm		email.xpm		expl.xpm		first.xpm		geo.xpm			ident.xpm		last.xpm		org.xpm			sec.xpm			tel.xpm			teltool.xpm		phone.xpm		world.xpm		gnome-card.xpm  	gnomecard.desktop 	address-conduit-capplet.desktop 	gnomecard.conduit 	gnome-gnomecard.png 	gnomecard.gnorba 	ChangeLog 	BUGS
- 
- 
--Productivitydir = $(datadir)/gnome/apps/Applications
-+Productivitydir = $(datadir)/apps/Applications
- 
- Productivity_DATA = gnomecard.desktop
- 
 @@ -206,7 +206,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 57efddb91aa9..e87071ccd9af 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/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/deskutils/gnomeutils2/files/patch-aa b/deskutils/gnomeutils2/files/patch-aa
index 149087c84669..6f97cad1373c 100644
--- a/deskutils/gnomeutils2/files/patch-aa
+++ b/deskutils/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