Build a shared library version as well...

5 files changed, 125 insertions, 29 deletions

diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 9cf7bb44f21..2230367f8d2 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/21 15:56:01 fvdl Exp $
+# $NetBSD: Makefile,v 1.6 2001/03/26 19:31:55 skrll Exp $
 
 DISTNAME=	db-3.2.9
 PKGNAME=	db3-2.9
@@ -9,16 +9,16 @@ MAINTAINER=	wrstuden@netbsd.org
 HOMEPAGE=	http://www.sleepycat.com/
 COMMENT=	Sleepycat Software's Berkeley DB version 3
 
-#USE_LIBTOOL=		yes
-#LTCONFIG_OVERRIDE=	${WRKDIR}/${DISTNAME}/dist/ltconfig
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKDIR}/${DISTNAME}/dist/ltconfig
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 
-CONFIGURE_ARGS+= --program-transform-name=s,db_,db3_,
-CONFIGURE_ARGS+= --enable-cxx
-#CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--program-transform-name=s,db_,db3_,
+CONFIGURE_ARGS+=	--enable-cxx
+CONFIGURE_ARGS+=	--enable-shared
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
+WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 
 post-install:
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/db3
diff --git a/databases/db3/files/patch-sum b/databases/db3/files/patch-sum
index 4b8874934ee..35722a0abbd 100644
--- a/databases/db3/files/patch-sum
+++ b/databases/db3/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2001/02/21 15:56:02 fvdl Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/26 19:31:56 skrll Exp $
 
-MD5 (patch-aa) = dd71cf01b3f5d6ebcaddd0eaef6dfc38
-MD5 (patch-ab) = 9009fe12a469ecc0b6c07684636b70c7
+SHA1 (patch-aa) = acf306f331e81da76be817324e608e69cb957254
+SHA1 (patch-ab) = f8466a1b9eefea0c167934008375e9984fc03ea3
diff --git a/databases/db3/patches/patch-aa b/databases/db3/patches/patch-aa
index 9a99c8f58d7..cfc7ac31ba4 100644
--- a/databases/db3/patches/patch-aa
+++ b/databases/db3/patches/patch-aa
@@ -1,39 +1,59 @@
-$NetBSD: patch-aa,v 1.2 2001/02/21 15:56:02 fvdl Exp $
-
---- ../dist/Makefile.in.orig	Fri Dec  1 00:07:33 2000
-+++ ../dist/Makefile.in	Wed Feb 21 13:10:10 2001
+--- ../dist/Makefile.in.orig	Thu Nov 30 23:07:33 2000
++++ ../dist/Makefile.in	Thu Mar 22 18:34:56 2001
 @@ -17,7 +17,7 @@
  INSTALLER=	@INSTALLER@
  
  LDFLAGS=	@LDFLAGS@
 -LIBDB_ARGS=	@LIBDB_ARGS@
-+LIBDB_ARGS=	-L. -Wl,-R/usr/pkg/lib libdb3.a
++LIBDB_ARGS=	-L. -Wl,-R/usr/pkg/lib libdb3.la
  LIBJSO_LIBS=	@LIBJSO_LIBS@
  LIBS=		@LIBS@
  LIBSO_LIBS=	@LIBSO_LIBS@
-@@ -31,9 +31,9 @@
+@@ -26,19 +26,19 @@
+ LIBXSO_LIBS=	@LIBXSO_LIBS@
+ 
+ POSTLINK=	@POSTLINK@
+-SOLINK=		@SOLINK@
++SOLINK=		@SOLINK@ -version-info @DB_VERSION_MINOR@:@DB_VERSION_PATCH@
+ SOFLAGS=	@SOFLAGS@
  SOMAJOR=	@DB_VERSION_MAJOR@
  SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
  
 -libdb=		libdb.a
-+libdb=		libdb3.a
++libdb=		libdb3.la
  
 -libso_base=	libdb
+-libso_linkname=	$(libso_base)-$(SOVERSION).la
+-libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
+-libso_target=	$(libso_base)-$(SOVERSION).la
 +libso_base=	libdb3
