Extensive patchfile cleanups using sobomax's wonderful

post-extract rule

63 files changed, 336 insertions, 514 deletions

diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 6b57c39ceacf..c7faa62fab4d 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -28,4 +28,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/genius/files/patch-aa b/deskutils/genius/files/patch-aa
index 668f07860f1d..91b0520385dc 100644
--- a/deskutils/genius/files/patch-aa
+++ b/deskutils/genius/files/patch-aa
@@ -1,14 +1,5 @@
 --- configure.orig	Tue May 11 05:56:50 1999
 +++ configure	Sat May 22 21:23:18 1999
-@@ -3354,7 +3354,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIB="-lc_r"
-+  PTHREAD_LIB=""
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
 @@ -5556,15 +5556,15 @@
  fi
  
diff --git a/devel/dryad/Makefile b/devel/dryad/Makefile
index 9c901b6c4c66..efa3437fde7e 100644
--- a/devel/dryad/Makefile
+++ b/devel/dryad/Makefile
@@ -30,4 +30,11 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 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/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 @@
  
  
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 96c899f3be6b..d461a53f3c15 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		gconf.8:${PORTSDIR}/devel/gconf \
+		gconf-1.0:${PORTSDIR}/devel/gconf \
 		bz2.1:${PORTSDIR}/archivers/bzip2
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -36,4 +36,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN5=		gnome-vfs-mime.5
 
+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/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 743135715f12..1c45a532c432 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -9,15 +9,6 @@
  fi
  
  # Check whether --enable-libefs or --disable-libefs was given.
-@@ -4862,7 +4862,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -5924,7 +5924,7 @@
  VFSPTHREAD_LIBDIR='-L${libdir}'
  VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
index 7be0be993a1f..dfe39cf495c7 100644
--- a/devel/gnome-vfs/files/patch-ac
+++ b/devel/gnome-vfs/files/patch-ac
@@ -1,18 +1,26 @@
---- modules/Makefile.in.orig	Tue Feb 22 01:45:51 2000
-+++ modules/Makefile.in	Wed Jun 28 16:20:34 2000
+--- modules/Makefile.in.orig	Wed Aug  2 13:39:35 2000
++++ modules/Makefile.in	Wed Aug  2 13:48:21 2000
 @@ -191,6 +191,7 @@
  
- libftp_la_SOURCES =  	ftp-method.c					ftp-method.h					module-shared.c					module-shared.h
+ libfile_la_SOURCES =  	file-method.c 					file-method.h
  
 +libftp_la_LDFLAGS = $(module_flags)
  
- ### `gconf' method
+ libfile_la_LDFLAGS = $(module_flags)
  
-@@ -238,7 +239,6 @@
+@@ -266,14 +267,13 @@
  libbzip2_la_OBJECTS =  bzip2-method.lo
  libgzip_la_DEPENDENCIES = 
  libgzip_la_OBJECTS =  gzip-method.lo
 -libftp_la_LDFLAGS = 
  libftp_la_LIBADD = 
- libftp_la_OBJECTS =  ftp-method.lo module-shared.lo
+ libftp_la_OBJECTS =  ftp-method.lo
  libvfs_pipe_la_DEPENDENCIES = 
+ libvfs_pipe_la_OBJECTS =  pipe-method.lo
+ libvfs_translate_la_DEPENDENCIES = 
+ libvfs_translate_la_OBJECTS =  translate-method.lo
+-libvefs_la_LDFLAGS = 
++libvefs_la_LDFLAGS = $(module_flags)
+ @HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES = 
+ @HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS =  efs-method.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 9b0008727408..4693bda125fd 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
 lib/vfs/modules/libgconf.so
 lib/vfs/modules/libgzip.so
 lib/vfs/modules/libhttp.so
+lib/vfs/modules/libvefs.so
 lib/vfs/modules/libvfs-pipe.so
 lib/vfs/modules/libvfs-translate.so
 share/gnome/apps/Settings/nautilus-mime-type.desktop
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 96c899f3be6b..d461a53f3c15 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		gconf.8:${PORTSDIR}/devel/gconf \
+		gconf-1.0:${PORTSDIR}/devel/gconf \
 		bz2.1:${PORTSDIR}/archivers/bzip2
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -36,4 +36,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN5=		gnome-vfs-mime.5
 
+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/devel/gnome-vfs1/files/patch-aa b/devel/gnome-vfs1/files/patch-aa
index 743135715f12..1c45a532c432 100644
--- a/devel/gnome-vfs1/files/patch-aa
+++ b/devel/gnome-vfs1/files/patch-aa
@@ -9,15 +9,6 @@
  fi
  
  # Check whether --enable-libefs or --disable-libefs was given.
-@@ -4862,7 +4862,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -5924,7 +5924,7 @@
  VFSPTHREAD_LIBDIR='-L${libdir}'
  VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
