diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-09-22 16:48:51 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-09-22 16:48:51 +0000 |
| commit | d2a1700331fff6c4c78ad5a5992326410665eed8 (patch) | |
| tree | 030f1b56c4918c979841501a6c8c4abe46f0919c /databases/db42 | |
| parent | Update to version 1.3p6 (diff) | |
Several cleanups:
- properly install shared library (still needs more work);
- use pthreads;
- use libtool.
PR: 21470 (partially)
Submitted by: maintainer
Diffstat (limited to 'databases/db42')
| -rw-r--r-- | databases/db42/Makefile | 10 | ||||
| -rw-r--r-- | databases/db42/files/patch-aa | 14 | ||||
| -rw-r--r-- | databases/db42/files/patch-ab | 15 | ||||
| -rw-r--r-- | databases/db42/pkg-plist | 6 |
4 files changed, 31 insertions, 14 deletions
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 |