Remove databases/db3. All users were using db3+

and have in fact been using 4.0+ since 2011-04-12 (Mk/bsd.database.mk r1.57).

Chase upgrade in dependent ports and change USE_BDB to 40+.
This commit is contained in:
Matthias Andree 2011-05-23 12:09:06 +00:00
parent c40d466267
commit ff9b5de54f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=274509
14 changed files with 10 additions and 316 deletions

1
MOVED
View file

@ -2183,3 +2183,4 @@ barnyard-sguil|barnyard2-sguil|2011-05-15|barnyard2 has build in sguil support
multimedia/rebot3||2011-05-16|Removed
devel/tcl-neo||2011-05-22|Removed: deprecated and no maintainer interest.
www/neowebscript||2011-05-22|Removed: deprecated and no maintainer interest.
databases/db3||2011-05-23|Removed: all users set USE_BDB=3+ and have been using 4.0+.

View file

@ -230,9 +230,8 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
.if defined(USE_BDB)
_DB_PORTS= 3 40 41 42 43 44 45 46 47 48 51 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+ 51+
_DB_PORTS= 40 41 42 43 44 45 46 47 48 51 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+ 51+
# Dependence lines for different db versions
db3_DEPENDS= db3.3:${PORTSDIR}/databases/db3
db40_DEPENDS= db4.0:${PORTSDIR}/databases/db4
db41_DEPENDS= db41.1:${PORTSDIR}/databases/db41
db42_DEPENDS= db-4.2.2:${PORTSDIR}/databases/db42
@ -256,7 +255,6 @@ db48_FIND= ${LOCALBASE}/include/db48/db.h
db51_FIND= ${LOCALBASE}/include/db51/db.h
# For specifying [40, 41, ..]+
_DB_3P= ${_DB_40P}
_DB_40P= 40 ${_DB_41P}
_DB_41P= 41 ${_DB_42P}
_DB_42P= 42 ${_DB_43P}

View file

@ -32,7 +32,6 @@
SUBDIR += cyrus-imspd
SUBDIR += dalmp
SUBDIR += db
SUBDIR += db3
SUBDIR += db4
SUBDIR += db41
SUBDIR += db41-nocrypto

View file

@ -1,76 +0,0 @@
# ports collection makefile for: Berkeley DB v3
# Date created: 16 August 2000
# Whom: Sergey Osokin aka oZZ <osa@FreeBSD.org.ru>
#
# $FreeBSD$
#
PORTNAME= db3
PORTVERSION= 3.3.11
PORTREVISION= 3
PORTEPOCH?= 1
CATEGORIES= databases
MASTER_SITES= http://download.oracle.com/berkeley-db/
DISTNAME= db-${PORTVERSION}
DIST_SUBDIR= bdb
PATCH_SITES= http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION}/
PATCHFILES= patch.${PORTVERSION}.1 patch.${PORTVERSION}.2
MAINTAINER= mandree@FreeBSD.org
COMMENT= The Berkeley DB package, revision 3.3
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_SCRIPT= ../dist/configure
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
CONFIGURE_ARGS= --enable-compat185 \
--enable-dump185 --enable-cxx \
--enable-dynamic \
--prefix=${PREFIX} \
--includedir=${PREFIX}/include/db3
INSTALL_TARGET= install_include install_lib install_utilities
.if !defined(NOPORTDOCS)
INSTALL_TARGET+= install_docs docdir=${DOCSDIR}
PORTDOCS= *
.endif
.if defined(WITH_TCL_VER) && !defined(WITH_TCL)
WITH_TCL:= yes
.endif
.if defined(WITH_TCL)
USE_TCL= 83+
.endif
.include <bsd.port.pre.mk>
.if defined(WITH_TCL)
CONFIGURE_ARGS+= --enable-tcl --with-tcl=${TCL_LIBDIR}
PLIST_SUB+= WITHTCL=""
.else
PLIST_SUB+= WITHTCL="@comment "
.endif
pre-patch:
@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
post-patch:
@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
post-configure:
.if defined(WITH_TCL)
@${REINPLACE_CMD} -e "s|TCFLAGS=.*|TCFLAGS=-I${TCL_INCLUDEDIR} -L${TCL_LIBDIR}|g" ${WRKSRC}/Makefile
.endif
post-install:
.if !defined(NOPORTDOCS)
${RMDIR} ${DOCSDIR}/ref/splash
.endif
.include <bsd.port.post.mk>

View file

