Bring the patch to the newest version so it does not break anymore

2 files changed, 158 insertions, 78 deletions

diff --git a/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch
index 50c2f44a704..97fec46bcef 100644
--- a/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch
+++ b/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch
@@ -1,42 +1,82 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Mon Jun 11 16:09:22 2001
-+++ ../berkeleydb/db-3.2.9.patch	Tue Mar  5 17:13:09 2002
-@@ -43,3 +43,39 @@
+--- ../berkeleydb/db-3.2.9.patch.orig	Mon Mar 18 15:53:40 2002
++++ ../berkeleydb/db-3.2.9.patch	Mon Apr 15 18:43:43 2002
+@@ -47,17 +47,27 @@
+ --- build/unxsols3.pro/db-3.2.9/dist/configure	Tue Jan  8 13:56:05 2002
+ ***************
+ *** 1795,1800 ****
+---- 1795,1802 ----
++--- 1795,1803 ----
+   	case "$host_os" in
+   	solaris*)	JINCSUBDIRS="solaris";;
+   	linux*)		JINCSUBDIRS="linux genunix";;
+ + 	irix*)		JINCSUBDIRS="irix";;
+ +	netbsd*)	JINCSUBDIRS="netbsd linux solaris genunix";;
+++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
+   	*)		JINCSUBDIRS="genunix";;
+   	esac
    
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/configure.orig	Sat Nov 24 14:56:48 2001
-++++ misc/build/db-3.2.9/dist/configure	Sat Nov 24 14:57:32 2001
-+@@ -995,6 +995,7 @@
-+ 	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
-+ 	   LIBS="-lsocket -lsvipc $LIBS";;
-++freebsd*)   optimize_def="-O";;
-+ osf*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ *qnx)	   cat >> confdefs.h <<\EOF
-+ #define HAVE_QNX 1
-+@@ -1795,6 +1796,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd solaris linux genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,12 @@
-+ 
-+   freebsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
+ --- misc/build/db-3.2.9/dist/configure.orig	Sat Nov 24 14:56:48 2001
+ +++ misc/build/db-3.2.9/dist/configure	Sat Nov 24 14:57:32 2001
++@@ -984,7 +984,7 @@
++ 	   optimize_def="-O2"
++ 	   LIBS="-lipc $LIBS";;
++ bsdi*)	   optimize_def="-O2";;
++-freebsd*)  optimize_def="-O2"
+++freebsd*)  optimize_def="-O"
++ 	   CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
++            LIBS="-pthread";;
++ hpux*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ @@ -995,6 +995,7 @@
+  	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+  mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
+@@ -68,13 +78,22 @@
+  #define HAVE_QNX 1
+ --- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
+ +++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
+-@@ -1194,11 +1194,12 @@
++@@ -1194,11 +1194,23 @@
+  
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+--      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+++      # can we support soname and/or expsyms with a.out? -oliva
 ++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ -    else
 ++      need_version=no
-+     fi
-+     ;;
-+ 
+++    fi
+++    ;;
+++
+++  freebsd*)
+++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+        # can we support soname and/or expsyms with a.out? -oliva
+ +    else
+@@ -84,3 +103,24 @@
+      fi
+      ;;
+  
++@@ -2019,6 +2031,20 @@
++     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++     soname_spec='${libname}${release}.so$major'
++     dynamic_linker='NetBSD ld.elf_so'
+++  fi
+++  shlibpath_var=LD_LIBRARY_PATH
+++  ;;
+++
+++freebsd*)
+++  version_type=sunos
+++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+++    dynamic_linker='FreeBSD (a.out) ld.so'
+++  else
+++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+++    soname_spec='${libname}${release}.so$major'
+++    dynamic_linker='FreeBSD ld.elf_so'
++   fi
++   shlibpath_var=LD_LIBRARY_PATH
++   ;;
diff --git a/editors/openoffice.org-1.0/files/patch-berkeleydb::db-3.2.9.patch b/editors/openoffice.org-1.0/files/patch-berkeleydb::db-3.2.9.patch
index 50c2f44a704..97fec46bcef 100644
--- a/editors/openoffice.org-1.0/files/patch-berkeleydb::db-3.2.9.patch
+++ b/editors/openoffice.org-1.0/files/patch-berkeleydb::db-3.2.9.patch
@@ -1,42 +1,82 @@
---- ../berkeleydb/db-3.2.9.patch.orig	Mon Jun 11 16:09:22 2001
-+++ ../berkeleydb/db-3.2.9.patch	Tue Mar  5 17:13:09 2002
-@@ -43,3 +43,39 @@
+--- ../berkeleydb/db-3.2.9.patch.orig	Mon Mar 18 15:53:40 2002
++++ ../berkeleydb/db-3.2.9.patch	Mon Apr 15 18:43:43 2002
+@@ -47,17 +47,27 @@
+ --- build/unxsols3.pro/db-3.2.9/dist/configure	Tue Jan  8 13:56:05 2002
+ ***************
+ *** 1795,1800 ****
+---- 1795,1802 ----
++--- 1795,1803 ----
+   	case "$host_os" in
+   	solaris*)	JINCSUBDIRS="solaris";;
+   	linux*)		JINCSUBDIRS="linux genunix";;
+ + 	irix*)		JINCSUBDIRS="irix";;
+ +	netbsd*)	JINCSUBDIRS="netbsd linux solaris genunix";;
+++	freebsd*)	JINCSUBDIRS="freebsd genunix";;
+   	*)		JINCSUBDIRS="genunix";;
+   	esac
    
