5 files changed, 55 insertions, 25 deletions

diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab
index 032c7e5eab94..3384f04f7c78 100644
--- a/devel/gconf2/files/patch-ab
+++ b/devel/gconf2/files/patch-ab
@@ -1,19 +1,25 @@
---- Makefile.in.orig	Mon May 14 13:07:48 2001
-+++ Makefile.in	Mon May 21 23:29:41 2001
-@@ -37,3 +37,3 @@
+
+$FreeBSD$
+
+--- Makefile.in	2002/02/15 19:08:06	1.1
++++ Makefile.in	2002/02/15 19:10:01
+@@ -35,7 +35,7 @@
+ DESTDIR =
+ 
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(prefix)/libdata/pkgconfig
  pkgincludedir = $(includedir)/@PACKAGE@
-@@ -144,3 +144,3 @@
  
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(pkglibdir)
- pkgconfig_DATA = gconf.pc gconfgtk.pc
-@@ -476,4 +476,4 @@
+ top_builddir = .
+@@ -450,8 +450,8 @@
+ 
+ 
  install-data-local:
 -	-mkdir -p $(DESTDIR)$(datadir)/aclocal
 -	$(INSTALL_DATA) gconf.m4 $(DESTDIR)$(datadir)/aclocal/gconf-$(MAJOR_VERSION).m4
 +	-mkdir -p $(DESTDIR)$(prefix)/share/aclocal
 +	$(INSTALL_DATA) gconf.m4 $(DESTDIR)$(prefix)/share/aclocal/gconf-$(MAJOR_VERSION).m4
- 	@echo "**** NOTE ****"
+ 	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.defaults
+ 	-chmod 755 $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.defaults
+ 	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.mandatory
diff --git a/devel/gconf2/files/patch-backends::bdb-backend.c b/devel/gconf2/files/patch-backends::bdb-backend.c
index bb839b4e4f52..9c7fa1e3fdd4 100644
--- a/devel/gconf2/files/patch-backends::bdb-backend.c
+++ b/devel/gconf2/files/patch-backends::bdb-backend.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- backends/bdb-backend.c	2001/08/02 17:59:13	1.1
-+++ backends/bdb-backend.c	2001/08/02 18:03:23
-@@ -25,10 +25,9 @@
+--- backends/bdb-backend.c	2002/02/15 19:10:46	1.1
++++ backends/bdb-backend.c	2002/02/15 19:11:25
+@@ -29,10 +29,9 @@
  #include <gconf/gconf-internals.h>
  #include <gconf/gconf.h>
  
diff --git a/devel/gconf2/files/patch-configure b/devel/gconf2/files/patch-configure
index 1e91b12da41c..13d38f0f5156 100644
--- a/devel/gconf2/files/patch-configure
+++ b/devel/gconf2/files/patch-configure
@@ -1,7 +1,14 @@
---- configure.orig	Mon Feb 11 15:20:43 2002
-+++ configure	Mon Feb 11 15:22:24 2002
-@@ -8516,3 +8516,3 @@
+
+$FreeBSD$
+
+--- configure	2002/02/15 19:11:46	1.1
++++ configure	2002/02/15 19:12:30
+@@ -7752,7 +7752,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
  
--for dblib in db-3.3 db-3.2 db-3.1 db-3; do
-+for dblib in db-3.3 db-3.2 db-3.1 db-3 db3; do
-   as_ac_Lib=`echo "ac_cv_lib_$dblib''_db_env_create" | $as_tr_sh`
+-	    for db3libs in "-ldb-3.3" "-ldb-3.2" "-ldb-3.1" "-ldb-3"; do
++	    for db3libs in "-ldb-3.3" "-ldb-3.2" "-ldb-3.1" "-ldb-3" "-ldb3"; do
+ 		if test "x${with_db3_libs}" != "x"; then
+ 			LIBS="$LIBS -L$with_db3_libs $db3libs"
+ 		else
diff --git a/devel/gconf2/files/patch-gconf::gconf-internals.c b/devel/gconf2/files/patch-gconf::gconf-internals.c
index db4e8c961980..cc04f6913284 100644
--- a/devel/gconf2/files/patch-gconf::gconf-internals.c
+++ b/devel/gconf2/files/patch-gconf::gconf-internals.c
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- gconf/gconf-internals.c	2001/11/07 11:27:13	1.1
-+++ gconf/gconf-internals.c	2001/11/07 11:27:52
-@@ -28,6 +28,9 @@
+--- gconf/gconf-internals.c	2002/02/15 19:13:07	1.1
++++ gconf/gconf-internals.c	2002/02/15 19:13:32
+@@ -26,6 +26,9 @@
  #include <string.h>
  #include <sys/stat.h>
  #include <sys/types.h>
diff --git a/devel/gconf2/files/patch-ltmain.sh b/devel/gconf2/files/patch-ltmain.sh
index 98cb05e4ddb3..91713d2306f8 100644
--- a/devel/gconf2/files/patch-ltmain.sh
+++ b/devel/gconf2/files/patch-ltmain.sh
@@ -1,9 +1,26 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -13,7 +30,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.