diff --git a/devel/gnome-vfs1/files/patch-ac b/devel/gnome-vfs1/files/patch-ac
index 7be0be993a1f..dfe39cf495c7 100644
--- a/devel/gnome-vfs1/files/patch-ac
+++ b/devel/gnome-vfs1/files/patch-ac
@@ -1,18 +1,26 @@
---- modules/Makefile.in.orig	Tue Feb 22 01:45:51 2000
-+++ modules/Makefile.in	Wed Jun 28 16:20:34 2000
+--- modules/Makefile.in.orig	Wed Aug  2 13:39:35 2000
++++ modules/Makefile.in	Wed Aug  2 13:48:21 2000
 @@ -191,6 +191,7 @@
  
- libftp_la_SOURCES =  	ftp-method.c					ftp-method.h					module-shared.c					module-shared.h
+ libfile_la_SOURCES =  	file-method.c 					file-method.h
  
 +libftp_la_LDFLAGS = $(module_flags)
  
- ### `gconf' method
+ libfile_la_LDFLAGS = $(module_flags)
  
-@@ -238,7 +239,6 @@
+@@ -266,14 +267,13 @@
  libbzip2_la_OBJECTS =  bzip2-method.lo
  libgzip_la_DEPENDENCIES = 
  libgzip_la_OBJECTS =  gzip-method.lo
 -libftp_la_LDFLAGS = 
  libftp_la_LIBADD = 
- libftp_la_OBJECTS =  ftp-method.lo module-shared.lo
+ libftp_la_OBJECTS =  ftp-method.lo
  libvfs_pipe_la_DEPENDENCIES = 
+ libvfs_pipe_la_OBJECTS =  pipe-method.lo
+ libvfs_translate_la_DEPENDENCIES = 
+ libvfs_translate_la_OBJECTS =  translate-method.lo
+-libvefs_la_LDFLAGS = 
++libvefs_la_LDFLAGS = $(module_flags)
+ @HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES = 
+ @HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS =  efs-method.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gnome-vfs1/pkg-plist b/devel/gnome-vfs1/pkg-plist
index 9b0008727408..4693bda125fd 100644
--- a/devel/gnome-vfs1/pkg-plist
+++ b/devel/gnome-vfs1/pkg-plist
@@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
 lib/vfs/modules/libgconf.so
 lib/vfs/modules/libgzip.so
 lib/vfs/modules/libhttp.so
+lib/vfs/modules/libvefs.so
 lib/vfs/modules/libvfs-pipe.so
 lib/vfs/modules/libvfs-translate.so
 share/gnome/apps/Settings/nautilus-mime-type.desktop
diff --git a/devel/gnomedebug/Makefile b/devel/gnomedebug/Makefile
index b47bf1b8214b..e8ce9fcb5c9f 100644
--- a/devel/gnomedebug/Makefile
+++ b/devel/gnomedebug/Makefile
@@ -29,4 +29,11 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 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/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index 96c899f3be6b..d461a53f3c15 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		gconf.8:${PORTSDIR}/devel/gconf \
+		gconf-1.0:${PORTSDIR}/devel/gconf \
 		bz2.1:${PORTSDIR}/archivers/bzip2
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -36,4 +36,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN5=		gnome-vfs-mime.5
 
+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/devel/gnomevfs/files/patch-aa b/devel/gnomevfs/files/patch-aa
index 743135715f12..1c45a532c432 100644
--- a/devel/gnomevfs/files/patch-aa
+++ b/devel/gnomevfs/files/patch-aa
@@ -9,15 +9,6 @@
  fi
  
  # Check whether --enable-libefs or --disable-libefs was given.
-@@ -4862,7 +4862,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -5924,7 +5924,7 @@
  VFSPTHREAD_LIBDIR='-L${libdir}'
  VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
diff --git a/devel/gnomevfs/files/patch-ac b/devel/gnomevfs/files/patch-ac
index 7be0be993a1f..dfe39cf495c7 100644
--- a/devel/gnomevfs/files/patch-ac
+++ b/devel/gnomevfs/files/patch-ac
@@ -1,18 +1,26 @@
---- modules/Makefile.in.orig	Tue Feb 22 01:45:51 2000
-+++ modules/Makefile.in	Wed Jun 28 16:20:34 2000
+--- modules/Makefile.in.orig	Wed Aug  2 13:39:35 2000
++++ modules/Makefile.in	Wed Aug  2 13:48:21 2000
 @@ -191,6 +191,7 @@
  
- libftp_la_SOURCES =  	ftp-method.c					ftp-method.h					module-shared.c					module-shared.h
+ libfile_la_SOURCES =  	file-method.c 					file-method.h
  
 +libftp_la_LDFLAGS = $(module_flags)
  
- ### `gconf' method
+ libfile_la_LDFLAGS = $(module_flags)
  