@ -1,6 +0,0 @@
SHA256 (bdb/db-3.3.11.tar.gz) = ac911bdd336a33aa4ced298aa3862cd317cbd372a20bbce9f65d0c21adea94fd
SIZE (bdb/db-3.3.11.tar.gz) = 2343243
SHA256 (bdb/patch.3.3.11.1) = 10f32fc6b0d7814c44bf06a69ee2ec99b524aa5b1ac761a739e58619df2f1c1e
SIZE (bdb/patch.3.3.11.1) = 2601
SHA256 (bdb/patch.3.3.11.2) = 1395a93ea16a83af6c538140c9e2672261709b4f904206f2c54dedb55c7ef122
SIZE (bdb/patch.3.3.11.2) = 325

View file

@ -1,139 +0,0 @@
--- ./dist/Makefile.in.orig 2001-07-06 22:53:16.000000000 +0200
+++ ./dist/Makefile.in 2011-03-21 18:22:00.000000000 +0100
@@ -61,12 +61,12 @@
LIBSO_LIBS= @LIBSO_LIBS@
libdb= libdb.a
-libso_base= libdb
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
-libso_static= $(libso_base)-$(SOVERSION).a
-libso_target= $(libso_base)-$(SOVERSION).la
+libso_base= libdb$(SOMAJOR)
+libso= $(libso_base).@SOSUFFIX@
+libso_static= $(libso_base).a
+libso_target= $(libso_base).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
+libso_major= $(libso_base).@SOSUFFIX@.3
##################################################
# C++ API.
@@ -78,13 +78,13 @@
CXXLINK= @MAKEFILE_CXXLINK@
LIBXSO_LIBS= @LIBXSO_LIBS@
-libcxx= libdb_cxx.a
-libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
-libxso_static= $(libxso_base)-$(SOVERSION).a
-libxso_target= $(libxso_base)-$(SOVERSION).la
+libcxx= libdb3_cxx.a
+libxso_base= libdb3_cxx
+libxso= $(libxso_base).@SOSUFFIX@
+libxso_static= $(libxso_base).a
+libxso_target= $(libxso_base).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
+libxso_major= $(libxso_base).@SOSUFFIX@.3
##################################################
# Java API.
@@ -239,8 +239,8 @@
perf_util@o@
UTIL_PROGS=\
- @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
- db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
+ @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \
+ db3_dump db3_load db3_printlog db3_recover db3_stat db3_upgrade db3_verify
##################################################
# We're building a standard library or a RPM file hierarchy, potentially
@@ -298,53 +298,53 @@
$(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
+db3_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
+db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
+db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
+db3_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_dump185: db_dump185@o@ @LIBOBJS@
+db3_dump185: db_dump185@o@ @LIBOBJS@
$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB)
$(POSTLINK) $@
-db_load: db_load@o@ util_sig@o@ $(DEF_LIB)
+db3_load: db_load@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
+db3_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
+db3_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
+db3_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
+db3_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
+db3_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
@@ -401,10 +401,8 @@
@cd $(libdir) && $(rm) -f \
$(libso) $(libso_target) $(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)
- @cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target)
+ @cd $(libdir) && $(chmod) $(fmode) $(libso)
install_static_cxx:
@echo "Installing DB C++ static library: $(libdir) ..."
@@ -421,9 +419,7 @@
@cd $(libdir) && $(rm) -f \
$(libxso) $(libxso_target) $(libxso_default) $(libxso_major)
@$(INSTALLER) $(libxso_target) $(libdir)
- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
- @cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target)
+ @cd $(libdir) && $(chmod) $(fmode) $(libxso)
install_tcl:
@echo "Installing DB Tcl library: $(libdir) ..."

View file

@ -1,38 +0,0 @@
--- ./dist/configure.orig 2011-03-21 18:22:00.000000000 +0100
+++ ./dist/configure 2011-03-21 18:22:00.000000000 +0100
@@ -7002,7 +7002,7 @@
;;
freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -8449,7 +8449,7 @@
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${SAVE_CXX}"
-SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
+SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -version-info ${DB_VERSION_MINOR}"
INSTALLER="\$(LIBTOOL) --mode=install cp"
# Configure for shared libraries, static libraries, or both. If both are
@@ -8728,7 +8728,7 @@
done
JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
case "$host_os" in
- darwin*) JTOPDIR=`echo "$JTOPDIR" | sed -e s:/[^/]*$::'`
+ darwin*) JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'`
JNIHEADERDIR="$JTOPDIR/Headers";;
*) JNIHEADERDIR="$JTOPDIR/include";;
esac
@@ -9100,7 +9100,7 @@
# Optional utilities.
if test "$db_cv_dump185" = "yes"; then
- ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS"
+ ADDITIONAL_PROGS="db3_dump185 $ADDITIONAL_PROGS"
fi
# test servers, example programs.