- libso_linkname=	$(libso_base)-$(SOVERSION).la
- libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
- libso_target=	$(libso_base)-$(SOVERSION).la
-@@ -47,8 +47,8 @@
++libso_linkname=	$(libso_base).la
++libso=		$(libso_base).@SOSUFFIX@.$(SOVERSION)
++libso_target=	$(libso_base).la
+ libso_default=	$(libso_base).@SOSUFFIX@
+-libso_major=	$(libso_base)-$(SOMAJOR).@SOSUFFIX@
++libso_major=	$(libso_base).@SOSUFFIX@.$(SOMAJOR)
+ 
+ ##################################################
+ # C++
+@@ -47,12 +47,12 @@
  # You must configure it using:
  #	--enable-cxx
  ##################################################
 -libcxx=		libdb_cxx.a
 -libxso_base=	libdb_cxx
+-libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
+-libxso_target=	$(libxso_base)-$(SOVERSION).la
 +libcxx=		libdb3_cxx.a
 +libxso_base=	libdb3_cxx
- libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
- libxso_target=	$(libxso_base)-$(SOVERSION).la
++libxso=		$(libxso_base).@SOSUFFIX@.$(SOVERSION)
++libxso_target=	$(libxso_base).la
  libxso_default=	$(libxso_base).@SOSUFFIX@
+-libxso_major=	$(libxso_base)-$(SOMAJOR).@SOSUFFIX@
++libxso_major=	$(libxso_base).@SOSUFFIX@.$(SOMAJOR)
+ 
+ ##################################################
+ # JAVA
 @@ -72,8 +72,8 @@
  JAVA_DBDIR=	$(JAVA_SRCDIR)/$(JAVA_DBREL)
  JAVA_EXDIR=	$(JAVA_SRCDIR)/com/sleepycat/examples
@@ -77,7 +97,22 @@ $NetBSD: patch-aa,v 1.2 2001/02/21 15:56:02 fvdl Exp $
  
  JAVA_DBSRCS=\
  	$(JAVA_DBDIR)/Db.java $(JAVA_DBDIR)/DbAppendRecno.java \
-@@ -275,57 +275,57 @@
+@@ -230,14 +230,6 @@
+ ##################################################
+ all:	@DEFAULT_LIB@ @ADDITIONAL_LIBS@ @ADDITIONAL_LANG@ $(PROGS)
+ 
+-$(libdb): $(OBJS)
+-	$(ar) $@ $(OBJS)
+-	test ! -f $(ranlib) || $(ranlib) $@
+-
+-$(libcxx): $(COBJS) $(OBJS)
+-	$(ar) $@ $(COBJS) $(OBJS)
+-	test ! -f $(ranlib) || $(ranlib) $@
+-
+ $(libso_target): $(OBJS)
+ 	$(SOLINK) $(SOFLAGS) -o $(libso_target) \
+ 	    $(OBJS) $(LDFLAGS) $(LIBSO_LIBS)
+@@ -275,57 +267,57 @@
  ##################################################
  # Utilities
  ##################################################
@@ -147,3 +182,40 @@ $NetBSD: patch-aa,v 1.2 2001/02/21 15:56:02 fvdl Exp $
  	$(CCLINK) -o $@ $(LDFLAGS) \
  	    db_verify@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
  	$(POSTLINK) $@