-@@ -238,7 +239,6 @@
+@@ -266,14 +267,13 @@
  libbzip2_la_OBJECTS =  bzip2-method.lo
  libgzip_la_DEPENDENCIES = 
  libgzip_la_OBJECTS =  gzip-method.lo
 -libftp_la_LDFLAGS = 
  libftp_la_LIBADD = 
- libftp_la_OBJECTS =  ftp-method.lo module-shared.lo
+ libftp_la_OBJECTS =  ftp-method.lo
  libvfs_pipe_la_DEPENDENCIES = 
+ libvfs_pipe_la_OBJECTS =  pipe-method.lo
+ libvfs_translate_la_DEPENDENCIES = 
+ libvfs_translate_la_OBJECTS =  translate-method.lo
+-libvefs_la_LDFLAGS = 
++libvefs_la_LDFLAGS = $(module_flags)
+ @HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES = 
+ @HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS =  efs-method.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gnomevfs/pkg-plist b/devel/gnomevfs/pkg-plist
index 9b0008727408..4693bda125fd 100644
--- a/devel/gnomevfs/pkg-plist
+++ b/devel/gnomevfs/pkg-plist
@@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
 lib/vfs/modules/libgconf.so
 lib/vfs/modules/libgzip.so
 lib/vfs/modules/libhttp.so
+lib/vfs/modules/libvefs.so
 lib/vfs/modules/libvfs-pipe.so
 lib/vfs/modules/libvfs-translate.so
 share/gnome/apps/Settings/nautilus-mime-type.desktop
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 96c899f3be6b..d461a53f3c15 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		gconf.8:${PORTSDIR}/devel/gconf \
+		gconf-1.0:${PORTSDIR}/devel/gconf \
 		bz2.1:${PORTSDIR}/archivers/bzip2
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -36,4 +36,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN5=		gnome-vfs-mime.5
 
+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/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 743135715f12..1c45a532c432 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -9,15 +9,6 @@
  fi
  
  # Check whether --enable-libefs or --disable-libefs was given.
-@@ -4862,7 +4862,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -5924,7 +5924,7 @@
  VFSPTHREAD_LIBDIR='-L${libdir}'
  VFSPTHREAD_INCLUDEDIR='-I${includedir} -I${libdir}/vfs/include'
diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac
index 7be0be993a1f..dfe39cf495c7 100644
--- a/devel/gnomevfs2/files/patch-ac
+++ b/devel/gnomevfs2/files/patch-ac
@@ -1,18 +1,26 @@
---- modules/Makefile.in.orig	Tue Feb 22 01:45:51 2000
-+++ modules/Makefile.in	Wed Jun 28 16:20:34 2000
+--- modules/Makefile.in.orig	Wed Aug  2 13:39:35 2000
++++ modules/Makefile.in	Wed Aug  2 13:48:21 2000
 @@ -191,6 +191,7 @@
  
- libftp_la_SOURCES =  	ftp-method.c					ftp-method.h					module-shared.c					module-shared.h
+ libfile_la_SOURCES =  	file-method.c 					file-method.h
  
 +libftp_la_LDFLAGS = $(module_flags)
  
- ### `gconf' method
+ libfile_la_LDFLAGS = $(module_flags)
  
-@@ -238,7 +239,6 @@
+@@ -266,14 +267,13 @@
  libbzip2_la_OBJECTS =  bzip2-method.lo
  libgzip_la_DEPENDENCIES = 
  libgzip_la_OBJECTS =  gzip-method.lo
 -libftp_la_LDFLAGS = 
  libftp_la_LIBADD = 
- libftp_la_OBJECTS =  ftp-method.lo module-shared.lo
+ libftp_la_OBJECTS =  ftp-method.lo
  libvfs_pipe_la_DEPENDENCIES = 
+ libvfs_pipe_la_OBJECTS =  pipe-method.lo
+ libvfs_translate_la_DEPENDENCIES = 
+ libvfs_translate_la_OBJECTS =  translate-method.lo
+-libvefs_la_LDFLAGS = 
++libvefs_la_LDFLAGS = $(module_flags)
+ @HAVE_LIBEFS_TRUE@libvefs_la_DEPENDENCIES = 
+ @HAVE_LIBEFS_TRUE@libvefs_la_OBJECTS =  efs-method.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 9b0008727408..4693bda125fd 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -82,6 +82,7 @@ lib/vfs/modules/libftp.so
 lib/vfs/modules/libgconf.so
 lib/vfs/modules/libgzip.so
 lib/vfs/modules/libhttp.so
+lib/vfs/modules/libvefs.so
 lib/vfs/modules/libvfs-pipe.so
 lib/vfs/modules/libvfs-translate.so
 share/gnome/apps/Settings/nautilus-mime-type.desktop
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>
diff --git a/games/glife/Makefile b/games/glife/Makefile
index d22614c532d2..4865f48f449b 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -25,4 +25,11 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 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/graphics/eog/Makefile b/graphics/eog/Makefile
index b2c38a7e34b6..299c00ec8355 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -26,4 +26,11 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 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/graphics/eog2/Makefile b/graphics/eog2/Makefile
index b2c38a7e34b6..299c00ec8355 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -26,4 +26,11 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 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/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index 9b3795744c6f..28f05f06f966 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -28,4 +28,11 @@ CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 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/news/pan/Makefile b/news/pan/Makefile
index 0f9df8ffd037..567df59f9183 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -30,4 +30,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib -luu"
 