View file

@ -1,13 +0,0 @@
Version 3 of the Berkeley DB library. This version uses an underlying
database format incompatible with revision 1 and a different standard API.
Utilities are included in the distribution to convert v1.85 databases to v3
databases, and a backwards compatible API is provided to maintain
compatibility with programs using the v1.85 interface.
There are minor interface changes in this release which may require that DB
applications be modified and recompiled. For a complete discussion of
interface changes, see:
http://www.sleepycat.com/update/
WWW: http://www.oracle.com/us/products/database/berkeley-db/db/

View file

@ -1,31 +0,0 @@
bin/db3_archive
bin/db3_checkpoint
bin/db3_deadlock
bin/db3_dump
bin/db3_dump185
bin/db3_load
bin/db3_printlog
bin/db3_recover
bin/db3_stat
bin/db3_upgrade
bin/db3_verify
include/db3/cxx_common.h
include/db3/cxx_except.h
include/db3/db.h
include/db3/db_185.h
include/db3/db_cxx.h
lib/libdb3.a
lib/libdb3.la
lib/libdb3.so
lib/libdb3.so.3
lib/libdb3_cxx.a
lib/libdb3_cxx.la
lib/libdb3_cxx.so
lib/libdb3_cxx.so.3
%%WITHTCL%%lib/libdb_tcl-3.3.a
%%WITHTCL%%lib/libdb_tcl-3.3.la
%%WITHTCL%%lib/libdb_tcl-3.3.so
%%WITHTCL%%lib/libdb_tcl-3.3.so.3
%%WITHTCL%%lib/libdb_tcl.so
%%WITHTCL%%lib/libdb_tcl-3.so
@dirrm include/db3

View file

@ -15,7 +15,7 @@ DISTNAME= rdfdb_src
MAINTAINER= ports@FreeBSD.org
COMMENT= A lightweight RDF database
USE_BDB= 3+
USE_BDB= 40+
INVALID_BDB_VER=2
WRKSRC= ${WRKDIR}/rdfdb

View file

@ -46,12 +46,12 @@ CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \
.if defined(WITH_BDB_VER)
USE_BDB_VER= ${WITH_BDB_VER}
.else
USE_BDB_VER= 3
USE_BDB_VER= 41
.endif
.if ${USE_BDB_VER} == 4
USE_BDB= 40
.elif ${USE_BDB_VER} != 3 && ${USE_BDB_VER} != 41
IGNORE= "cannot install: WITH_BDB_VER must be 3, 4 or 41"
.elif ${USE_BDB_VER} != 41
IGNORE= "cannot install: WITH_BDB_VER must be 4 or 41"
.endif
USE_BDB?= ${USE_BDB_VER}
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \
@ -112,7 +112,7 @@ pre-everything::
${ECHO_MSG} "It seems you have installed newer db than db3. If"; \
${ECHO_MSG} "you are using newer db for cyrus-sasl2, you should"; \
${ECHO_MSG} "specify same version by WITH_BDB_VER. For"; \
${ECHO_MSG} "exapmle, WITH_BDB_VER=4 for db4."; \
${ECHO_MSG} "example, WITH_BDB_VER=41 for db41."; \
${ECHO_MSG} ""; \
fi
.endif

View file

@ -38,8 +38,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -lpbl
# BerkleyDB support
.if !defined(WITHOUT_BDB)
USE_BDB= 3+
INVALID_BDB_VER=2
USE_BDB= 40+
CONFIGURE_ARGS+= --enable-cdb
CPPFLAGS+= -I${BDB_INCLUDE_DIR} -DUSE_DB=1
LDFLAGS+= -L${LOCALBASE}/lib -l${BDB_LIB_NAME}

View file

@ -37,7 +37,7 @@ MAKE_ARGS+= -DSORT
.if defined(WITH_DB185)
MAKE_ARGS+= -DBSD_DB
.else
USE_BDB= 3+
USE_BDB= 40+
INVALID_BDB_VER=51
MAKE_ARGS+= BDB_VER=${BDB_VER} BDB_LIB_DIR=${BDB_LIB_DIR}
.endif

View file

@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
USE_BDB= 3+
USE_BDB= 40+
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-db-inc=${BDB_INCLUDE_DIR} \
--with-db-lib=${BDB_LIB_DIR} \