diff options
| -rw-r--r-- | Mk/Uses/bdb.mk | 20 | ||||
| -rw-r--r-- | databases/Makefile | 1 | ||||
| -rw-r--r-- | databases/db48/Makefile | 54 | ||||
| -rw-r--r-- | databases/db48/distinfo | 2 | ||||
| -rw-r--r-- | databases/db48/files/patch-dbinc_atomic.h | 20 | ||||
| -rw-r--r-- | databases/db48/files/patch-dbinc_mutex_int.h | 11 | ||||
| -rw-r--r-- | databases/db48/files/patch-dist__configure | 13 | ||||
| -rw-r--r-- | databases/db48/pkg-descr | 11 | ||||
| -rw-r--r-- | databases/db48/pkg-plist | 49 |
9 files changed, 7 insertions, 174 deletions
diff --git a/Mk/Uses/bdb.mk b/Mk/Uses/bdb.mk index 13665342f009..f11b82cc7ad2 100644 --- a/Mk/Uses/bdb.mk +++ b/Mk/Uses/bdb.mk @@ -59,19 +59,17 @@ BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} _BDB_DEFAULT_save:=${BDB_DEFAULT} -_DB_PORTS= 48 5 6 -_DB_DEFAULTS= 48 5 # does not include 6 due to different licensing +_DB_PORTS= 5 6 +_DB_DEFAULTS= 5 # does not include 6 due to different licensing # but user can re-add it through WITH_BDB6_PERMITTED . if defined(WITH_BDB6_PERMITTED) _DB_DEFAULTS+= 6 . endif # Dependency lines for different db versions -db48_DEPENDS= libdb-4.8.so:databases/db48 db5_DEPENDS= libdb-5.3.so:databases/db5 db6_DEPENDS= libdb-6.2.so:databases/db6 # Detect db versions by finding some files -db48_FIND= ${LOCALBASE}/include/db48/db.h db5_FIND= ${LOCALBASE}/include/db5/db.h db6_FIND= ${LOCALBASE}/include/db6/db.h @@ -87,16 +85,16 @@ BDB_DEFAULT= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} . if ${BDB_DEFAULT} != 1 _bdb_ARGS= ${BDB_DEFAULT} . else -_bdb_ARGS:= 48+ +_bdb_ARGS:= 5+ . endif . endif # Compatiblity hack: -# upgrade older plussed versions to 48+ -_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ +# upgrade older plussed versions to 5+ +_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+ .for i in ${_bdb_ARGS} . if ${_BDB_OLDPLUSVERS:M${i}} -_bdb_ARGS:= 48+ +_bdb_ARGS:= 5+ . endif .endfor @@ -177,11 +175,7 @@ BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://} . else LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS} . endif -. if ${_BDB_VER} == 48 -BDB_LIB_NAME= db-4.8 -BDB_LIB_CXX_NAME= db_cxx-4.8 -BDB_LIB_DIR= ${LOCALBASE}/lib/db48 -. elif ${_BDB_VER} == 5 +. if ${_BDB_VER} == 5 BDB_LIB_NAME= db-5.3 BDB_LIB_CXX_NAME= db_cxx-5.3 BDB_LIB_DIR= ${LOCALBASE}/lib/db5 diff --git a/databases/Makefile b/databases/Makefile index 5a1df518b6da..830d856d48d6 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -51,7 +51,6 @@ SUBDIR += dalmp SUBDIR += datamodeler SUBDIR += db - SUBDIR += db48 SUBDIR += db5 SUBDIR += db6 SUBDIR += dbf diff --git a/databases/db48/Makefile b/databases/db48/Makefile deleted file mode 100644 index cc8334052863..000000000000 --- a/databases/db48/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# Created by: Gea-Suan Lin <gslin@gslin.org> -# $FreeBSD$ - -PORTNAME= db48 -PORTVERSION= 4.8.30.0 -PORTREVISION= 2 -CATEGORIES= databases -MASTER_SITES= http://download.oracle.com/berkeley-db/ -PKGNAMEPREFIX?= -DISTNAME= db-${PORTVERSION:R} -DIST_SUBDIR= bdb - -MAINTAINER= ports@FreeBSD.org -COMMENT= Berkeley DB package, revision 4.8 - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE - -DEPRECATED= Please migrate to db5 or db6, make sure that bitcoin and siblings moved to another database or version by then -# This port expires along with FreeBSD 10.X. -EXPIRATION_DATE= 2018-04-30 - -BDBVER= ${PORTVERSION:R:R} -CONFIGURE_ARGS= --enable-compat185 --enable-dump185 --enable-cxx \ - --includedir=${PREFIX}/include/${PORTNAME} \ - --libdir=${PREFIX}/lib/${PORTNAME} \ - --bindir=${PREFIX}/bin/${PORTNAME} -CONFIGURE_SCRIPT= ../dist/configure -USES= libtool:keepla -GNU_CONFIGURE= yes -INSTALL_TARGET= install_include install_lib install_utilities -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix -USE_LDCONFIG= yes - -.include <bsd.port.options.mk> - -.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 -# db48 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 -CONFIGURE_ARGS+= --enable-posixmutexes -.endif - -post-patch: - ${REINPLACE_CMD} -Ee 's|--mode=install cp -p|--mode=install ${INSTALL} -s|;' ${WRKSRC}/${CONFIGURE_SCRIPT} - ${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../dbinc/atomic.h ${WRKSRC}/../mp/mp_*.c ${WRKSRC}/../mutex/mut_*.c - -post-install: -.for i in libdb libdb_cxx - ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib - ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so -.endfor - cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \ - for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER}; done - -.include <bsd.port.mk> diff --git a/databases/db48/distinfo b/databases/db48/distinfo deleted file mode 100644 index 75cdc51d62da..000000000000 --- a/databases/db48/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (bdb/db-4.8.30.tar.gz) = e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f96147ab46141e0045db72a -SIZE (bdb/db-4.8.30.tar.gz) = 22887305 diff --git a/databases/db48/files/patch-dbinc_atomic.h b/databases/db48/files/patch-dbinc_atomic.h deleted file mode 100644 index 1faca97d705b..000000000000 --- a/databases/db48/files/patch-dbinc_atomic.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ../dbinc/atomic.h.orig 2012-02-29 19:48:38.000000000 +0100 -+++ ../dbinc/atomic.h 2012-05-04 22:39:32.000000000 +0200 -@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; - #define atomic_inc(env, p) __atomic_inc(p) - #define atomic_dec(env, p) __atomic_dec(p) - #define atomic_compare_exchange(env, p, o, n) \ -- __atomic_compare_exchange((p), (o), (n)) -+ __atomic_compare_exchange_db((p), (o), (n)) - static inline int __atomic_inc(db_atomic_t *p) - { - int temp; -@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic - * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html - * which configure could be changed to use. - */ --static inline int __atomic_compare_exchange( -+static inline int __atomic_compare_exchange_db( - db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) - { - atomic_value_t was; diff --git a/databases/db48/files/patch-dbinc_mutex_int.h b/databases/db48/files/patch-dbinc_mutex_int.h deleted file mode 100644 index 9e6b5a2819fd..000000000000 --- a/databases/db48/files/patch-dbinc_mutex_int.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../dbinc/mutex_int.h.orig 2010-04-12 13:25:22.000000000 -0700 -+++ ../dbinc/mutex_int.h 2014-06-28 01:16:48.321255725 -0700 -@@ -596,7 +596,7 @@ - : "=&r" (__r), "+r" (tsl) - : - : "cr0", "memory"); -- return (int)tsl; -+ return (tsl != 0); - } - - static inline int diff --git a/databases/db48/files/patch-dist__configure b/databases/db48/files/patch-dist__configure deleted file mode 100644 index 2dac99fc909d..000000000000 --- a/databases/db48/files/patch-dist__configure +++ /dev/null @@ -1,13 +0,0 @@ ---- ../dist/configure.orig Wed Dec 5 13:14:02 2001 -+++ ../dist/configure Wed Dec 5 13:24:01 2001 -@@ -20867,8 +20867,8 @@ - - MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" --MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" -+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0" - MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" - MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" --MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" -+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0" - MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" - diff --git a/databases/db48/pkg-descr b/databases/db48/pkg-descr deleted file mode 100644 index 73d50d96a37a..000000000000 --- a/databases/db48/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Oracle Berkeley DB is a family of open source embeddable databases -that allows developers to incorporate within their applications a -fast, scalable, transactional database engine with industrial grade -reliability and availability. As a result, customers and end-users -will experience an application that simply works, reliably manages -data, can scale under extreme load, but requires no ongoing database -administration. As a developer, you can focus on your application and -be confident that Oracle Berkeley DB will manage your persistence -needs. - -WWW: http://www.oracle.com/us/products/database/berkeley-db/db/ diff --git a/databases/db48/pkg-plist b/databases/db48/pkg-plist deleted file mode 100644 index be40f4e65818..000000000000 --- a/databases/db48/pkg-plist +++ /dev/null @@ -1,49 +0,0 @@ -bin/db48/db_archive -bin/db48/db_checkpoint -bin/db48/db_deadlock -bin/db48/db_dump -bin/db48/db_dump185 -bin/db48/db_hotbackup -bin/db48/db_load -bin/db48/db_printlog -bin/db48/db_recover -bin/db48/db_sql -bin/db48/db_stat -bin/db48/db_upgrade -bin/db48/db_verify -bin/db_archive-4.8 -bin/db_checkpoint-4.8 -bin/db_deadlock-4.8 -bin/db_dump-4.8 -bin/db_dump185-4.8 -bin/db_hotbackup-4.8 -bin/db_load-4.8 -bin/db_printlog-4.8 -bin/db_recover-4.8 -bin/db_sql-4.8 -bin/db_stat-4.8 -bin/db_upgrade-4.8 -bin/db_verify-4.8 -include/db48/db.h -include/db48/db_185.h -include/db48/db_cxx.h -lib/db48/libdb-4.8.a -lib/db48/libdb-4.8.la -lib/db48/libdb-4.8.so -lib/db48/libdb-4.8.so.0 -lib/db48/libdb-4.8.so.0.0.0 -lib/db48/libdb-4.so -lib/db48/libdb.a -lib/db48/libdb.so -lib/db48/libdb_cxx-4.8.a -lib/db48/libdb_cxx-4.8.la -lib/db48/libdb_cxx-4.8.so -lib/db48/libdb_cxx-4.8.so.0 -lib/db48/libdb_cxx-4.8.so.0.0.0 -lib/db48/libdb_cxx-4.so -lib/db48/libdb_cxx.a -lib/db48/libdb_cxx.so -lib/libdb-4.8.so -lib/libdb-4.8.so.0 -lib/libdb_cxx-4.8.so -lib/libdb_cxx-4.8.so.0 |