+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/news/pan/files/patch-ag b/news/pan/files/patch-ag
index 2da6709bc5d3..92dbb4022ab7 100644
--- a/news/pan/files/patch-ag
+++ b/news/pan/files/patch-ag
@@ -1,16 +1,8 @@
 --- Makefile.in.orig	Thu May 18 02:27:35 2000
 +++ Makefile.in	Tue Jun 13 17:15:02 2000
-@@ -111,11 +111,11 @@
+@@ -111,4 +111,4 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
 -SUBDIRS = macros po intl uulib pan docs
-+SUBDIRS = macros po intl pan docs
- 
- EXTRA_DIST = CREDITS ChangeLog pan.desktop pan.spec pan.png
- 
--Productivitydir = $(datadir)/gnome/apps/Internet
-+Productivitydir = $(datadir)/apps/Internet
- Productivity_DATA = pan.desktop
- 
- icon_DATA = pan.png
++SUBDIRS = macros po pan docs
diff --git a/news/pan/files/patch-ah b/news/pan/files/patch-ah
index 30528e35151a..014f34bb831f 100644
--- a/news/pan/files/patch-ah
+++ b/news/pan/files/patch-ah
@@ -1,29 +1,8 @@
 --- pan/Makefile.in.orig	Thu May 18 02:27:48 2000
 +++ pan/Makefile.in	Tue Jun 13 17:07:18 2000
-@@ -115,7 +115,7 @@
- 
- SUBDIRS = dialogs xpm
- 
--INCLUDES =  	-I$(top_srcdir) 					-I$(top_srcdir)/uulib 					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DLOCALEDIR=\"$(datadir)/locale\" 			$(GNOME_INCLUDEDIR) 					$(GLIB_CFLAGS) 						@CPPFLAGS@
-+INCLUDES =  	-I$(top_srcdir) 									-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DLOCALEDIR=\"$(prefix)/share/locale\" 			$(GNOME_INCLUDEDIR) 					$(GLIB_CFLAGS) 						@CPPFLAGS@
- 
- 
- bin_PROGRAMS = pan
-@@ -123,7 +123,7 @@
- pan_SOURCES =  	acache.c acache.h 				article.c article.h 				article-toolbar.c article-toolbar.h 		article-find.c article-find.h 			article-db.c article-db.h 			article-thread.c article-thread.h 		articlelist.c articlelist.h 			date.c date.h 					debug.c debug.h 				decode.c decode.h 				folder.c folder.h 				folderlist.c folderlist.h 			fnmatch.c fnmatch.h 				globals.h					group.c group.h 				grouplist.c grouplist.h 			gui.c gui.h 					gui-notebook.c gui-notebook.h 			gui-paned.c gui-paned.h 			log.c log.h 					message.c message.h 				message-filter.c message-filter.h 		message-send.c message-send.h 			message-window.c message-window.h 		msort.c 					nntp.c nntp.h 					pan.c pan.h 					pan-callback.c pan-callback.h 			pan-db.c pan-db.h 				pan-object.c pan-object.h 			prefs.c prefs.h 				print.c print.h 				queue.c queue.h 				task.c task.h 					task-bodies.c task-bodies.h 			task-body.c task-body.h 			task-decode.c task-decode.h 			task-grouplist.c task-grouplist.h 		task-headers.c task-headers.h 			task-send.c task-send.h 			task-manager.c task-manager.h 			rfc822.c rfc822.h 				save.c save.h 					server.c server.h 				smtp.c smtp.h 					sockets.c sockets.h 				status-item.c status-item.h 			status-item-view.c status-item-view.h 		text.c text.h 					util.c util.h
- 
- 
+@@ -126,1 +126,1 @@
 -pan_LDADD =  	dialogs/libdialogs.a 			$(INTLLIBS) 				$(GNOMEUI_LIBS) 			$(GNOME_LIBDIR) 			$(GLIB_LIBS) 				$(top_builddir)/uulib/libuu.a
 +pan_LDADD =  	dialogs/libdialogs.a 			$(INTLLIBS) 				$(GNOMEUI_LIBS) 			$(GNOME_LIBDIR) 			$(GLIB_LIBS) 				
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-@@ -144,7 +144,7 @@
- task-body.o task-decode.o task-grouplist.o task-headers.o task-send.o \
- task-manager.o rfc822.o save.o server.o smtp.o sockets.o status-item.o \
- status-item-view.o text.o util.o
+@@ -147,1 +147,1 @@
 -pan_DEPENDENCIES =  dialogs/libdialogs.a $(top_builddir)/uulib/libuu.a
 +pan_DEPENDENCIES =  dialogs/libdialogs.a 
