From 62a9500f51a929484b46085915fd59840586aa35 Mon Sep 17 00:00:00 2001
From: knu <knu@FreeBSD.org>
Date: Tue, 24 Jul 2001 16:13:22 +0000
Subject: Properly make *.so symlinks to *.so.x. (previously all that were
 backwards)

PR:		ports/27065
Submitted by:	Barry Pederson <bpederson@geocities.com>
---
 databases/db46/Makefile       |  2 +-
 databases/db46/files/patch-aa | 26 ++++++++++++++++----------
 databases/db46/files/patch-ab | 21 +++++++++++++++------
 3 files changed, 32 insertions(+), 17 deletions(-)

(limited to 'databases/db46')

diff --git a/databases/db46/Makefile b/databases/db46/Makefile
index f8607cf7e13e..c81eda21e63f 100644
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	db3
 PORTVERSION=	3.2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/${PORTVERSION}/
 DISTNAME=	db-${PORTVERSION}
diff --git a/databases/db46/files/patch-aa b/databases/db46/files/patch-aa
index 1cfea9ed1546..6155cc9b8de3 100644
--- a/databases/db46/files/patch-aa
+++ b/databases/db46/files/patch-aa
@@ -1,5 +1,5 @@
---- ../dist/Makefile.in.orig	Thu Nov 30 21:07:11 2000
-+++ ../dist/Makefile.in	Fri Feb  9 17:47:58 2001
+--- ../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
  
@@ -39,19 +39,25 @@
  
  dmode=	755
  emode=	555
-@@ -452,6 +452,7 @@
+@@ -452,8 +452,8 @@
  	@cd $(libdir) && $(rm) -f \
  	    $(libso_target) $(libso) $(libso_default) $(libso_major)
  	@$(INSTALLER) $(libso_target) $(libdir)
-+	@cd $(libdir) && $(chmod) $(fmode) $(libso)
- 	@cd $(libdir) && $(ln) -s $(libso) $(libso_default)
- 	@cd $(libdir) && $(ln) -s $(libso) $(libso_major)
+-	@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)
-@@ -463,6 +464,7 @@
+ 
+ install_dynamic_cxx:
+@@ -463,8 +463,8 @@
  	@cd $(libdir) && $(rm) -f \
  	    $(libxso_target) $(libxso) $(libxso_default) $(libxso_major)
  	@$(INSTALLER) $(libxso_target) $(libdir)
-+	@cd $(libdir) && $(chmod) $(fmode) $(libxso)
- 	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
- 	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
+-	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
+-	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
++	@cd $(libdir) && $(chmod) $(fmode) $(libxso_major)
++	@cd $(libdir) && $(ln) -s $(libxso_major) $(libxso_default)
  
+ install_tcl:
+ 	@echo "Installing DB Tcl library: $(libdir) ..."
diff --git a/databases/db46/files/patch-ab b/databases/db46/files/patch-ab
index f80e53140f2b..848114a2bbea 100644
--- a/databases/db46/files/patch-ab
+++ b/databases/db46/files/patch-ab
@@ -1,15 +1,24 @@
---- ../dist/configure.orig	Fri Sep 22 19:04:19 2000
-+++ ../dist/configure	Fri Sep 22 19:05:01 2000
-@@ -1599,9 +1599,9 @@
+--- ../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:1601: checking libtool configuration" >&5
+ 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} $ac_aux_dir/ltconfig \
-+		--no-verify $ac_aux_dir/ltmain.sh $target \
++	${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; }
  
+@@ -1644,7 +1644,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} -version-info ${DB_VERSION_MINOR}"
+ 	SOFLAGS="-rpath \$(libdir)"
+ 	o=".lo"
+ fi
-- 
cgit