2 files changed, 48 insertions, 50 deletions

diff --git a/databases/db4/files/patch-aa b/databases/db4/files/patch-aa
index 6155cc9b8de3..9e8c605953ef 100644
--- a/databases/db4/files/patch-aa
+++ b/databases/db4/files/patch-aa
@@ -1,61 +1,72 @@
---- ../dist/Makefile.in.orig	Thu Nov 30 17:07:33 2000
-+++ ../dist/Makefile.in	Tue May 29 11:11:15 2001
-@@ -34,11 +34,11 @@
- libdb=		libdb.a
+--- ../dist/Makefile.in.orig	Sat Jul  7 00:53:16 2001
++++ ../dist/Makefile.in	Wed Jul 25 12:30:33 2001
+@@ -11,7 +11,7 @@
+ bindir=	@bindir@
+ includedir=@includedir@
+ libdir=	@libdir@
+-docdir=	$(prefix)/docs
++docdir=	$(prefix)/share/doc/db3
+ 
+ dmode=	755
+ emode=	555
+@@ -46,6 +46,7 @@
+ SOFLAGS=	@SOFLAGS@
+ SOMAJOR=	@DB_VERSION_MAJOR@
+ SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
++SOMINOR=	@DB_VERSION_MINOR@
+ 
+ ##################################################
+ # C API.
+@@ -62,11 +63,11 @@
  
+ libdb=		libdb.a
  libso_base=	libdb
--libso_linkname=	$(libso_base)-$(SOVERSION).la
 -libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
+-libso_static=	$(libso_base)-$(SOVERSION).a
 -libso_target=	$(libso_base)-$(SOVERSION).la
-+libso_linkname=	$(libso_base)$(SOMAJOR).la
-+libso=		$(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso=		$(libso_base)$(SOMAJOR).@SOSUFFIX@.$(SOMINOR)
++libso_static=	$(libso_base)$(SOMAJOR).a
 +libso_target=	$(libso_base)$(SOMAJOR).la
  libso_default=	$(libso_base).@SOSUFFIX@
 -libso_major=	$(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major=	$(libso_base)$(SOMAJOR).@SOSUFFIX@.2
++libso_major=	$(libso_base)$(SOMAJOR).@SOSUFFIX@.3
  
  ##################################################
- # C++
-@@ -49,10 +49,10 @@
- ##################################################
+ # C++ API.
+@@ -80,11 +81,11 @@
+ 
  libcxx=		libdb_cxx.a
  libxso_base=	libdb_cxx
 -libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
+-libxso_static=	$(libxso_base)-$(SOVERSION).a
 -libxso_target=	$(libxso_base)-$(SOVERSION).la
-+libxso=		$(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso=		$(libxso_base)$(SOMAJOR).@SOSUFFIX@.$(SOMINOR)
++libxso_static=	$(libxso_base)$(SOMAJOR).a
 +libxso_target=	$(libxso_base)$(SOMAJOR).la
  libxso_default=	$(libxso_base).@SOSUFFIX@
 -libxso_major=	$(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major=	$(libxso_base)$(SOMAJOR).@SOSUFFIX@.2
++libxso_major=	$(libxso_base)$(SOMAJOR).@SOSUFFIX@.3
  
  ##################################################
- # JAVA
-@@ -115,7 +115,7 @@
- bindir=	@bindir@
- includedir=@includedir@
- libdir=	@libdir@
--docdir=	$(prefix)/docs
-+docdir=	$(prefix)/share/doc/db3
- 
- dmode=	755
- emode=	555
-@@ -452,8 +452,8 @@
+ # Java API.
+@@ -401,8 +402,8 @@
  	@cd $(libdir) && $(rm) -f \
- 	    $(libso_target) $(libso) $(libso_default) $(libso_major)
+ 	    $(libso) $(libso_target) $(libso_default) $(libso_major)
  	@$(INSTALLER) $(libso_target) $(libdir)
 -	@cd $(libdir) && $(ln) -s $(libso) $(libso_default)
 -	@cd $(libdir) && $(ln) -s $(libso) $(libso_major)
 +	@cd $(libdir) && $(chmod) $(fmode) $(libso_major)
 +	@cd $(libdir) && $(ln) -s $(libso_major) $(libso_default)
  	@$(LIBTOOL) --mode=finish $(libdir)
+ 	@cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target)
  
- install_dynamic_cxx:
-@@ -463,8 +463,8 @@
+@@ -421,9 +422,8 @@
  	@cd $(libdir) && $(rm) -f \
- 	    $(libxso_target) $(libxso) $(libxso_default) $(libxso_major)
+ 	    $(libxso) $(libxso_target) $(libxso_default) $(libxso_major)
  	@$(INSTALLER) $(libxso_target) $(libdir)
 -	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
 -	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
+-	@cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target)
 +	@cd $(libdir) && $(chmod) $(fmode) $(libxso_major)
 +	@cd $(libdir) && $(ln) -s $(libxso_major) $(libxso_default)
  
diff --git a/databases/db4/files/patch-ab b/databases/db4/files/patch-ab
index 848114a2bbea..a0540aa02b83 100644
--- a/databases/db4/files/patch-ab
+++ b/databases/db4/files/patch-ab
@@ -1,24 +1,11 @@
---- ../dist/configure.orig	Tue May 29 10:55:53 2001
-+++ ../dist/configure	Tue May 29 11:07:37 2001
-@@ -1626,9 +1626,9 @@
- 	echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
- echo "configure:1628: checking libtool configuration" >&5
- 	echo "$ac_t""" 1>&6
--	${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
--		--no-verify $srcdir/ltmain.sh \
--		--output=./libtool $host_os \
-+	${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig \
-+		--no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $target \
-+		--output=./libtool \
- 		--disable-static \
- 	|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+--- ../dist/configure.orig	Wed Jul 25 12:37:05 2001
++++ ../dist/configure	Wed Jul 25 12:37:16 2001
+@@ -8449,7 +8449,7 @@
+ MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
+ MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${SAVE_CXX}"
  
-@@ -1644,7 +1644,7 @@
+-SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
++SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -version-info ${DB_VERSION_MINOR}"
+ INSTALLER="\$(LIBTOOL) --mode=install cp"
  
- 	INSTALLER="\$(LIBTOOL) --mode=install cp"
- 	POSTLINK="\$(LIBTOOL) --mode=execute true"
--	SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
-+	SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -version-info ${DB_VERSION_MINOR}"
- 	SOFLAGS="-rpath \$(libdir)"
- 	o=".lo"
- fi
+ # Configure for shared libraries, static libraries, or both.  If both are