- pan_LDFLAGS = 
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/news/pan2/Makefile b/news/pan2/Makefile
index 0f9df8ffd037..567df59f9183 100644
--- a/news/pan2/Makefile
+++ b/news/pan2/Makefile
@@ -30,4 +30,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib -luu"
 
+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/news/pan2/files/patch-ag b/news/pan2/files/patch-ag
index 2da6709bc5d3..92dbb4022ab7 100644
--- a/news/pan2/files/patch-ag
+++ b/news/pan2/files/patch-ag
@@ -1,16 +1,8 @@
 --- Makefile.in.orig	Thu May 18 02:27:35 2000
 +++ Makefile.in	Tue Jun 13 17:15:02 2000
-@@ -111,11 +111,11 @@
+@@ -111,4 +111,4 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
 -SUBDIRS = macros po intl uulib pan docs
-+SUBDIRS = macros po intl pan docs
- 
- EXTRA_DIST = CREDITS ChangeLog pan.desktop pan.spec pan.png
- 
--Productivitydir = $(datadir)/gnome/apps/Internet
-+Productivitydir = $(datadir)/apps/Internet
- Productivity_DATA = pan.desktop
- 
- icon_DATA = pan.png
++SUBDIRS = macros po pan docs
diff --git a/news/pan2/files/patch-ah b/news/pan2/files/patch-ah
index 30528e35151a..014f34bb831f 100644
--- a/news/pan2/files/patch-ah
+++ b/news/pan2/files/patch-ah
@@ -1,29 +1,8 @@
 --- pan/Makefile.in.orig	Thu May 18 02:27:48 2000
 +++ pan/Makefile.in	Tue Jun 13 17:07:18 2000
-@@ -115,7 +115,7 @@
- 
- SUBDIRS = dialogs xpm
- 
--INCLUDES =  	-I$(top_srcdir) 					-I$(top_srcdir)/uulib 					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DLOCALEDIR=\"$(datadir)/locale\" 			$(GNOME_INCLUDEDIR) 					$(GLIB_CFLAGS) 						@CPPFLAGS@
-+INCLUDES =  	-I$(top_srcdir) 									-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DLOCALEDIR=\"$(prefix)/share/locale\" 			$(GNOME_INCLUDEDIR) 					$(GLIB_CFLAGS) 						@CPPFLAGS@
- 
- 
- bin_PROGRAMS = pan
-@@ -123,7 +123,7 @@
- pan_SOURCES =  	acache.c acache.h 				article.c article.h 				article-toolbar.c article-toolbar.h 		article-find.c article-find.h 			article-db.c article-db.h 			article-thread.c article-thread.h 		articlelist.c articlelist.h 			date.c date.h 					debug.c debug.h 				decode.c decode.h 				folder.c folder.h 				folderlist.c folderlist.h 			fnmatch.c fnmatch.h 				globals.h					group.c group.h 				grouplist.c grouplist.h 			gui.c gui.h 					gui-notebook.c gui-notebook.h 			gui-paned.c gui-paned.h 			log.c log.h 					message.c message.h 				message-filter.c message-filter.h 		message-send.c message-send.h 			message-window.c message-window.h 		msort.c 					nntp.c nntp.h 					pan.c pan.h 					pan-callback.c pan-callback.h 			pan-db.c pan-db.h 				pan-object.c pan-object.h 			prefs.c prefs.h 				print.c print.h 				queue.c queue.h 				task.c task.h 					task-bodies.c task-bodies.h 			task-body.c task-body.h 			task-decode.c task-decode.h 			task-grouplist.c task-grouplist.h 		task-headers.c task-headers.h 			task-send.c task-send.h 			task-manager.c task-manager.h 			rfc822.c rfc822.h 				save.c save.h 					server.c server.h 				smtp.c smtp.h 					sockets.c sockets.h 				status-item.c status-item.h 			status-item-view.c status-item-view.h 		text.c text.h 					util.c util.h
- 
- 
+@@ -126,1 +126,1 @@
 -pan_LDADD =  	dialogs/libdialogs.a 			$(INTLLIBS) 				$(GNOMEUI_LIBS) 			$(GNOME_LIBDIR) 			$(GLIB_LIBS) 				$(top_builddir)/uulib/libuu.a
 +pan_LDADD =  	dialogs/libdialogs.a 			$(INTLLIBS) 				$(GNOMEUI_LIBS) 			$(GNOME_LIBDIR) 			$(GLIB_LIBS) 				
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-@@ -144,7 +144,7 @@
- task-body.o task-decode.o task-grouplist.o task-headers.o task-send.o \
- task-manager.o rfc822.o save.o server.o smtp.o sockets.o status-item.o \
- status-item-view.o text.o util.o
+@@ -147,1 +147,1 @@
 -pan_DEPENDENCIES =  dialogs/libdialogs.a $(top_builddir)/uulib/libuu.a
 +pan_DEPENDENCIES =  dialogs/libdialogs.a 
