diff options
author | mandree <mandree@FreeBSD.org> | 2014-08-22 06:50:29 +0800 |
---|---|---|
committer | mandree <mandree@FreeBSD.org> | 2014-08-22 06:50:29 +0800 |
commit | b0113421712e3e2543fa9e1e0726502ef475e372 (patch) | |
tree | 5f9e6219e9207f083ae5e2fff1302ed5967538ef /databases/db4 | |
parent | cd3ab2c3333aee48d376be65b1751fff66ee393b (diff) | |
download | freebsd-ports-graphics-b0113421712e3e2543fa9e1e0726502ef475e372.tar.gz freebsd-ports-graphics-b0113421712e3e2543fa9e1e0726502ef475e372.tar.zst freebsd-ports-graphics-b0113421712e3e2543fa9e1e0726502ef475e372.zip |
Berkeley DB cleanup, remove versions 4.0 ... 4.7.
- Mk/bsd.database.mk rewrite, new default to db5.
- db6 is eligible by default only if installed on the system.
- Bump PORTREVISION of all ports that directly depend on BerkeleyDB or
where USE_BDB is found in the port's directory
- Patch a few ports such that they will pick up or work with newer
versions.
- Add UPDATING entry
- Drive-by format fix for pks
- Drop BerkeleyDB option from mail/popular for now, requires more work.
- Exp-run logs linked from the PR below.
- Ports that do not build (IGNORE, BROKEN, etc.) have pro-forma changes
for new Berkeley DB, but are untested.
NOTE: please read UPDATING and the Wiki page before proceeding!
Announcement: http://lists.freebsd.org/pipermail/freebsd-ports-announce/2014-August/000090.html
Wiki reference: https://wiki.freebsd.org/Ports/BerkeleyDBCleanup
PR: 192690
Approved by: portmgr (implicit, PORTREVISION bump on unstaged ports)
Diffstat (limited to 'databases/db4')
-rw-r--r-- | databases/db4/Makefile | 48 | ||||
-rw-r--r-- | databases/db4/distinfo | 2 | ||||
-rw-r--r-- | databases/db4/files/patch-dist__Makefile.in | 144 | ||||
-rw-r--r-- | databases/db4/files/patch-dist__configure | 24 | ||||
-rw-r--r-- | databases/db4/files/patch-dist__ltmain.sh | 32 | ||||
-rw-r--r-- | databases/db4/files/patch-objformat | 11 | ||||
-rw-r--r-- | databases/db4/pkg-descr | 10 | ||||
-rw-r--r-- | databases/db4/pkg-plist | 23 |
8 files changed, 0 insertions, 294 deletions
diff --git a/databases/db4/Makefile b/databases/db4/Makefile deleted file mode 100644 index 8aa271e5085..00000000000 --- a/databases/db4/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# Created by: Sergey Osokin aka oZZ <ozz@FreeBSD.org.ru> -# $FreeBSD$ - -PORTNAME= db4 -PORTVERSION= 4.0.14 -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= databases -MASTER_SITES= http://download.oracle.com/berkeley-db/ -DISTNAME= db-${PORTVERSION} -DIST_SUBDIR= bdb - -DEPRECATED= Please use databases/db5 or db6 for new installs. - -MAINTAINER= ports@FreeBSD.org -COMMENT= The Berkeley DB package, revision 4 - -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix - -GNU_CONFIGURE= yes -CONFIGURE_SCRIPT= ../dist/configure -CONFIGURE_ARGS= --enable-compat185 --enable-dump185 \ - --enable-cxx --enable-dynamic \ - --includedir=${PREFIX}/include/db4 -USE_LDCONFIG= yes - -OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -INSTALL_TARGET= install install_docs -PORTDOCS= * -.endif - -# the db install_docs target installs an empty directory, kill it -NO_STAGE= yes -# (it's not packaged and it's not needed): -.if ${PORT_OPTIONS:MDOCS} -post-install: - @${RMDIR} ${PREFIX}/share/doc/db4/ref/splash -.endif - -post-patch: - @${REINPLACE_CMD} -Ee \ - 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT} - -.include <bsd.port.mk> diff --git a/databases/db4/distinfo b/databases/db4/distinfo deleted file mode 100644 index 30688206fd4..00000000000 --- a/databases/db4/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (bdb/db-4.0.14.tar.gz) = a7d983d88b7ba43cfd9a39bfcb0f3f489b15e4b113452e94b7c4bbca0225b7f5 -SIZE (bdb/db-4.0.14.tar.gz) = 2701799 diff --git a/databases/db4/files/patch-dist__Makefile.in b/databases/db4/files/patch-dist__Makefile.in deleted file mode 100644 index cf1f67e21a7..00000000000 --- a/databases/db4/files/patch-dist__Makefile.in +++ /dev/null @@ -1,144 +0,0 @@ ---- ../dist/Makefile.in.orig Sat Nov 10 07:48:45 2001 -+++ ../dist/Makefile.in Sat Nov 9 17:36:00 2002 -@@ -11,7 +11,7 @@ - bindir= @bindir@ - includedir=@includedir@ - libdir= @libdir@ --docdir= $(prefix)/docs -+docdir= $(prefix)/share/doc/db4 - - dmode= 755 - emode= 555 -@@ -45,6 +45,7 @@ - SOLINK= @MAKEFILE_SOLINK@ - SOFLAGS= @SOFLAGS@ - SOMAJOR= @DB_VERSION_MAJOR@ -+SOMINOR= @DB_VERSION_MINOR@ - SOVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ - - ################################################## -@@ -60,13 +61,13 @@ - LIBS= @LIBS@ - 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 -+libdb= libdb4.a -+libso_base= libdb4 -+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@.$(SOMINOR) - - ################################################## - # C++ API. -@@ -79,13 +80,13 @@ - XSOLINK= @MAKEFILE_XSOLINK@ - 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= libdb4_cxx.a -+libxso_base= libdb4_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@.$(SOMINOR) - - ################################################## - # Java API. -@@ -235,8 +236,8 @@ - db_server_proc@o@ db_server_svc@o@ db_server_util@o@ gen_db_server@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@ db4_archive db4_checkpoint db4_deadlock \ -+ db4_dump db4_load db4_printlog db4_recover db4_stat db4_upgrade db4_verify - - ################################################## - # List of files installed into the library directory. -@@ -330,53 +331,53 @@ - $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ - --db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB) -+db4_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) -+db4_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) -+db4_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) -+db4_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@ -+db4_dump185: db_dump185@o@ @LIBOBJS@ - $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB) - $(POSTLINK) $@ - --db_load: db_load@o@ util_sig@o@ $(DEF_LIB) -+db4_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) -+db4_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) -+db4_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) -+db4_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) -+db4_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) -+db4_verify: db_verify@o@ util_sig@o@ $(DEF_LIB) - $(CCLINK) -o $@ $(LDFLAGS) \ - db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS) - $(POSTLINK) $@ -@@ -385,7 +386,7 @@ - # Library and standard utilities install. - ################################################## - library_install: install_setup --library_install: install_include install_lib install_utilities install_docs -+library_install: install_include install_lib install_utilities - - uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs - diff --git a/databases/db4/files/patch-dist__configure b/databases/db4/files/patch-dist__configure deleted file mode 100644 index 4f2ed615df0..00000000000 --- a/databases/db4/files/patch-dist__configure +++ /dev/null @@ -1,24 +0,0 @@ ---- ../dist/configure.orig Wed Dec 5 13:14:02 2001 -+++ ../dist/configure Wed Dec 5 13:24:01 2001 -@@ -8794,10 +8794,10 @@ - INSTALLER="\$(LIBTOOL) --mode=install cp" - - 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 ${DB_VERSION_MINOR}" - 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 ${DB_VERSION_MINOR}" - MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" - - # Configure for shared libraries, static libraries, or both. If both are -@@ -9511,7 +9511,7 @@ - - # Optional utilities. - if test "$db_cv_dump185" = "yes"; then -- ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS" -+ ADDITIONAL_PROGS="db4_dump185 $ADDITIONAL_PROGS" - fi - - # Checks for system/compiler characteristics. diff --git a/databases/db4/files/patch-dist__ltmain.sh b/databases/db4/files/patch-dist__ltmain.sh deleted file mode 100644 index 7ba6dbdfd3f..00000000000 --- a/databases/db4/files/patch-dist__ltmain.sh +++ /dev/null @@ -1,32 +0,0 @@ ---- ../dist/ltmain.sh.orig Sat Nov 17 01:15:01 2001 -+++ ../dist/ltmain.sh Sat Nov 9 17:08:02 2002 -@@ -1043,14 +1043,14 @@ - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -4217,10 +4217,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/databases/db4/files/patch-objformat b/databases/db4/files/patch-objformat deleted file mode 100644 index 2aa1daaaa21..00000000000 --- a/databases/db4/files/patch-objformat +++ /dev/null @@ -1,11 +0,0 @@ ---- ../dist/configure.foo Sun Feb 4 14:10:01 2007 -+++ ../dist/configure Sun Feb 4 14:11:26 2007 -@@ -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*) diff --git a/databases/db4/pkg-descr b/databases/db4/pkg-descr deleted file mode 100644 index 2ba215b28cd..00000000000 --- a/databases/db4/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Version 4 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 v4 -databases, and a backwards compatible API is provided to maintain -compatibility with programs using the v1.85 interface. - -For details on compatibility with other DB versions, see: -http://www.sleepycat.com/download/patchlogs.shtml - -WWW: http://www.oracle.com/us/products/database/berkeley-db/db/ diff --git a/databases/db4/pkg-plist b/databases/db4/pkg-plist deleted file mode 100644 index e9a13d342d7..00000000000 --- a/databases/db4/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -bin/db4_archive -bin/db4_checkpoint -bin/db4_deadlock -bin/db4_dump -bin/db4_dump185 -bin/db4_load -bin/db4_printlog -bin/db4_recover -bin/db4_stat -bin/db4_upgrade -bin/db4_verify -include/db4/cxx_common.h -include/db4/cxx_except.h -include/db4/db.h -include/db4/db_185.h -include/db4/db_cxx.h -lib/libdb4.a -lib/libdb4.so -lib/libdb4.so.0 -lib/libdb4_cxx.a -lib/libdb4_cxx.so -lib/libdb4_cxx.so.0 -@dirrm include/db4 |