+@@ -452,8 +444,6 @@
+ 	@cd $(libdir) && $(rm) -f \
+ 	    $(libso_target) $(libso) $(libso_default) $(libso_major)
+ 	@$(INSTALLER) $(libso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libso) $(libso_default)
+-	@cd $(libdir) && $(ln) -s $(libso) $(libso_major)
+ 	@$(LIBTOOL) --mode=finish $(libdir)
+ 
+ install_dynamic_cxx:
+@@ -463,8 +453,6 @@
+ 	@cd $(libdir) && $(rm) -f \
+ 	    $(libxso_target) $(libxso) $(libxso_default) $(libxso_major)
+ 	@$(INSTALLER) $(libxso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
+-	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
+ 
+ install_tcl:
+ 	@echo "Installing DB Tcl library: $(libdir) ..."
+@@ -473,8 +461,6 @@
+ 	@cd $(libdir) && $(rm) -f \
+ 	    $(libtso_target) $(libtso) $(libtso_default) $(libtso_major)
+ 	@$(INSTALLER) $(libtso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libtso) $(libtso_default)
+-	@cd $(libdir) && $(ln) -s $(libtso) $(libtso_major)
+ 
+ install_java:
+ 	@echo "Installing DB Java library: $(libdir) ..."
+@@ -483,9 +469,6 @@
+ 	@cd $(libdir) && $(rm) -f \
+ 	    $(libjso_target) $(libjso) $(libjso_default) $(libjso_major)
+ 	@$(INSTALLER) $(libjso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libjso) $(libjso_default)
+-	@cd $(libdir) && $(ln) -s $(libjso) $(libjso_major)
+-	@cd $(libdir) && $(ln) -s $(libjso) $(libjso_g)
+ 	@$(cp) $(JAVA_CLASSTOP)/$(libj_jarfile) $(libdir)
+ 
+ install_utilities:
diff --git a/databases/db3/patches/patch-ab b/databases/db3/patches/patch-ab
index f520022ee6c..1000b07af44 100644
--- a/databases/db3/patches/patch-ab
+++ b/databases/db3/patches/patch-ab
@@ -1,7 +1,5 @@
-$NetBSD: patch-ab,v 1.1 2001/02/21 15:56:02 fvdl Exp $
-
---- ../dist/configure.orig	Wed Jan 24 16:16:18 2001
-+++ ../dist/configure	Wed Feb 21 14:59:15 2001
+--- ../dist/configure.orig	Wed Jan 24 15:16:18 2001
++++ ../dist/configure	Thu Mar 22 17:36:06 2001
 @@ -1605,6 +1605,7 @@
  if test "$GXX" = "yes"; then
  	CXXVERSION=`${MAKEFILE_CXX} --version`
@@ -10,3 +8,21 @@ $NetBSD: patch-ab,v 1.1 2001/02/21 15:56:02 fvdl Exp $
  	1.*|2.[01234567].*|*-1.*|*-2.[01234567].* )
  		CXXFLAGS="-fhandle-exceptions $CXXFLAGS";;
  	* )	CXXFLAGS="-fexceptions $CXXFLAGS";;
+@@ -1632,7 +1633,7 @@
+ 		--disable-static \
+ 	|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+-	SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/' ./libtool`
++	SOSUFFIX=`./libtool --config | sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/'`
+ 	DEFAULT_LIB="\$(libso_target)"
+ 	DEFAULT_INSTALL="install_dynamic"
+ 	LIBDB_ARGS="\$(libso_linkname)"
+@@ -1644,7 +1645,7 @@
+ 
+ 	INSTALLER="\$(LIBTOOL) --mode=install cp"
+ 	POSTLINK="\$(LIBTOOL) --mode=execute true"
+-	SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
++	SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
+ 	SOFLAGS="-rpath \$(libdir)"
+ 	o=".lo"
+ fi
diff --git a/databases/db3/pkg/PLIST b/databases/db3/pkg/PLIST
index 3d19aa85576..e63a1bbacc2 100644
--- a/databases/db3/pkg/PLIST
+++ b/databases/db3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/02/21 15:56:02 fvdl Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/03/26 19:31:56 skrll Exp $
 bin/db3_archive
 bin/db3_upgrade
 bin/db3_stat
@@ -12,7 +12,15 @@ bin/db3_verify
 include/db3/db_cxx.h
 include/db3/db.h
 lib/libdb3.a
+lib/libdb3.la
+lib/libdb3.so
+lib/libdb3.so.2
+lib/libdb3.so.2.9
 lib/libdb3_cxx.a
+lib/libdb3_cxx.la
+lib/libdb3_cxx.so
+lib/libdb3_cxx.so.2
+lib/libdb3_cxx.so.2.9
 share/doc/db3/api_c/c_pindex.html
 share/doc/db3/api_c/db_create.html
 share/doc/db3/api_c/pindex.src