- pan_LDFLAGS = 
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index f83c7c1dbf97..9511b3a735ff 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -31,4 +31,11 @@ CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
 		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/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/palm/gnome-pilot-conduits/files/patch-ab b/palm/gnome-pilot-conduits/files/patch-ab
index ad0c57d652ee..485d8e8571fb 100644
--- a/palm/gnome-pilot-conduits/files/patch-ab
+++ b/palm/gnome-pilot-conduits/files/patch-ab
@@ -1,14 +1,5 @@
 --- mal-conduit/src/Makefile.in.orig	Wed May 10 01:26:11 2000
 +++ mal-conduit/src/Makefile.in	Tue May 16 17:07:16 2000
-@@ -147,7 +147,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = mal-conduit-control-applet.desktop
- 
--panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
- panelConduits_DATA = $(ccenterConduits_DATA)
- 
- Conduitsdir = $(datadir)/gnome-pilot/conduits/
 @@ -168,7 +168,7 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 15d84b4cd5ab..7ab9f2b77cfa 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -35,4 +35,11 @@ CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
 		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/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/palm/gnome-pilot/files/patch-aa b/palm/gnome-pilot/files/patch-aa
index ac2b97677a29..4f02722e0dea 100644
--- a/palm/gnome-pilot/files/patch-aa
+++ b/palm/gnome-pilot/files/patch-aa
@@ -22,24 +22,6 @@
  		
  		
  	else
-@@ -2676,7 +2676,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIB="-lc_r"
-+  PTHREAD_LIB=""
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -4591,7 +4591,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -5915,8 +5915,8 @@
  fi
  
diff --git a/palm/gnome-pilot/files/patch-ai b/palm/gnome-pilot/files/patch-ai
index 542aa22a4842..541117e39c51 100644
--- a/palm/gnome-pilot/files/patch-ai
+++ b/palm/gnome-pilot/files/patch-ai
@@ -1,14 +1,5 @@
 --- conduits/backup/Makefile.in.orig	Wed May 10 00:03:11 2000
 +++ conduits/backup/Makefile.in	Tue May 16 16:47:08 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = backup-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -20,15 +11,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/email/Makefile.in.orig	Wed May 10 00:03:11 2000
 +++ conduits/email/Makefile.in	Tue May 16 16:47:11 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = email-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -40,15 +22,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/expense/Makefile.in.orig	Wed May 10 00:03:13 2000
 +++ conduits/expense/Makefile.in	Tue May 16 16:47:14 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = expense-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -60,15 +33,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/file/Makefile.in.orig	Wed May 10 00:03:10 2000
 +++ conduits/file/Makefile.in	Tue May 16 16:47:17 2000
-@@ -181,7 +181,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = file-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -202,7 +202,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -80,15 +44,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/memo_file/Makefile.in.orig	Wed May 10 00:03:12 2000
 +++ conduits/memo_file/Makefile.in	Tue May 16 16:47:20 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = memo_file_capplet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile
index f83c7c1dbf97..9511b3a735ff 100644
--- a/palm/gnomepilot-conduits/Makefile
+++ b/palm/gnomepilot-conduits/Makefile
@@ -31,4 +31,11 @@ CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
 		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/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/palm/gnomepilot-conduits/files/patch-ab b/palm/gnomepilot-conduits/files/patch-ab
index ad0c57d652ee..485d8e8571fb 100644
--- a/palm/gnomepilot-conduits/files/patch-ab
+++ b/palm/gnomepilot-conduits/files/patch-ab
@@ -1,14 +1,5 @@
 --- mal-conduit/src/Makefile.in.orig	Wed May 10 01:26:11 2000
 +++ mal-conduit/src/Makefile.in	Tue May 16 17:07:16 2000
-@@ -147,7 +147,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = mal-conduit-control-applet.desktop
- 
--panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
- panelConduits_DATA = $(ccenterConduits_DATA)
- 
- Conduitsdir = $(datadir)/gnome-pilot/conduits/
 @@ -168,7 +168,7 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index f83c7c1dbf97..9511b3a735ff 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -31,4 +31,11 @@ CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
 		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/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/palm/gnomepilot-conduits2/files/patch-ab b/palm/gnomepilot-conduits2/files/patch-ab
index ad0c57d652ee..485d8e8571fb 100644
--- a/palm/gnomepilot-conduits2/files/patch-ab
+++ b/palm/gnomepilot-conduits2/files/patch-ab
@@ -1,14 +1,5 @@
 --- mal-conduit/src/Makefile.in.orig	Wed May 10 01:26:11 2000
 +++ mal-conduit/src/Makefile.in	Tue May 16 17:07:16 2000