-   CC=		@MAKEFILE_CC@
-   CCLINK=		@MAKEFILE_CCLINK@
-+--- misc/build/db-3.2.9/dist/configure.orig	Sat Nov 24 14:56:48 2001
-++++ misc/build/db-3.2.9/dist/configure	Sat Nov 24 14:57:32 2001
-+@@ -995,6 +995,7 @@
-+ 	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
-+ 	   LIBS="-lsocket -lsvipc $LIBS";;
-++freebsd*)   optimize_def="-O";;
-+ osf*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
-+ *qnx)	   cat >> confdefs.h <<\EOF
-+ #define HAVE_QNX 1
-+@@ -1795,6 +1796,7 @@
-+ 	case "$host_os" in
-+ 	solaris*)	JINCSUBDIRS="solaris";;
-+ 	linux*)		JINCSUBDIRS="linux genunix";;
-++	freebsd*)	JINCSUBDIRS="freebsd solaris linux genunix";;
-+ 	*)		JINCSUBDIRS="genunix";;
-+ 	esac
-+ 
-+--- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
-++++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
-+@@ -1194,11 +1194,12 @@
-+ 
-+   freebsd*)
-+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+-    else
-+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
-+       # can we support soname and/or expsyms with a.out? -oliva
+ --- misc/build/db-3.2.9/dist/configure.orig	Sat Nov 24 14:56:48 2001
+ +++ misc/build/db-3.2.9/dist/configure	Sat Nov 24 14:57:32 2001
++@@ -984,7 +984,7 @@
++ 	   optimize_def="-O2"
++ 	   LIBS="-lipc $LIBS";;
++ bsdi*)	   optimize_def="-O2";;
++-freebsd*)  optimize_def="-O2"
+++freebsd*)  optimize_def="-O"
++ 	   CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
++            LIBS="-pthread";;
++ hpux*)	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+ @@ -995,6 +995,7 @@
+  	   CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
+  mpeix*)	   CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS"
+@@ -68,13 +78,22 @@
+  #define HAVE_QNX 1
+ --- misc/build/db-3.2.9/dist/ltconfig.orig	Sat Nov 24 14:56:10 2001
+ +++ misc/build/db-3.2.9/dist/ltconfig	Sat Nov 24 14:56:34 2001
+-@@ -1194,11 +1194,12 @@
++@@ -1194,11 +1194,23 @@
+  
+    netbsd*)
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+--      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+++      # can we support soname and/or expsyms with a.out? -oliva
 ++    else
-++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ -    else
 ++      need_version=no
-+     fi
-+     ;;
-+ 
+++    fi
+++    ;;
+++
+++  freebsd*)
+++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+        # can we support soname and/or expsyms with a.out? -oliva
+ +    else
+@@ -84,3 +103,24 @@
+      fi
+      ;;
+  
++@@ -2019,6 +2031,20 @@
++     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++     soname_spec='${libname}${release}.so$major'
++     dynamic_linker='NetBSD ld.elf_so'
+++  fi
+++  shlibpath_var=LD_LIBRARY_PATH
+++  ;;
+++
+++freebsd*)
+++  version_type=sunos
+++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+++    dynamic_linker='FreeBSD (a.out) ld.so'
+++  else
+++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+++    soname_spec='${libname}${release}.so$major'
+++    dynamic_linker='FreeBSD ld.elf_so'
++   fi
++   shlibpath_var=LD_LIBRARY_PATH
++   ;;