aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/db3/Makefile10
-rw-r--r--databases/db3/files/patch-aa14
-rw-r--r--databases/db3/files/patch-ab15
-rw-r--r--databases/db3/pkg-plist6
-rw-r--r--databases/db33/Makefile10
-rw-r--r--databases/db33/files/patch-aa14
-rw-r--r--databases/db33/files/patch-ab15
-rw-r--r--databases/db33/pkg-plist6
-rw-r--r--databases/db4/Makefile10
-rw-r--r--databases/db4/files/patch-aa14
-rw-r--r--databases/db4/files/patch-ab15
-rw-r--r--databases/db4/pkg-plist6
-rw-r--r--databases/db41/Makefile10
-rw-r--r--databases/db41/files/patch-aa14
-rw-r--r--databases/db41/files/patch-ab15
-rw-r--r--databases/db41/pkg-plist6
-rw-r--r--databases/db42/Makefile10
-rw-r--r--databases/db42/files/patch-aa14
-rw-r--r--databases/db42/files/patch-ab15
-rw-r--r--databases/db42/pkg-plist6
-rw-r--r--databases/db43/Makefile10
-rw-r--r--databases/db43/files/patch-aa14
-rw-r--r--databases/db43/files/patch-ab15
-rw-r--r--databases/db43/pkg-plist6
-rw-r--r--databases/db44/Makefile10
-rw-r--r--databases/db44/files/patch-aa14
-rw-r--r--databases/db44/files/patch-ab15
-rw-r--r--databases/db44/pkg-plist6
-rw-r--r--databases/db45/Makefile10
-rw-r--r--databases/db45/files/patch-aa14
-rw-r--r--databases/db45/files/patch-ab15
-rw-r--r--databases/db45/pkg-plist6
-rw-r--r--databases/db46/Makefile10
-rw-r--r--databases/db46/files/patch-aa14
-rw-r--r--databases/db46/files/patch-ab15
-rw-r--r--databases/db46/pkg-plist6
-rw-r--r--databases/db47/Makefile10
-rw-r--r--databases/db47/files/patch-aa14
-rw-r--r--databases/db47/files/patch-ab15
-rw-r--r--databases/db47/pkg-plist6
40 files changed, 310 insertions, 140 deletions
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db3/files/patch-aa b/databases/db3/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db3/files/patch-aa
+++ b/databases/db3/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db3/files/patch-ab b/databases/db3/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db3/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db3/pkg-plist b/databases/db3/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db3/pkg-plist
+++ b/databases/db3/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html
diff --git a/databases/db33/Makefile b/databases/db33/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db33/Makefile
+++ b/databases/db33/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db33/files/patch-aa b/databases/db33/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db33/files/patch-aa
+++ b/databases/db33/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db33/files/patch-ab b/databases/db33/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db33/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db33/pkg-plist b/databases/db33/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db33/pkg-plist
+++ b/databases/db33/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db4/files/patch-aa b/databases/db4/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db4/files/patch-aa
+++ b/databases/db4/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db4/files/patch-ab b/databases/db4/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db4/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db4/pkg-plist b/databases/db4/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db4/pkg-plist
+++ b/databases/db4/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html
diff --git a/databases/db41/Makefile b/databases/db41/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db41/Makefile
+++ b/databases/db41/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db41/files/patch-aa b/databases/db41/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db41/files/patch-aa
+++ b/databases/db41/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db41/files/patch-ab b/databases/db41/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db41/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db41/pkg-plist b/databases/db41/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db41/pkg-plist
+++ b/databases/db41/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html
diff --git a/databases/db42/Makefile b/databases/db42/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db42/Makefile
+++ b/databases/db42/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db42/files/patch-aa b/databases/db42/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db42/files/patch-aa
+++ b/databases/db42/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db42/files/patch-ab b/databases/db42/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db42/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db42/pkg-plist b/databases/db42/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db42/pkg-plist
+++ b/databases/db42/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html
diff --git a/databases/db43/Makefile b/databases/db43/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db43/Makefile
+++ b/databases/db43/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db43/files/patch-aa b/databases/db43/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db43/files/patch-aa
+++ b/databases/db43/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db43/files/patch-ab b/databases/db43/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db43/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db43/pkg-plist b/databases/db43/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db43/pkg-plist
+++ b/databases/db43/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html
diff --git a/databases/db44/Makefile b/databases/db44/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db44/Makefile
+++ b/databases/db44/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db44/files/patch-aa b/databases/db44/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db44/files/patch-aa
+++ b/databases/db44/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db44/files/patch-ab b/databases/db44/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db44/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db44/pkg-plist b/databases/db44/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db44/pkg-plist
+++ b/databases/db44/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html
diff --git a/databases/db45/Makefile b/databases/db45/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db45/Makefile
+++ b/databases/db45/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db45/files/patch-aa b/databases/db45/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db45/files/patch-aa
+++ b/databases/db45/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db45/files/patch-ab b/databases/db45/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db45/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db45/pkg-plist b/databases/db45/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db45/pkg-plist
+++ b/databases/db45/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html
diff --git a/databases/db46/Makefile b/databases/db46/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db46/files/patch-aa b/databases/db46/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db46/files/patch-aa
+++ b/databases/db46/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db46/files/patch-ab b/databases/db46/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db46/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db46/pkg-plist b/databases/db46/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db46/pkg-plist
+++ b/databases/db46/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html
diff --git a/databases/db47/Makefile b/databases/db47/Makefile
index ec9f123c3f2a..72a85bd88964 100644
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@@ -19,13 +19,17 @@ MANUAL_PACKAGE_BUILD= incompatible with libc internal db calls
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_SCRIPT= ../dist/configure
+LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
- --includedir=${PREFIX}/include/db3
-CONFIGURE_TARGET= $(ARCH)-unknown-freebsd$(OSREL)
+ --includedir=${PREFIX}/include/db3 \
+ --target=$(ARCH)-unknown-freebsd$(OSREL)
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/databases/db47/files/patch-aa b/databases/db47/files/patch-aa
index 1727b3778a18..2844fcba7691 100644
--- a/databases/db47/files/patch-aa
+++ b/databases/db47/files/patch-aa
@@ -7,12 +7,12 @@
-libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_target= $(libso_base)-$(SOVERSION).la
-+libso_linkname= $(libso_base)$(SOVERSION).la
-+libso= $(libso_base)$(SOVERSION).@SOSUFFIX@
-+libso_target= $(libso_base)$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# C++
@@ -22,11 +22,11 @@
libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_target= $(libxso_base)-$(SOVERSION).la
-+libxso= $(libxso_base)$(SOVERSION).@SOSUFFIX@
-+libxso_target= $(libxso_base)$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
##################################################
# JAVA
diff --git a/databases/db47/files/patch-ab b/databases/db47/files/patch-ab
new file mode 100644
index 000000000000..f80e53140f2b
--- /dev/null
+++ b/databases/db47/files/patch-ab
@@ -0,0 +1,15 @@
+--- ../dist/configure.orig Fri Sep 22 19:04:19 2000
++++ ../dist/configure Fri Sep 22 19:05:01 2000
+@@ -1599,9 +1599,9 @@
+ echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
+ echo "configure:1601: 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 \
++ --output=./libtool \
+ --disable-static \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
diff --git a/databases/db47/pkg-plist b/databases/db47/pkg-plist
index 4c7d61d33e7c..81c7d917222f 100644
--- a/databases/db47/pkg-plist
+++ b/databases/db47/pkg-plist
@@ -13,13 +13,11 @@ bin/db_stat
bin/db_upgrade
bin/db_verify
lib/libdb.so
-lib/libdb3.1.la
-lib/libdb3.1.so
lib/libdb3.so
+lib/libdb3.so.1
lib/libdb_cxx.so
-lib/libdb_cxx3.1.la
-lib/libdb_cxx3.1.so
lib/libdb_cxx3.so
+lib/libdb_cxx3.so.1
share/doc/db3/api_c/c_pindex.html
share/doc/db3/api_c/pindex.src
share/doc/db3/api_c/db_cursor.html