-@@ -147,7 +147,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = mal-conduit-control-applet.desktop
- 
--panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits
- panelConduits_DATA = $(ccenterConduits_DATA)
- 
- Conduitsdir = $(datadir)/gnome-pilot/conduits/
 @@ -168,7 +168,7 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index 15d84b4cd5ab..7ab9f2b77cfa 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -35,4 +35,11 @@ CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
 		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/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/palm/gnomepilot/files/patch-aa b/palm/gnomepilot/files/patch-aa
index ac2b97677a29..4f02722e0dea 100644
--- a/palm/gnomepilot/files/patch-aa
+++ b/palm/gnomepilot/files/patch-aa
@@ -22,24 +22,6 @@
  		
  		
  	else
-@@ -2676,7 +2676,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIB="-lc_r"
-+  PTHREAD_LIB=""
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -4591,7 +4591,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -5915,8 +5915,8 @@
  fi
  
diff --git a/palm/gnomepilot/files/patch-ai b/palm/gnomepilot/files/patch-ai
index 542aa22a4842..541117e39c51 100644
--- a/palm/gnomepilot/files/patch-ai
+++ b/palm/gnomepilot/files/patch-ai
@@ -1,14 +1,5 @@
 --- conduits/backup/Makefile.in.orig	Wed May 10 00:03:11 2000
 +++ conduits/backup/Makefile.in	Tue May 16 16:47:08 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = backup-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -20,15 +11,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/email/Makefile.in.orig	Wed May 10 00:03:11 2000
 +++ conduits/email/Makefile.in	Tue May 16 16:47:11 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = email-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -40,15 +22,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/expense/Makefile.in.orig	Wed May 10 00:03:13 2000
 +++ conduits/expense/Makefile.in	Tue May 16 16:47:14 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = expense-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -60,15 +33,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/file/Makefile.in.orig	Wed May 10 00:03:10 2000
 +++ conduits/file/Makefile.in	Tue May 16 16:47:17 2000
-@@ -181,7 +181,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = file-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -202,7 +202,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -80,15 +44,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/memo_file/Makefile.in.orig	Wed May 10 00:03:12 2000
 +++ conduits/memo_file/Makefile.in	Tue May 16 16:47:20 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = memo_file_capplet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 15d84b4cd5ab..7ab9f2b77cfa 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -35,4 +35,11 @@ CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \
 		LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/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/palm/gnomepilot2/files/patch-aa b/palm/gnomepilot2/files/patch-aa
index ac2b97677a29..4f02722e0dea 100644
--- a/palm/gnomepilot2/files/patch-aa
+++ b/palm/gnomepilot2/files/patch-aa
@@ -22,24 +22,6 @@
  		
  		
  	else
-@@ -2676,7 +2676,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIB="-lc_r"
-+  PTHREAD_LIB=""
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -4591,7 +4591,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
 @@ -5915,8 +5915,8 @@
  fi
  
diff --git a/palm/gnomepilot2/files/patch-ai b/palm/gnomepilot2/files/patch-ai
index 542aa22a4842..541117e39c51 100644
--- a/palm/gnomepilot2/files/patch-ai
+++ b/palm/gnomepilot2/files/patch-ai
@@ -1,14 +1,5 @@
 --- conduits/backup/Makefile.in.orig	Wed May 10 00:03:11 2000
 +++ conduits/backup/Makefile.in	Tue May 16 16:47:08 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = backup-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -20,15 +11,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/email/Makefile.in.orig	Wed May 10 00:03:11 2000
 +++ conduits/email/Makefile.in	Tue May 16 16:47:11 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = email-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -40,15 +22,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/expense/Makefile.in.orig	Wed May 10 00:03:13 2000
 +++ conduits/expense/Makefile.in	Tue May 16 16:47:14 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = expense-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -60,15 +33,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/file/Makefile.in.orig	Wed May 10 00:03:10 2000
 +++ conduits/file/Makefile.in	Tue May 16 16:47:17 2000
-@@ -181,7 +181,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = file-conduit-control-applet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -202,7 +202,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
@@ -80,15 +44,6 @@
  PROGRAMS =  $(bin_PROGRAMS)
 --- conduits/memo_file/Makefile.in.orig	Wed May 10 00:03:12 2000
 +++ conduits/memo_file/Makefile.in	Tue May 16 16:47:20 2000
-@@ -176,7 +176,7 @@
- ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
- ccenterConduits_DATA = memo_file_capplet.desktop
- 
--paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-+paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
- panel_DATA = $(ccenterConduits_DATA)
- 
- Conduitdir = $(datadir)/gnome-pilot/conduits/
 @@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index d68c87b622f5..8344b03c9b03 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		wwwzip.1:${PORTSDIR}/www/libwww \
-		gconf.8:${PORTSDIR}/devel/gconf
+		gconf-1.0:${PORTSDIR}/devel/gconf
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -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/www/gtkhtml/files/patch-ad b/www/gtkhtml/files/patch-ad
new file mode 100644
index 000000000000..4ce5c2dc4b59
--- /dev/null
+++ b/www/gtkhtml/files/patch-ad
@@ -0,0 +1,14 @@
+--- src/gtkhtml.c.orig	Mon Jul 10 17:52:30 2000
++++ src/gtkhtml.c	Wed Aug  2 15:38:46 2000
+@@ -1130,3 +1130,3 @@
+ 	if (gconf_is_initialized ()) {
+-		gconf_client = gconf_client_new ();
++		gconf_client = gconf_client_get_default ();
+ 		if (!gconf_client)
+--- capplet/main.c.orig	Mon Jun 19 16:33:41 2000
++++ capplet/main.c	Wed Aug  2 15:40:19 2000
+@@ -197,3 +197,3 @@
+ 
+-	client = gconf_client_new ();
++	client = gconf_client_get_default ();
+ 	gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index d68c87b622f5..8344b03c9b03 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		wwwzip.1:${PORTSDIR}/www/libwww \
-		gconf.8:${PORTSDIR}/devel/gconf
+		gconf-1.0:${PORTSDIR}/devel/gconf
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -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/www/gtkhtml3/files/patch-ad b/www/gtkhtml3/files/patch-ad
new file mode 100644
index 000000000000..4ce5c2dc4b59
--- /dev/null
+++ b/www/gtkhtml3/files/patch-ad
@@ -0,0 +1,14 @@
+--- src/gtkhtml.c.orig	Mon Jul 10 17:52:30 2000
++++ src/gtkhtml.c	Wed Aug  2 15:38:46 2000
+@@ -1130,3 +1130,3 @@
+ 	if (gconf_is_initialized ()) {
+-		gconf_client = gconf_client_new ();
++		gconf_client = gconf_client_get_default ();
+ 		if (!gconf_client)
+--- capplet/main.c.orig	Mon Jun 19 16:33:41 2000
++++ capplet/main.c	Wed Aug  2 15:40:19 2000
+@@ -197,3 +197,3 @@
+ 
+-	client = gconf_client_new ();
++	client = gconf_client_get_default ();
+ 	gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index d68c87b622f5..8344b03c9b03 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		wwwzip.1:${PORTSDIR}/www/libwww \
-		gconf.8:${PORTSDIR}/devel/gconf
+		gconf-1.0:${PORTSDIR}/devel/gconf
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -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/www/gtkhtml38/files/patch-ad b/www/gtkhtml38/files/patch-ad
new file mode 100644
index 000000000000..4ce5c2dc4b59
--- /dev/null
+++ b/www/gtkhtml38/files/patch-ad
@@ -0,0 +1,14 @@
+--- src/gtkhtml.c.orig	Mon Jul 10 17:52:30 2000
++++ src/gtkhtml.c	Wed Aug  2 15:38:46 2000
+@@ -1130,3 +1130,3 @@
+ 	if (gconf_is_initialized ()) {
+-		gconf_client = gconf_client_new ();
++		gconf_client = gconf_client_get_default ();
+ 		if (!gconf_client)
+--- capplet/main.c.orig	Mon Jun 19 16:33:41 2000
++++ capplet/main.c	Wed Aug  2 15:40:19 2000
+@@ -197,3 +197,3 @@
+ 
+-	client = gconf_client_new ();
++	client = gconf_client_get_default ();
+ 	gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index d68c87b622f5..8344b03c9b03 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	bonobo.2:${PORTSDIR}/devel/bonobo \
 		wwwzip.1:${PORTSDIR}/www/libwww \
-		gconf.8:${PORTSDIR}/devel/gconf
+		gconf-1.0:${PORTSDIR}/devel/gconf
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -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/www/libgtkhtml/files/patch-ad b/www/libgtkhtml/files/patch-ad
new file mode 100644
index 000000000000..4ce5c2dc4b59
--- /dev/null
+++ b/www/libgtkhtml/files/patch-ad
@@ -0,0 +1,14 @@
+--- src/gtkhtml.c.orig	Mon Jul 10 17:52:30 2000
++++ src/gtkhtml.c	Wed Aug  2 15:38:46 2000
+@@ -1130,3 +1130,3 @@
+ 	if (gconf_is_initialized ()) {
+-		gconf_client = gconf_client_new ();
++		gconf_client = gconf_client_get_default ();
+ 		if (!gconf_client)
+--- capplet/main.c.orig	Mon Jun 19 16:33:41 2000
++++ capplet/main.c	Wed Aug  2 15:40:19 2000
+@@ -197,3 +197,3 @@
+ 
+-	client = gconf_client_new ();
++	client = gconf_client_get_default ();
+ 	gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index c7c613af7ec6..50911a02c15c 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -26,4 +26,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
 		GTK_CONFIG="${GTK_CONFIG}"
 
+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>