Attachment 145841 Details for Bug 192690 – exp-run difference against SVN head ports r365033, use patch -E

[patch] exp-run difference against SVN head ports r365033, use patch -E

exprun-berkeleydb-cleanup-v1.patch (text/plain), 91.59 KB, created by Matthias Andree on 2014-08-15 20:50:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2014-08-15 20:50:47 UTC

Size: 91.59 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 365033)
>+++ MOVED	(working copy)
>@@ -6419,3 +6419,12 @@
> korean/unzip|archivers/unzip|2014-08-15|Merged with archivers/unzip as a new non-default option
> russian/unzip|archivers/unzip|2014-08-15|Merged with archivers/unzip as a new non-default option
> mail/sendmail-sasl|mail/sendmail|2014-08-15|Removed: Use mail/sendmail instead
>+databases/db4|databases/db48|2014-08-15|Superseded by databases/db48
>+databases/db41|databases/db48|2014-08-15|Superseded by databases/db48
>+databases/db41-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48
>+databases/db42|databases/db48|2014-08-15|Superseded by databases/db48
>+databases/db42-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48
>+databases/db43|databases/db48|2014-08-15|Superseded by databases/db48
>+databases/db44|databases/db48|2014-08-15|Superseded by databases/db48
>+databases/db46|databases/db48|2014-08-15|Superseded by databases/db48
>+databases/db47|databases/db48|2014-08-15|Superseded by databases/db48
>Index: Mk/bsd.database.mk
>===================================================================
>--- Mk/bsd.database.mk	(revision 365033)
>+++ Mk/bsd.database.mk	(working copy)
>@@ -50,11 +50,13 @@
> # PGSQL_VER
> #			- Detected PostgreSQL version.
> ##
>-# USE_BDB		- Add Berkeley DB library dependency.
>+# USE_BDB	- Add Berkeley DB library dependency.
> #			  If no version is given (by the maintainer via the port or
> #			  by the user via defined variable), try to find the
> #			  currently installed version.  Fall back to default if
>-#			  necessary (db41+).
>+#			  necessary (db5 if compatible).
>+#			  This adds a "debug-bdb" make target which will dump the
>+#			  related data.
> # INVALID_BDB_VER
> #			- This variable can be defined when the port does not
> #			  support one or more versions of Berkeley DB.
>@@ -68,6 +70,14 @@
> #			  version.
> # WITH_BDB_HIGHEST
> #			- Use the highest installed version of Berkeley DB.
>+# WITH_BDB6_PERMITTED
>+# 			- If defined, BerkeleyDB 6 is added to the
>+# 			  default version set, making it eligible even
>+# 			  if not already installed. This is due to its
>+# 			  stricter Affero GNU Public License.
>+#
>+# These variables will then be filled in by this .mk file:
>+#
> # BDB_LIB_NAME
> #			- This variable is automatically set to the name of the
> #			  Berkeley DB library (default: db41).
>@@ -290,43 +300,28 @@
> .endif # USE_PGSQL
> 
> .if defined(USE_BDB)
>+# TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER
>+# check if + works properly from test builds 01h12m23s
> 
>-_DB_PORTS=	40 41 42 43 44 46 47 48 5 6 40+ 41+ 42+ 43+ 44+ 46+ 47+ 48+ 5+ 6+
>-# Dependence lines for different db versions
>-db40_DEPENDS=	libdb4.so:${PORTSDIR}/databases/db4
>-db41_DEPENDS=	libdb41.so:${PORTSDIR}/databases/db41
>-db42_DEPENDS=	libdb-4.2.so:${PORTSDIR}/databases/db42
>-db43_DEPENDS=	libdb-4.3.so:${PORTSDIR}/databases/db43
>-db44_DEPENDS=	libdb-4.4.so:${PORTSDIR}/databases/db44
>-db46_DEPENDS=	libdb-4.6.so:${PORTSDIR}/databases/db46
>-db47_DEPENDS=	libdb-4.7.so:${PORTSDIR}/databases/db47
>+_USE_BDB_save:=${USE_BDB}
>+_WITH_BDB_VER_save:=${WITH_BDB_VER}
>+
>+_DB_PORTS=		48 5 6
>+_DB_DEFAULTS=	48 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:${PORTSDIR}/databases/db48
> db5_DEPENDS=	libdb-5.3.so:${PORTSDIR}/databases/db5
> db6_DEPENDS=	libdb-6.1.so:${PORTSDIR}/databases/db6
> # Detect db versions by finding some files
>-db40_FIND=	${LOCALBASE}/include/db4/db.h
>-db41_FIND=	${LOCALBASE}/include/db41/db.h
>-db42_FIND=	${LOCALBASE}/include/db42/db.h
>-db43_FIND=	${LOCALBASE}/include/db43/db.h
>-db44_FIND=	${LOCALBASE}/include/db44/db.h
>-db46_FIND=	${LOCALBASE}/include/db46/db.h
>-db47_FIND=	${LOCALBASE}/include/db47/db.h
> db48_FIND=	${LOCALBASE}/include/db48/db.h
> db5_FIND=	${LOCALBASE}/include/db5/db.h
> db6_FIND=	${LOCALBASE}/include/db6/db.h
> 
>-# For specifying [40, 41, ..]+
>-_DB_40P=	40 ${_DB_41P}
>-_DB_41P=	41 ${_DB_42P}
>-_DB_42P=	42 ${_DB_43P}
>-_DB_43P=	43 ${_DB_44P}
>-_DB_44P=	44 ${_DB_46P}
>-_DB_46P=	46 ${_DB_47P}
>-_DB_47P=	47 ${_DB_48P}
>-_DB_48P=	48 ${_DB_5P}
>-_DB_5P=		5 ${_DB_6P}
>-_DB_6P=		6
>-
> # Override the global WITH_BDB_VER with the
> # port specific <UNIQUENAME>_WITH_BDB_VER
> .if defined(${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
>@@ -333,153 +328,154 @@
> WITH_BDB_VER=	${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}
> .endif
> 
>+# Override USE_BDB with global WITH_BDB_VER
> .if defined(WITH_BDB_VER)
>-. if ${WITH_BDB_VER} == 4
>-USE_BDB=	40
>-. elif ${WITH_BDB_VER} != 1
>+. if ${WITH_BDB_VER} != 1
> USE_BDB=	${WITH_BDB_VER}
> . endif
> .endif
>-_WANT_BDB_VER=	${USE_BDB}
> 
>-# Assume the default bdb version as 41
>-.if ${USE_BDB:tl} == "yes"
>-_WANT_BDB_VER=	41+
>+# Override USE_BDB with maintainer's WANT_BDB_VER
>+.if defined(WANT_BDB_VER)
>+USE_BDB=	${WANT_BDB_VER}
> .endif
> 
>-# Detect bdb version
>-_BDB_VER=	no
>-_BDB_IGNORE=	no
>+# Compatiblity hack:
>+# upgrade older plussed versions to 48+
>+_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+
>+.for i in ${USE_BDB}
>+. if ${_BDB_OLDPLUSVERS:M${i}}
>+USE_BDB:=	48+
>+. endif
>+.endfor
> 
>-# Override the user defined WITH_BDB_VER with the WANT_BDB_VER
>-.if defined(WANT_BDB_VER)
>+.if ${USE_BDB} == yes
>+USE_BDB:=	48+
>+.endif
>+
>+# 1. detect installed versions
>+_INST_BDB_VER=
> .for bdb in ${_DB_PORTS}
>-.if ${WANT_BDB_VER} == "${bdb}" && ${_BDB_VER} == "no"
>-_BDB_VER=	${WANT_BDB_VER}
>-.endif
>+. if exists(${db${bdb}_FIND})
>+_INST_BDB_VER+=${bdb}
>+. endif
> .endfor
>-USE_BDB=	${WANT_BDB_VER}
>+
>+# 2. parse supported versions:
>+# 2a. build list from USE_BDB
>+_SUPP_BDB_VER=
>+_USE_BDB:=${USE_BDB:C,\+$,,:C/(.)(.)$/\1.\2/}
>+.if !empty(USE_BDB:M*+)
>+. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}
>+.  if ${_USE_BDB} <= ${bdb}
>+_SUPP_BDB_VER+=${bdb:C/\.//}
>+.  endif
>+. endfor
> .else
>-.for bdb in ${_DB_PORTS}
>-.if ${_WANT_BDB_VER} == "${bdb}" && ${_BDB_VER} == "no"
>-_MATCHED_DB_VER:=	${bdb:S/+//}
>-. if ${_MATCHED_DB_VER} == "${bdb}"
>-# USE_BDB is exactly specified
>-_BDB_VER=	${bdb}
>+_SUPP_BDB_VER=${USE_BDB}
>+.endif
>+# 2b. expand INVALID_BDB_VER if given with "+":
>+.if !empty(INVALID_BDB_VER:M*+)
>+_INV_BDB:=${INVALID_BDB_VER:C,\+$,,:C/(.)(.)$/\1.\2/}
>+_INV_BDB_VER:=
>+. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}
>+.  if ${_INV_BDB} <= ${bdb}
>+_INV_BDB_VER+=${bdb:C/\.//}
>+.  endif
>+. endfor
> .else
>-# USE_BDB is specified as VER+
>-.  for dbx in ${_DB_${_MATCHED_DB_VER}P}
>-.   if exists(${db${dbx}_FIND})
>-_BRKDB=	no
>-# Skip versions we are incompatible with
>-.    if defined(INVALID_BDB_VER)
>-_CHK_BDB:=	${dbx}
>-.     for BRKDB in ${INVALID_BDB_VER}
>-.      if ${_CHK_BDB} == "${BRKDB}"
>-_BRKDB= yes
>-.      endif
>-.     endfor
>-.    endif
>-.    if ${_BRKDB} == no
>-.     if defined(WITH_BDB_HIGHEST)
>-# Use the highest version of Berkeley DB found
>-_BDB_VER=	${dbx}
>-.     elif ${_BDB_VER} == no
>-# Use the first Berkeley DB found
>-_BDB_VER=	${dbx}
>-.     endif
>-.    endif
>-.   endif
>-.  endfor
>-.  if ${_BDB_VER} == "no"
>-# No existing db4 version is detected in system
>-_BDB_VER=	${_MATCHED_DB_VER}
>-.  endif
>-. endif
>+_INV_BDB_VER:=${INVALID_BDB_VER}
> .endif
>+# 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER
>+.for unsupp in ${_INV_BDB_VER}
>+_SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}}
> .endfor
>+
>+# 3a. calculate intersection in _INST_BDB_VER to see if there
>+# is a usable installed version
>+.for i in ${_INST_BDB_VER}
>+. if empty(_SUPP_BDB_VER:M${i})
>+_INST_BDB_VER:=	${_INST_BDB_VER:N${i}}
>+. endif
>+.endfor
>+_ELIGIBLE_BDB_VER:=${_INST_BDB_VER}
>+
>+# 3b. if there is no usable version installed, check defaults
>+.if empty(_INST_BDB_VER)
>+_DFLT_BDB_VER:=${_DB_DEFAULTS}
>+# make sure we use a reasonable version for package builds
>+_WITH_BDB_HIGHEST=yes
>+. for i in ${_DFLT_BDB_VER}
>+.  if empty(_SUPP_BDB_VER:M${i})
>+_DFLT_BDB_VER:=	${_DFLT_BDB_VER:N${i}}
>+.  endif
>+. endfor
>+_ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER}
> .endif
> 
>-# USE_BDB is specified incorrectly, so mark this as IGNORE
>-.if ${_BDB_VER} == "no"
>-IGNORE=		cannot install: unknown Berkeley DB version: ${USE_BDB}
>+# 4. elect a version
>+_BDB_VER=
>+.for i in ${_ELIGIBLE_BDB_VER}
>+. if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER})
>+_BDB_VER:=${i}
>+. endif
>+.endfor
>+
>+# 5. catch errors or set variables
>+.if empty(_BDB_VER)
>+IGNORE=		cannot install: no eligible BerkeleyDB version. Requested: ${USE_BDB}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb
> .else
>-# Now check if we can use it
>-. if defined(INVALID_BDB_VER)
>-.  for VER in ${INVALID_BDB_VER}
>-_CHK_PLUS:=	${VER:S/+//}
>-# INVALID_BDB_VER is specified as VER+
>-.   if ${_CHK_PLUS}  != "${VER}"
>-.    if ${_BDB_VER} == "${_CHK_PLUS}"
>-_BDB_IGNORE=	yes
>-.    else
>-.     for VER_P in ${_DB_${_CHK_PLUS}P}
>-.      if ${_BDB_VER} == "${VER_P}"
>-_BDB_IGNORE=	yes
>-.      endif
>-.     endfor
>-.    endif
>-.   elif ${_BDB_VER} == "${VER}"
>-_BDB_IGNORE=	yes
>-.   endif
>-.  endfor
>-. endif
>-. if ${_BDB_IGNORE} == "yes"
>-IGNORE=		cannot install: does not work with Berkeley DB version ${_BDB_VER} (${INVALID_BDB_VER} not supported)
>+. if defined(BDB_BUILD_DEPENDS)
>+BUILD_DEPENDS+=	${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
> . else
>-# Now add the dependency on Berkeley DB ${_BDB_VER) version
>-# This is for ports that want to link Berkeley DB statically, such
>-# as devel/subversion, if the corresponding option is active:
>-.if defined(BDB_BUILD_DEPENDS)
>-BUILD_DEPENDS+=	${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
>-.else
> LIB_DEPENDS+=	${db${_BDB_VER}_DEPENDS}
>-.endif
>-.  if ${_BDB_VER} == 40
>-BDB_LIB_NAME=		db4
>-BDB_LIB_CXX_NAME=	db4_cxx
>-BDB_INCLUDE_DIR=	${LOCALBASE}/include/db4
>-.  elif ${_BDB_VER} == 42
>-BDB_LIB_NAME=		db-4.2
>-BDB_LIB_CXX_NAME=	db_cxx-4.2
>-BDB_LIB_DIR=		${LOCALBASE}/lib/db42
>-.  elif ${_BDB_VER} == 43
>-BDB_LIB_NAME=		db-4.3
>-BDB_LIB_CXX_NAME=	db_cxx-4.3
>-BDB_LIB_DIR=		${LOCALBASE}/lib/db43
>-.  elif ${_BDB_VER} == 44
>-BDB_LIB_NAME=		db-4.4
>-BDB_LIB_CXX_NAME=	db_cxx-4.4
>-BDB_LIB_DIR=		${LOCALBASE}/lib/db44
>-.  elif ${_BDB_VER} == 46
>-BDB_LIB_NAME=		db-4.6
>-BDB_LIB_CXX_NAME=	db_cxx-4.6
>-BDB_LIB_DIR=		${LOCALBASE}/lib/db46
>-.  elif ${_BDB_VER} == 47
>-BDB_LIB_NAME=		db-4.7
>-BDB_LIB_CXX_NAME=	db_cxx-4.7
>-BDB_LIB_DIR=		${LOCALBASE}/lib/db47
>-.  elif ${_BDB_VER} == 48
>+. 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
>+. elif ${_BDB_VER} == 5
> BDB_LIB_NAME=		db-5.3
> BDB_LIB_CXX_NAME=	db_cxx-5.3
> BDB_LIB_DIR=		${LOCALBASE}/lib/db5
>-.  elif ${_BDB_VER} == 6
>+. elif ${_BDB_VER} == 6
> BDB_LIB_NAME=		db-6.1
> BDB_LIB_CXX_NAME=	db_cxx-6.1
> BDB_LIB_DIR=		${LOCALBASE}/lib/db6
>-.  endif
>+. endif
> BDB_LIB_NAME?=		db${_BDB_VER}
> BDB_LIB_CXX_NAME?=	db${_BDB_VER}_cxx
> BDB_INCLUDE_DIR?=	${LOCALBASE}/include/db${_BDB_VER}
> BDB_LIB_DIR?=		${LOCALBASE}/lib
>-. endif
>+.endif
> BDB_VER=	${_BDB_VER}
>-.endif
> 
>+debug-bdb:
>+	@${ECHO_CMD} "--INPUTS----------------------------------------------------"
>+	@${ECHO_CMD} "${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}"
>+	@${ECHO_CMD} "WITH_BDB_VER: ${_WITH_BDB_VER_save}"
>+	@${ECHO_CMD} "WANT_BDB_VER: ${WANT_BDB_VER}"
>+	@${ECHO_CMD} "BDB_BUILD_DEPENDS: ${BDB_BUILD_DEPENDS}"
>+	@${ECHO_CMD} "USE_BDB (original): ${_USE_BDB_save}"
>+	@${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}"
>+	@${ECHO_CMD} "--PROCESSING------------------------------------------------"
>+	@${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}"
>+	@${ECHO_CMD} "invalid versions: ${_INV_BDB_VER}"
>+	@${ECHO_CMD} "installed versions: ${_INST_BDB_VER}"
>+	@${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}"
>+	@${ECHO_CMD} "USE_BDB (effective): ${USE_BDB}"
>+	@${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}"
>+	@${ECHO_CMD} "--OUTPUTS---------------------------------------------------"
>+	@${ECHO_CMD} "IGNORE=${IGNORE}"
>+	@${ECHO_CMD} "BDB_VER=${BDB_VER}"
>+	@${ECHO_CMD} "BDB_INCLUDE_DIR=${BDB_INCLUDE_DIR}"
>+	@${ECHO_CMD} "BDB_LIB_NAME=${BDB_LIB_NAME}"
>+	@${ECHO_CMD} "BDB_LIB_CXX_NAME=${BDB_LIB_CXX_NAME}"
>+	@${ECHO_CMD} "BDB_LIB_DIR=${BDB_LIB_DIR}"
>+	@${ECHO_CMD} "BUILD_DEPENDS=${BUILD_DEPENDS:M*/databases/db*}"
>+	@${ECHO_CMD} "LIB_DEPENDS=${LIB_DEPENDS:M*/databases/db*}"
>+	@${ECHO_CMD} "------------------------------------------------------------"
>+
> # Obsolete variables - ports can define these to want users about
> # variables that may be in /etc/make.conf but that are no longer
> # effective:
>Index: databases/Makefile
>===================================================================
>--- databases/Makefile	(revision 365033)
>+++ databases/Makefile	(working copy)
>@@ -38,16 +38,6 @@
>     SUBDIR += cyrus-imspd
>     SUBDIR += dalmp
>     SUBDIR += datamodeler
>-    SUBDIR += db
>-    SUBDIR += db4
>-    SUBDIR += db41
>-    SUBDIR += db41-nocrypto
>-    SUBDIR += db42
>-    SUBDIR += db42-nocrypto
>-    SUBDIR += db43
>-    SUBDIR += db44
>-    SUBDIR += db46
>-    SUBDIR += db47
>     SUBDIR += db48
>     SUBDIR += db4o-mono
>     SUBDIR += db5
>Index: databases/db4/Makefile
>===================================================================
>--- databases/db4/Makefile	(revision 365033)
>+++ databases/db4/Makefile	(working copy)
>@@ -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>
>Index: databases/db4/distinfo
>===================================================================
>--- databases/db4/distinfo	(revision 365033)
>+++ databases/db4/distinfo	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (bdb/db-4.0.14.tar.gz) = a7d983d88b7ba43cfd9a39bfcb0f3f489b15e4b113452e94b7c4bbca0225b7f5
>-SIZE (bdb/db-4.0.14.tar.gz) = 2701799
>Index: databases/db4/files/patch-dist__Makefile.in
>===================================================================
>--- databases/db4/files/patch-dist__Makefile.in	(revision 365033)
>+++ databases/db4/files/patch-dist__Makefile.in	(working copy)
>@@ -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
>- 
>Index: databases/db4/files/patch-dist__configure
>===================================================================
>--- databases/db4/files/patch-dist__configure	(revision 365033)
>+++ databases/db4/files/patch-dist__configure	(working copy)
>@@ -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.
>Index: databases/db4/files/patch-dist__ltmain.sh
>===================================================================
>--- databases/db4/files/patch-dist__ltmain.sh	(revision 365033)
>+++ databases/db4/files/patch-dist__ltmain.sh	(working copy)
>@@ -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"
>Index: databases/db4/files/patch-objformat
>===================================================================
>--- databases/db4/files/patch-objformat	(revision 365033)
>+++ databases/db4/files/patch-objformat	(working copy)
>@@ -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*)
>Index: databases/db4/pkg-descr
>===================================================================
>--- databases/db4/pkg-descr	(revision 365033)
>+++ databases/db4/pkg-descr	(working copy)
>@@ -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/
>Index: databases/db4/pkg-plist
>===================================================================
>--- databases/db4/pkg-plist	(revision 365033)
>+++ databases/db4/pkg-plist	(working copy)
>@@ -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
>Index: databases/db41/Makefile
>===================================================================
>--- databases/db41/Makefile	(revision 365033)
>+++ databases/db41/Makefile	(working copy)
>@@ -1,51 +0,0 @@
>-# Created by: Matthias Andree <matthias.andree@gmx.de>
>-# $FreeBSD$
>-
>-PORTNAME=	db41
>-PORTVERSION=	4.1.25
>-PORTREVISION=	4
>-CATEGORIES=	databases
>-MASTER_SITES=	http://download.oracle.com/berkeley-db/
>-PKGNAMESUFFIX?=
>-DISTNAME?=	db-${PORTVERSION}
>-DIST_SUBDIR=	bdb
>-
>-PATCH_SITES=	http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION}/
>-PATCHFILES=	patch.${PORTVERSION}.2
>-PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
>-
>-MAINTAINER=	mandree@FreeBSD.org
>-COMMENT=	The Berkeley DB package, revision 4.1
>-
>-CONFLICTS?=	db41-nocrypto-4*
>-
>-DEPRECATED=	Please use databases/db5 or db6 for new installs.
>-
>-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
>-
>-USES=		desthack
>-GNU_CONFIGURE=	yes
>-CONFIGURE_SCRIPT=	../dist/configure
>-CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 \
>-		--enable-cxx --enable-dynamic \
>-		--includedir=${STAGEDIR}${PREFIX}/include/db41
>-USE_LDCONFIG=	yes
>-
>-OPTIONS_DEFINE=	DOCS
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-INSTALL_TARGET=	install install_docs
>-PORTDOCS=	*
>-.endif
>-
>-.if ${ARCH} == amd64
>-CONFIGURE_ARGS+=	--with-mutex=x86/gcc-assembly
>-.endif
>-
>-post-patch:
>-	@${REINPLACE_CMD} -Ee \
>-		's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
>-
>-.include <bsd.port.mk>
>Index: databases/db41/distinfo
>===================================================================
>--- databases/db41/distinfo	(revision 365033)
>+++ databases/db41/distinfo	(working copy)
>@@ -1,4 +0,0 @@
>-SHA256 (bdb/db-4.1.25.tar.gz) = 0d0644039b24f8eb823d0492f86bb8cd61fde36adbf85c52f4141fcbce05d9f3
>-SIZE (bdb/db-4.1.25.tar.gz) = 2901161
>-SHA256 (bdb/patch.4.1.25.2) = 391e652b0b6a1e2410a8e4b8d7e0ed0d53c9af549a29754e04532f390bee8f5d
>-SIZE (bdb/patch.4.1.25.2) = 18100
>Index: databases/db41/files/patch-dist__Makefile.in
>===================================================================
>--- databases/db41/files/patch-dist__Makefile.in	(revision 365033)
>+++ databases/db41/files/patch-dist__Makefile.in	(working copy)
>@@ -1,144 +0,0 @@
>---- ../dist/Makefile.in.orig	Sat Aug 31 03:11:56 2002
>-+++ ../dist/Makefile.in	Sat Dec 28 01:15:46 2002
>-@@ -11,7 +11,7 @@
>- bindir=	@bindir@
>- includedir=@includedir@
>- libdir=	@libdir@
>--docdir=	$(prefix)/docs
>-+docdir=	$(prefix)/share/doc/db41
>- 
>- 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@
>- 
>- ##################################################
>-@@ -59,13 +60,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=		libdb41.a
>-+libso_base=	libdb41
>-+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.
>-@@ -78,13 +79,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=		libdb41_cxx.a
>-+libxso_base=	libdb41_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.
>-@@ -364,8 +365,8 @@
>- 
>- UTIL_PROGS=\
>- 	@ADDITIONAL_PROGS@ \
>--	db_archive db_checkpoint db_deadlock \
>--	db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
>-+	db41_archive db41_checkpoint db41_deadlock \
>-+	db41_dump db41_load db41_printlog db41_recover db41_stat db41_upgrade db41_verify
>- 
>- ##################################################
>- # List of files installed into the library directory.
>-@@ -481,53 +482,53 @@
>- 	echo >> $@ exec java com.sleepycat.db.rpcserver.DbServer \$$@
>- 	chmod +x $@
>- 
>--db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
>-+db41_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)
>-+db41_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)
>-+db41_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_cache@o@ util_sig@o@ $(DEF_LIB)
>-+db41_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
>- 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
>- 	$(POSTLINK) $@
>- 
>--db_dump185: db_dump185@o@ @LTLIBOBJS@
>-+db41_dump185: db_dump185@o@ @LTLIBOBJS@
>- 	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LTLIBOBJS@ $(DB185LIB)
>- 	$(POSTLINK) $@
>- 
>--db_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
>-+db41_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
>- 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
>- 	$(POSTLINK) $@
>- 
>--db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
>-+db41_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)
>-+db41_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_cache@o@ util_sig@o@ $(DEF_LIB)
>-+db41_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
>- 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
>- 	$(POSTLINK) $@
>- 
>--db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
>-+db41_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_cache@o@ util_sig@o@ $(DEF_LIB)
>-+db41_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
>- 	$(CCLINK) -o $@ $(LDFLAGS) \
>- 	    db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
>- 	$(POSTLINK) $@
>-@@ -536,7 +537,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
>- 
>Index: databases/db41/files/patch-dist__configure
>===================================================================
>--- databases/db41/files/patch-dist__configure	(revision 365033)
>+++ databases/db41/files/patch-dist__configure	(working copy)
>@@ -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="db41_dump185 $ADDITIONAL_PROGS"
>- fi
>- 
>- # Checks for system/compiler characteristics.
>Index: databases/db41/files/patch-dist__ltmain.sh
>===================================================================
>--- databases/db41/files/patch-dist__ltmain.sh	(revision 365033)
>+++ databases/db41/files/patch-dist__ltmain.sh	(working copy)
>@@ -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"
>Index: databases/db41/files/patch-objformat
>===================================================================
>--- databases/db41/files/patch-objformat	(revision 365033)
>+++ databases/db41/files/patch-objformat	(working copy)
>@@ -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*)
>Index: databases/db41/files/patch-upstream.4.1.25.1
>===================================================================
>--- databases/db41/files/patch-upstream.4.1.25.1	(revision 365033)
>+++ databases/db41/files/patch-upstream.4.1.25.1	(working copy)
>@@ -1,20 +0,0 @@
>-*** ../fileops/fop_util.c	8 Jan 2003 05:01:56 -0000	1.57
>---- ../fileops/fop_util.c	12 Jan 2003 19:44:29 -0000	1.58
>-***************
>-*** 40,46 ****
>-  	u_int32_t __lockval;						\
>-  									\
>-  	if (LOCKING_ON((ENV))) {					\
>-! 		__lockval = 0;						\
>-  		__dbt.data = &__lockval;				\
>-  		__dbt.size = sizeof(__lockval);				\
>-  		if ((ret = (ENV)->lock_get((ENV), (ID),			\
>---- 40,46 ----
>-  	u_int32_t __lockval;						\
>-  									\
>-  	if (LOCKING_ON((ENV))) {					\
>-! 		__lockval = 1;						\
>-  		__dbt.data = &__lockval;				\
>-  		__dbt.size = sizeof(__lockval);				\
>-  		if ((ret = (ENV)->lock_get((ENV), (ID),			\
>-
>Index: databases/db41/files/patch-upstream.4.1.25.3
>===================================================================
>--- databases/db41/files/patch-upstream.4.1.25.3	(revision 365033)
>+++ databases/db41/files/patch-upstream.4.1.25.3	(working copy)
>@@ -1,50 +0,0 @@
>-*** ../mp/mp_fget.c.orig	2002-08-07 08:23:01.000000000 -0700
>---- ../mp/mp_fget.c	2006-05-30 20:32:20.000000000 -0700
>-***************
>-*** 506,513 ****
>-  	 */
>-  	if (state != SECOND_MISS && bhp->ref == 1) {
>-  		bhp->priority = UINT32_T_MAX;
>-! 		SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
>-! 		SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
>-  		hp->hash_priority =
>-  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
>-  	}
>---- 506,517 ----
>-  	 */
>-  	if (state != SECOND_MISS && bhp->ref == 1) {
>-  		bhp->priority = UINT32_T_MAX;
>-! 		/* Move the buffer if there are others in the bucket. */
>-! 		if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != bhp
>-! 		    || SH_TAILQ_NEXT(bhp, hq, __bh) != NULL) {
>-! 			SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
>-! 			SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
>-! 		}
>-  		hp->hash_priority =
>-  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
>-  	}
>-*** ../mp/mp_fput.c.orig	2002-08-13 06:26:41.000000000 -0700
>---- ../mp/mp_fput.c	2006-05-30 20:55:11.000000000 -0700
>-***************
>-*** 166,171 ****
>---- 166,176 ----
>-  	 * to the correct position in the list.
>-  	 */
>-  	argbhp = bhp;
>-+ 	/* Move the buffer if there are others in the bucket. */
>-+ 	if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) == bhp
>-+ 	    && SH_TAILQ_NEXT(bhp, hq, __bh) != NULL)
>-+ 	    	goto done;
>-+ 
>-  	SH_TAILQ_REMOVE(&hp->hash_bucket, argbhp, hq, __bh);
>-  
>-  	prev = NULL;
>-***************
>-*** 178,183 ****
>---- 183,189 ----
>-  	else
>-  		SH_TAILQ_INSERT_AFTER(&hp->hash_bucket, prev, argbhp, hq, __bh);
>-  
>-+ done:
>-  	/* Reset the hash bucket's priority. */
>-  	hp->hash_priority = SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
>Index: databases/db41/pkg-descr
>===================================================================
>--- databases/db41/pkg-descr	(revision 365033)
>+++ databases/db41/pkg-descr	(working copy)
>@@ -1,10 +0,0 @@
>-Version 4.1 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.1
>-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/
>Index: databases/db41/pkg-plist
>===================================================================
>--- databases/db41/pkg-plist	(revision 365033)
>+++ databases/db41/pkg-plist	(working copy)
>@@ -1,23 +0,0 @@
>-bin/db41_archive
>-bin/db41_checkpoint
>-bin/db41_deadlock
>-bin/db41_dump
>-bin/db41_dump185
>-bin/db41_load
>-bin/db41_printlog
>-bin/db41_recover
>-bin/db41_stat
>-bin/db41_upgrade
>-bin/db41_verify
>-include/db41/cxx_common.h
>-include/db41/cxx_except.h
>-include/db41/db.h
>-include/db41/db_185.h
>-include/db41/db_cxx.h
>-lib/libdb41.a
>-lib/libdb41.so
>-lib/libdb41.so.1
>-lib/libdb41_cxx.a
>-lib/libdb41_cxx.so
>-lib/libdb41_cxx.so.1
>-@dirrm include/db41
>Index: databases/db41-nocrypto/Makefile
>===================================================================
>--- databases/db41-nocrypto/Makefile	(revision 365033)
>+++ databases/db41-nocrypto/Makefile	(working copy)
>@@ -1,12 +0,0 @@
>-# Created by: Matthias Andree <matthias.andree@gmx.de>
>-# $FreeBSD$
>-
>-PKGNAMESUFFIX=	-nocrypto
>-DISTNAME=	db-${PORTVERSION}.NC
>-
>-MASTERDIR=	${.CURDIR}/../db41
>-DISTINFO_FILE=	${.CURDIR}/distinfo
>-
>-CONFLICTS=	db41-4*
>-
>-.include "${MASTERDIR}/Makefile"
>Index: databases/db41-nocrypto/distinfo
>===================================================================
>--- databases/db41-nocrypto/distinfo	(revision 365033)
>+++ databases/db41-nocrypto/distinfo	(working copy)
>@@ -1,4 +0,0 @@
>-SHA256 (bdb/db-4.1.25.NC.tar.gz) = 35a304a98af6d9f6a7443c58fc72e877293d5fb95e326b08a5470dc4f4542337
>-SIZE (bdb/db-4.1.25.NC.tar.gz) = 2892289
>-SHA256 (bdb/patch.4.1.25.2) = 391e652b0b6a1e2410a8e4b8d7e0ed0d53c9af549a29754e04532f390bee8f5d
>-SIZE (bdb/patch.4.1.25.2) = 18100
>Index: databases/db42/Makefile
>===================================================================
>--- databases/db42/Makefile	(revision 365033)
>+++ databases/db42/Makefile	(working copy)
>@@ -1,32 +0,0 @@
>-# Created by: Matthias Andree <matthias.andree@gmx.de>
>-# $FreeBSD$
>-
>-PORTNAME=	db42
>-PORTVERSION=	4.2.52
>-PORTREVISION=	5
>-CATEGORIES=	databases
>-PKGNAMESUFFIX?=
>-
>-PATCHFILES=	patch.${PORTVERSION}.1  patch.${PORTVERSION}.2 \
>-		patch.${PORTVERSION}.3  patch.${PORTVERSION}.4 \
>-		patch.${PORTVERSION}.5
>-
>-MAINTAINER=	mandree@FreeBSD.org
>-COMMENT=	The Berkeley DB package, revision 4.2
>-
>-DEPRECATED=	Please use databases/db5 or db6 for new installs.
>-
>-CONFLICTS?=	db42-nocrypto-4*
>-
>-MASTERDIR?=	${.CURDIR}
>-
>-SLAVE_PORT=	no
>-
>-.include <${MASTERDIR}/Makefile.db>
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == amd64
>-CONFIGURE_ARGS+=	--with-mutex=x86/gcc-assembly
>-.endif
>-
>-.include <bsd.port.post.mk>
>Index: databases/db42/Makefile.db
>===================================================================
>--- databases/db42/Makefile.db	(revision 365033)
>+++ databases/db42/Makefile.db	(working copy)
>@@ -1,44 +0,0 @@
>-# $FreeBSD$
>-
>-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}/
>-PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
>-
>-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
>-
>-USE_LDCONFIG=		yes
>-USE_AUTOTOOLS=		libtool
>-CONFIGURE_SCRIPT=	../dist/configure
>-LIBTOOLFILES=		${CONFIGURE_SCRIPT}
>-BDBVER=			${PORTVERSION:R}
>-BDBMINOR=		${BDBVER:E:S/^\.//}
>-BDBDIR=			BerkeleyDB.${BDBVER}
>-CONFIGURE_ARGS=		--enable-compat185 --enable-dump185 \
>-			--enable-cxx --enable-dynamic \
>-			--enable-rpc \
>-			--with-uniquename \
>-			--includedir=${PREFIX}/include/${PORTNAME} \
>-			--libdir=${PREFIX}/lib/${PORTNAME} \
>-			--bindir=${PREFIX}/bin/${PORTNAME}
>-INSTALL_TARGET=		install_include install_lib install_utilities
>-INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
>-
>-PORTDOCS=	*
>-
>-pre-patch:
>-	${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g; s,/usr/bin/objformat \|\| echo aout,/usr/bin/objformat || echo elf,' ${WRKSRC}/${CONFIGURE_SCRIPT}
>-
>-pre-configure:
>-	${CHMOD} u+w ${WRKSRC}/../dist/configure
>-
>-post-install:
>-.for i in libdb libdb_cxx
>-	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.${BDBMINOR} ${STAGEDIR}${PREFIX}/lib
>-	${LN} -s -f ${i}-${BDBVER}.so.${BDBMINOR} ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
>-.endfor
>-	@${RMDIR} ${STAGEDIR}${DOCSDIR}/ref/splash 2>/dev/null || :
>-	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \
>-	for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
>Index: databases/db42/distinfo
>===================================================================
>--- databases/db42/distinfo	(revision 365033)
>+++ databases/db42/distinfo	(working copy)
>@@ -1,12 +0,0 @@
>-SHA256 (bdb/db-4.2.52.tar.gz) = f4bddd8d1b4cde0daf5e13e3493ed62a25b736b0bf258e1d929e47bc6a82a28c
>-SIZE (bdb/db-4.2.52.tar.gz) = 3919271
>-SHA256 (bdb/patch.4.2.52.1) = 98b7580916459ee931b9c7e06dcb9da980732672fe0811714933f366ad97dfa5
>-SIZE (bdb/patch.4.2.52.1) = 988
>-SHA256 (bdb/patch.4.2.52.2) = c9b132bcc8f1c12e03baaf47abd3801f2adf24ffbd56f35a27617fec12654f32
>-SIZE (bdb/patch.4.2.52.2) = 1433
>-SHA256 (bdb/patch.4.2.52.3) = ca5245d2e1c7a40df5ec57cbabee8bf0106292c69a37eb0ca275d1aa59061907
>-SIZE (bdb/patch.4.2.52.3) = 8672
>-SHA256 (bdb/patch.4.2.52.4) = c15c82071c02ce1a10024c572e2e9fd72006089007141a01fdd37b889411b973
>-SIZE (bdb/patch.4.2.52.4) = 1311
>-SHA256 (bdb/patch.4.2.52.5) = 242f1a9c3efdd61a2b738c12617175849dbc73df6a2bf7cff61c814b13905e06
>-SIZE (bdb/patch.4.2.52.5) = 839
>Index: databases/db42/files/patch-dist__configure
>===================================================================
>--- databases/db42/files/patch-dist__configure	(revision 365033)
>+++ databases/db42/files/patch-dist__configure	(working copy)
>@@ -1,15 +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
>Index: databases/db42/pkg-descr
>===================================================================
>--- databases/db42/pkg-descr	(revision 365033)
>+++ databases/db42/pkg-descr	(working copy)
>@@ -1,14 +0,0 @@
>-Version 4.2 of the Berkeley Data Base library which offers (key/value) storage
>-with optional concurrent access or transactions interface.
>-
>-Utilities are included in the distribution to convert v1.85 databases to v4.2
>-databases, and a backwards compatible API is provided to maintain
>-compatibility with programs using the v1.85 interface.
>-
>-Note that this port has a different layout than the 3.3, 4.0 and 4.1 ports,
>-it does not rename libraries.
>-
>-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/
>Index: databases/db42/pkg-plist
>===================================================================
>--- databases/db42/pkg-plist	(revision 365033)
>+++ databases/db42/pkg-plist	(working copy)
>@@ -1,48 +0,0 @@
>-bin/db42/berkeley_db_svc
>-bin/db42/db_archive
>-bin/db42/db_checkpoint
>-bin/db42/db_deadlock
>-bin/db42/db_dump
>-bin/db42/db_dump185
>-bin/db42/db_load
>-bin/db42/db_printlog
>-bin/db42/db_recover
>-bin/db42/db_stat
>-bin/db42/db_upgrade
>-bin/db42/db_verify
>-bin/berkeley_db_svc-4.2
>-bin/db_archive-4.2
>-bin/db_checkpoint-4.2
>-bin/db_deadlock-4.2
>-bin/db_dump-4.2
>-bin/db_dump185-4.2
>-bin/db_load-4.2
>-bin/db_printlog-4.2
>-bin/db_recover-4.2
>-bin/db_stat-4.2
>-bin/db_upgrade-4.2
>-bin/db_verify-4.2
>-include/db42/db.h
>-include/db42/db_185.h
>-include/db42/db_cxx.h
>-lib/db42/libdb-4.2.a
>-lib/db42/libdb-4.2.la
>-lib/db42/libdb-4.2.so
>-lib/db42/libdb-4.2.so.2
>-lib/db42/libdb-4.so
>-lib/db42/libdb.a
>-lib/db42/libdb.so
>-lib/db42/libdb_cxx-4.2.a
>-lib/db42/libdb_cxx-4.2.la
>-lib/db42/libdb_cxx-4.2.so
>-lib/db42/libdb_cxx-4.2.so.2
>-lib/db42/libdb_cxx-4.so
>-lib/db42/libdb_cxx.a
>-lib/db42/libdb_cxx.so
>-lib/libdb-4.2.so
>-lib/libdb-4.2.so.2
>-lib/libdb_cxx-4.2.so
>-lib/libdb_cxx-4.2.so.2
>-@dirrm lib/db42
>-@dirrm include/db42
>-@dirrm bin/db42
>Index: databases/db42-nocrypto/Makefile
>===================================================================
>--- databases/db42-nocrypto/Makefile	(revision 365033)
>+++ databases/db42-nocrypto/Makefile	(working copy)
>@@ -1,14 +0,0 @@
>-# Created by: matthias.andree@gmx.de
>-# $FreeBSD$
>-
>-PKGNAMESUFFIX=	-nocrypto
>-DISTNAME=	db-${PORTVERSION}.NC
>-
>-MAINTAINER=	mandree@FreeBSD.org
>-
>-MASTERDIR=	${.CURDIR}/../db42
>-DISTINFO_FILE=	${.CURDIR}/distinfo
>-
>-CONFLICTS=	db42-4*
>-
>-.include "${MASTERDIR}/Makefile"
>Index: databases/db42-nocrypto/distinfo
>===================================================================
>--- databases/db42-nocrypto/distinfo	(revision 365033)
>+++ databases/db42-nocrypto/distinfo	(working copy)
>@@ -1,12 +0,0 @@
>-SHA256 (bdb/db-4.2.52.NC.tar.gz) = 46ba780a698fc981dcdd20a213e939d9b50ca76743c802dfe6fa4e9b7174e54a
>-SIZE (bdb/db-4.2.52.NC.tar.gz) = 3879486
>-SHA256 (bdb/patch.4.2.52.1) = 98b7580916459ee931b9c7e06dcb9da980732672fe0811714933f366ad97dfa5
>-SIZE (bdb/patch.4.2.52.1) = 988
>-SHA256 (bdb/patch.4.2.52.2) = c9b132bcc8f1c12e03baaf47abd3801f2adf24ffbd56f35a27617fec12654f32
>-SIZE (bdb/patch.4.2.52.2) = 1433
>-SHA256 (bdb/patch.4.2.52.3) = ca5245d2e1c7a40df5ec57cbabee8bf0106292c69a37eb0ca275d1aa59061907
>-SIZE (bdb/patch.4.2.52.3) = 8672
>-SHA256 (bdb/patch.4.2.52.4) = c15c82071c02ce1a10024c572e2e9fd72006089007141a01fdd37b889411b973
>-SIZE (bdb/patch.4.2.52.4) = 1311
>-SHA256 (bdb/patch.4.2.52.5) = 242f1a9c3efdd61a2b738c12617175849dbc73df6a2bf7cff61c814b13905e06
>-SIZE (bdb/patch.4.2.52.5) = 839
>Index: databases/db43/Makefile
>===================================================================
>--- databases/db43/Makefile	(revision 365033)
>+++ databases/db43/Makefile	(working copy)
>@@ -1,66 +0,0 @@
>-# Created by: Matthias Andree <matthias.andree@gmx.de>
>-# $FreeBSD$
>-
>-PORTNAME=	db43
>-PORTVERSION=	4.3.29
>-PORTREVISION=	1
>-CATEGORIES=	databases
>-MASTER_SITES=	http://download.oracle.com/berkeley-db/ 
>-DISTNAME=	db-${PORTVERSION}
>-DIST_SUBDIR=	bdb
>-
>-MAINTAINER=	mandree@FreeBSD.org
>-COMMENT=	The Berkeley DB package, revision 4.3
>-
>-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
>-
>-DEPRECATED=	Please use databases/db5 or db6 for new installs.
>-
>-USE_LDCONFIG=		yes
>-GNU_CONFIGURE=	yes
>-CONFIGURE_SCRIPT=	../dist/configure
>-LIBTOOLFILES=		${CONFIGURE_SCRIPT}
>-BDBVER=			${PORTVERSION:R}
>-BDBMINOR=		${BDBVER:E:S/^\.//}
>-BDBDIR=			BerkeleyDB.${BDBVER}
>-CONFIGURE_ARGS=		--enable-compat185 --enable-dump185 \
>-			--enable-cxx --enable-dynamic \
>-			--enable-rpc \
>-			--includedir=${PREFIX}/include/${PORTNAME} \
>-			--libdir=${PREFIX}/lib/${PORTNAME} \
>-			--bindir=${PREFIX}/bin/${PORTNAME}
>-INSTALL_TARGET=		install_include install_lib install_utilities
>-
>-INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
>-PORTDOCS=		*
>-
>-OPTIONS_DEFINE=	DOCS
>-
>-.include <bsd.port.options.mk>
>-
>-pre-patch:
>-	${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g; s,/usr/bin/objformat \|\| echo aout,/usr/bin/objformat || echo elf,' ${WRKSRC}/${CONFIGURE_SCRIPT}
>-
>-pre-configure:
>-	${CHMOD} u+w ${WRKSRC}/../dist/configure
>-
>-post-configure:
>-	${REINPLACE_CMD} -e '/^extern  void db_rpc_serverprog/ d;' ${WRKSRC}/db_server.h
>-
>-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
>-.if ${PORT_OPTIONS:MDOCS}
>-	@${RMDIR} ${DOCSDIR}/ref/splash 2>/dev/null || :
>-.endif
>-	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ; \
>-	for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == amd64
>-CONFIGURE_ARGS+=	--with-mutex=x86/gcc-assembly
>-.endif
>-
>-.include <bsd.port.post.mk>
>Index: databases/db43/distinfo
>===================================================================
>--- databases/db43/distinfo	(revision 365033)
>+++ databases/db43/distinfo	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (bdb/db-4.3.29.tar.gz) = a1fa714482f25a67a19490303a0164326ac63bd7653ae3f4664c2536b14f3337
>-SIZE (bdb/db-4.3.29.tar.gz) = 5942547
>Index: databases/db43/files/patch-dist__configure
>===================================================================
>--- databases/db43/files/patch-dist__configure	(revision 365033)
>+++ databases/db43/files/patch-dist__configure	(working copy)
>@@ -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}"
>- 
>Index: databases/db43/files/patch-upstream.4.3.29.1
>===================================================================
>--- databases/db43/files/patch-upstream.4.3.29.1	(revision 365033)
>+++ databases/db43/files/patch-upstream.4.3.29.1	(working copy)
>@@ -1,24 +0,0 @@
>-*** ../mp/mp_fget.c.orig	2006-05-30 20:44:11.000000000 -0700
>---- ../mp/mp_fget.c	2006-05-30 20:44:22.000000000 -0700
>-***************
>-*** 577,584 ****
>-  	 */
>-  	if (state != SECOND_MISS && bhp->ref == 1) {
>-  		bhp->priority = UINT32_MAX;
>-! 		SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
>-! 		SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
>-  		hp->hash_priority =
>-  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
>-  	}
>---- 577,587 ----
>-  	 */
>-  	if (state != SECOND_MISS && bhp->ref == 1) {
>-  		bhp->priority = UINT32_MAX;
>-! 		if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) !=
>-! 		     SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) {
>-! 			SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
>-! 			SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
>-! 		}
>-  		hp->hash_priority =
>-  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
>-  	}
>Index: databases/db43/pkg-descr
>===================================================================
>--- databases/db43/pkg-descr	(revision 365033)
>+++ databases/db43/pkg-descr	(working copy)
>@@ -1,11 +0,0 @@
>-Version 4.3 of the Berkeley Data Base library which offers (key/value) storage
>-with optional concurrent access or transactions interface.
>-
>-Utilities are included in the distribution to convert v1.85 databases to v4.3
>-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/
>Index: databases/db43/pkg-plist
>===================================================================
>--- databases/db43/pkg-plist	(revision 365033)
>+++ databases/db43/pkg-plist	(working copy)
>@@ -1,48 +0,0 @@
>-bin/db43/berkeley_db_svc
>-bin/db43/db_archive
>-bin/db43/db_checkpoint
>-bin/db43/db_deadlock
>-bin/db43/db_dump
>-bin/db43/db_dump185
>-bin/db43/db_load
>-bin/db43/db_printlog
>-bin/db43/db_recover
>-bin/db43/db_stat
>-bin/db43/db_upgrade
>-bin/db43/db_verify
>-bin/berkeley_db_svc-4.3
>-bin/db_archive-4.3
>-bin/db_checkpoint-4.3
>-bin/db_deadlock-4.3
>-bin/db_dump-4.3
>-bin/db_dump185-4.3
>-bin/db_load-4.3
>-bin/db_printlog-4.3
>-bin/db_recover-4.3
>-bin/db_stat-4.3
>-bin/db_upgrade-4.3
>-bin/db_verify-4.3
>-include/db43/db.h
>-include/db43/db_185.h
>-include/db43/db_cxx.h
>-lib/db43/libdb-4.3.a
>-lib/db43/libdb-4.3.la
>-lib/db43/libdb-4.3.so
>-lib/db43/libdb-4.3.so.0
>-lib/db43/libdb-4.so
>-lib/db43/libdb.a
>-lib/db43/libdb.so
>-lib/db43/libdb_cxx-4.3.a
>-lib/db43/libdb_cxx-4.3.la
>-lib/db43/libdb_cxx-4.3.so
>-lib/db43/libdb_cxx-4.3.so.0
>-lib/db43/libdb_cxx-4.so
>-lib/db43/libdb_cxx.a
>-lib/db43/libdb_cxx.so
>-lib/libdb-4.3.so
>-lib/libdb-4.3.so.0
>-lib/libdb_cxx-4.3.so
>-lib/libdb_cxx-4.3.so.0
>-@dirrm lib/db43
>-@dirrm include/db43
>-@dirrm bin/db43
>Index: databases/db44/Makefile
>===================================================================
>--- databases/db44/Makefile	(revision 365033)
>+++ databases/db44/Makefile	(working copy)
>@@ -1,62 +0,0 @@
>-# Created by: Matthias Andree <matthias.andree@gmx.de>
>-# $FreeBSD$
>-
>-PORTNAME=	db44
>-PORTVERSION=	4.4.20.4
>-CATEGORIES=	databases
>-MASTER_SITES=	http://download.oracle.com/berkeley-db/ 
>-PKGNAMESUFFIX?=
>-DISTNAME=	db-4.4.20
>-DIST_SUBDIR=	bdb
>-
>-MAINTAINER= ports@FreeBSD.org
>-COMMENT=	The Berkeley DB package, revision 4.4
>-
>-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
>-
>-DEPRECATED=	Please use databases/db5 or db6 for new installs.
>-
>-USE_LDCONFIG=		yes
>-GNU_CONFIGURE=		yes
>-DEBUG_FLAGS=		-g -O1	# need -O1 for inline assembly
>-CONFIGURE_SCRIPT=	../dist/configure
>-LIBTOOLFILES=		${CONFIGURE_SCRIPT}
>-BDBVER=			${PORTVERSION:R:R}
>-CONFIGURE_ARGS=		--enable-compat185 --enable-dump185 \
>-			--enable-cxx --enable-dynamic \
>-			--enable-rpc \
>-			--includedir=${PREFIX}/include/${PORTNAME} \
>-			--libdir=${PREFIX}/lib/${PORTNAME} \
>-			--bindir=${PREFIX}/bin/${PORTNAME}
>-INSTALL_TARGET=		install_include install_lib install_utilities
>-
>-OPTIONS_DEFINE=	DOCS
>-
>-DOCS_INSTALL_TARGET=	install_docs docdir=${DOCSDIR}
>-PORTDOCS=		*
>-
>-NO_STAGE=	yes
>-
>-.include <bsd.port.options.mk>
>-
>-pre-patch:
>-	@${REINPLACE_CMD} -Ee 's|-l?pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
>-
>-pre-configure:
>-	@${CHMOD} u+w ${WRKSRC}/../dist/configure
>-
>-post-configure:
>-	@${REINPLACE_CMD} -e '/^extern  void db_rpc_serverprog/ d;' ${WRKSRC}/db_server.h
>-
>-post-install:
>-.for i in libdb libdb_cxx
>-	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${PREFIX}/lib
>-	${LN} -s -f ${i}-${BDBVER}.so.0 ${PREFIX}/lib/${i}-${BDBVER}.so
>-.endfor
>-.if ${PORT_OPTIONS:MDOCS}
>-	@${RMDIR} ${DOCSDIR}/ref/splash 2>/dev/null || :
>-.endif
>-	cd ${PREFIX}/bin/${PORTNAME} ; \
>-	for i in * ; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
>-
>-.include <bsd.port.mk>
>Index: databases/db44/distinfo
>===================================================================
>--- databases/db44/distinfo	(revision 365033)
>+++ databases/db44/distinfo	(working copy)
>@@ -1,10 +0,0 @@
>-SHA256 (bdb/db-4.4.20.tar.gz) = 298ab78801f7502016aa2db033b65fab46f323533bdc08610d3dabd910d63b79
>-SIZE (bdb/db-4.4.20.tar.gz) = 7952742
>-SHA256 (bdb/patch.4.4.20.1) = 4eeb18450b88703282251c386405bf7c9efa053a42d1dda97603ee8039ee5869
>-SIZE (bdb/patch.4.4.20.1) = 867
>-SHA256 (bdb/patch.4.4.20.2) = 45949e288482736bbc27bd62c854a99fad4b3e55103897eafd62bce1d5629bbc
>-SIZE (bdb/patch.4.4.20.2) = 721
>-SHA256 (bdb/patch.4.4.20.3) = ae54bb752a31655a1a945f12900b740fad397c3e2ddab792ecfd4660d3e6e236
>-SIZE (bdb/patch.4.4.20.3) = 1366
>-SHA256 (bdb/patch.4.4.20.4) = 7018f74e5184451809f6864172132472e91d95e2bec97ce6124afb67f0d65e59
>-SIZE (bdb/patch.4.4.20.4) = 837
>Index: databases/db44/files/patch-dist__configure
>===================================================================
>--- databases/db44/files/patch-dist__configure	(revision 365033)
>+++ databases/db44/files/patch-dist__configure	(working copy)
>@@ -1,13 +0,0 @@
>---- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
>-+++ ../dist/configure	Wed Dec  5 13:24:01 2001
>-@@ -21657,8 +21657,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}"
>- 
>Index: databases/db44/files/patch-upstream.4.4.20.1
>===================================================================
>--- databases/db44/files/patch-upstream.4.4.20.1	(revision 365033)
>+++ databases/db44/files/patch-upstream.4.4.20.1	(working copy)
>@@ -1,27 +0,0 @@
>-*** ../qam/qam_files.c.orig	2005-10-20 11:57:12.000000000 -0700
>---- ../qam/qam_files.c	2006-01-27 13:38:38.000000000 -0800
>-***************
>-*** 411,416 ****
>---- 411,422 ----
>-  	    DB_APP_DATA, buf, 0, NULL, &real_name)) != 0)
>-  		goto err;
>-  #endif
>-+ 
>-+ 	mpf = array->mpfarray[offset].mpf;
>-+ 	/* This extent my already be marked for delete and closed. */
>-+ 	if (mpf == NULL)
>-+ 		goto err;
>-+ 
>-  	/*
>-  	 * The log must be flushed before the file is deleted.  We depend on
>-  	 * the log record of the last delete to recreate the file if we crash.
>-***************
>-*** 418,424 ****
>-  	if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0)
>-  		goto err;
>-  
>-- 	mpf = array->mpfarray[offset].mpf;
>-  	(void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1);
>-  	/* Someone could be real slow, let them close it down. */
>-  	if (array->mpfarray[offset].pinref != 0)
>---- 424,429 ----
>Index: databases/db44/files/patch-upstream.4.4.20.2
>===================================================================
>--- databases/db44/files/patch-upstream.4.4.20.2	(revision 365033)
>+++ databases/db44/files/patch-upstream.4.4.20.2	(working copy)
>@@ -1,29 +0,0 @@
>-*** ../txn/txn.c.orig	Tue Nov  1 06:50:03 2005
>---- ../txn/txn.c	Tue Jan 31 15:05:13 2006
>-***************
>-*** 1049,1060 ****
>---- 1049,1062 ----
>-  		return (ret);
>-  	memcpy(txn->name, name, len);
>-  
>-+ 	TXN_SYSTEM_LOCK(dbenv);
>-  	if (td->name != INVALID_ROFF) {
>-  		__db_shalloc_free(
>-  		    &mgr->reginfo, R_ADDR(&mgr->reginfo, td->name));
>-  		td->name = INVALID_ROFF;
>-  	}
>-  	if ((ret = __db_shalloc(&mgr->reginfo, len, 0, &p)) != 0) {
>-+ 		TXN_SYSTEM_UNLOCK(dbenv);
>-  		__db_err(dbenv,
>-  		    "Unable to allocate memory for transaction name");
>-  
>-***************
>-*** 1063,1068 ****
>---- 1065,1071 ----
>-  
>-  		return (ret);
>-  	}
>-+ 	TXN_SYSTEM_UNLOCK(dbenv);
>-  	td->name = R_OFFSET(&mgr->reginfo, p);
>-  	memcpy(p, name, len);
>-  
>Index: databases/db44/files/patch-upstream.4.4.20.3
>===================================================================
>--- databases/db44/files/patch-upstream.4.4.20.3	(revision 365033)
>+++ databases/db44/files/patch-upstream.4.4.20.3	(working copy)
>@@ -1,49 +0,0 @@
>-*** ../db/db_cam.c.orig	2006-01-11 03:19:21.000000000 +1100
>---- ../db/db_cam.c	2006-03-01 13:59:01.000000000 +1100
>-***************
>-*** 579,589 ****
>-  	    flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) {
>-  		if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0)
>-  			return (ret);
>-! 		if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0)
>-  			return (ret);
>-  
>-! 		switch (ret =
>-! 		    opd->c_am_get(opd, key, data, flags, NULL)) {
>-  		case 0:
>-  			goto done;
>-  		case DB_NOTFOUND:
>---- 579,590 ----
>-  	    flags == DB_NEXT || flags == DB_NEXT_DUP || flags == DB_PREV)) {
>-  		if (tmp_rmw && (ret = dbc_arg->c_am_writelock(dbc_arg)) != 0)
>-  			return (ret);
>-! 		if (F_ISSET(dbc_arg, DBC_TRANSIENT))
>-! 			opd = cp->opd;
>-! 		else if ((ret = __db_c_idup(cp->opd, &opd, DB_POSITION)) != 0)
>-  			return (ret);
>-  
>-! 		switch (ret = opd->c_am_get(opd, key, data, flags, NULL)) {
>-  		case 0:
>-  			goto done;
>-  		case DB_NOTFOUND:
>-***************
>-*** 596,607 ****
>---- 597,614 ----
>-  				if ((ret = __db_c_close(opd)) != 0)
>-  					goto err;
>-  				opd = NULL;
>-+ 				if (F_ISSET(dbc_arg, DBC_TRANSIENT))
>-+ 					cp->opd = NULL;
>-  				break;
>-  			}
>-  			goto err;
>-  		default:
>-  			goto err;
>-  		}
>-+ 	} else if (cp->opd != NULL && F_ISSET(dbc_arg, DBC_TRANSIENT)) {
>-+ 		if ((ret = __db_c_close(cp->opd)) != 0)
>-+ 			goto err;
>-+ 		cp->opd = NULL;
>-  	}
>-  
>-  	/*
>Index: databases/db44/files/patch-upstream.4.4.20.4
>===================================================================
>--- databases/db44/files/patch-upstream.4.4.20.4	(revision 365033)
>+++ databases/db44/files/patch-upstream.4.4.20.4	(working copy)
>@@ -1,24 +0,0 @@
>-*** ../mp/mp_fget.c.orig	2005-10-12 10:53:36.000000000 -0700
>---- ../mp/mp_fget.c	2006-05-30 20:48:10.000000000 -0700
>-***************
>-*** 587,594 ****
>-  	 */
>-  	if (state != SECOND_MISS && bhp->ref == 1) {
>-  		bhp->priority = UINT32_MAX;
>-! 		SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
>-! 		SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
>-  		hp->hash_priority =
>-  		    SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority;
>-  	}
>---- 587,597 ----
>-  	 */
>-  	if (state != SECOND_MISS && bhp->ref == 1) {
>-  		bhp->priority = UINT32_MAX;
>-! 		if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) !=
>-! 		     SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) {
>-! 			SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
>-! 			SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
>-! 		}
>-  		hp->hash_priority =
>-  		    SH_TAILQ_FIRSTP(&hp->hash_bucket, __bh)->priority;
>-  	}
>Index: databases/db44/pkg-descr
>===================================================================
>--- databases/db44/pkg-descr	(revision 365033)
>+++ databases/db44/pkg-descr	(working copy)
>@@ -1,13 +0,0 @@
>-Version 4.4 of the Berkeley Data Base library which offers (key/value) storage
>-with optional concurrent access or transactions interface.
>-
>-This port will install the AES (American Encryption Standard) enabled version.
>-
>-Utilities are included in the distribution to convert v1.85 databases to v4.4
>-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://dev.sleepycat.com/downloads/releasehistorybdb.html
>-
>-WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
>Index: databases/db44/pkg-plist
>===================================================================
>--- databases/db44/pkg-plist	(revision 365033)
>+++ databases/db44/pkg-plist	(working copy)
>@@ -1,50 +0,0 @@
>-bin/db44/berkeley_db_svc
>-bin/db44/db_archive
>-bin/db44/db_checkpoint
>-bin/db44/db_deadlock
>-bin/db44/db_dump
>-bin/db44/db_dump185
>-bin/db44/db_hotbackup
>-bin/db44/db_load
>-bin/db44/db_printlog
>-bin/db44/db_recover
>-bin/db44/db_stat
>-bin/db44/db_upgrade
>-bin/db44/db_verify
>-bin/berkeley_db_svc-4.4
>-bin/db_archive-4.4
>-bin/db_checkpoint-4.4
>-bin/db_deadlock-4.4
>-bin/db_dump-4.4
>-bin/db_dump185-4.4
>-bin/db_hotbackup-4.4
>-bin/db_load-4.4
>-bin/db_printlog-4.4
>-bin/db_recover-4.4
>-bin/db_stat-4.4
>-bin/db_upgrade-4.4
>-bin/db_verify-4.4
>-include/db44/db.h
>-include/db44/db_185.h
>-include/db44/db_cxx.h
>-lib/db44/libdb-4.4.a
>-lib/db44/libdb-4.4.la
>-lib/db44/libdb-4.4.so
>-lib/db44/libdb-4.4.so.0
>-lib/db44/libdb-4.so
>-lib/db44/libdb.a
>-lib/db44/libdb.so
>-lib/db44/libdb_cxx-4.4.a
>-lib/db44/libdb_cxx-4.4.la
>-lib/db44/libdb_cxx-4.4.so
>-lib/db44/libdb_cxx-4.4.so.0
>-lib/db44/libdb_cxx-4.so
>-lib/db44/libdb_cxx.a
>-lib/db44/libdb_cxx.so
>-lib/libdb-4.4.so
>-lib/libdb-4.4.so.0
>-lib/libdb_cxx-4.4.so
>-lib/libdb_cxx-4.4.so.0
>-@dirrm lib/db44
>-@dirrm include/db44
>-@dirrm bin/db44
>Index: databases/db46/Makefile
>===================================================================
>--- databases/db46/Makefile	(revision 365033)
>+++ databases/db46/Makefile	(working copy)
>@@ -1,61 +0,0 @@
>-# Created by: Gea-Suan Lin <gslin@gslin.org>
>-# $FreeBSD$
>-
>-PORTNAME=	db46
>-PORTVERSION=	4.6.21.4
>-CATEGORIES=	databases
>-MASTER_SITES=	http://download.oracle.com/berkeley-db/ \
>-PKGNAMEPREFIX?=
>-DISTNAME=	db-${PORTVERSION:R}
>-DIST_SUBDIR=	bdb
>-
>-PATCH_SITES=	http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION:R}/
>-PATCHFILES=	patch.4.6.21.1 patch.4.6.21.2 patch.4.6.21.3 patch.4.6.21.4
>-PATCH_DIST_STRIP=	-d .. -l
>-# * patch.4.6.21.1: -----------------------------------------------------------
>-# Fixes a race condition between checkpoint and DB->close which can result in
>-# the checkpoint thread self-deadlocking. [#15692]
>-# * 4.6.21.2: -----------------------------------------------------------------
>-# Fixes the potential for the wrong number of mutexes to be allocated. This
>-# issue could cause applications with multiple cache regions to see undefined
>-# behavior in rare cases under load. [#16178]
>-# * 4.6.21.3: -----------------------------------------------------------------
>-# Replication clients should be able to open a sequence. [#16406]
>-# * 4.6.21.4: -----------------------------------------------------------------
>-# Fixes a bug which could lead to slow performance of internal init under
>-# Replication Manager, as evidenced by "queue limit exceeded" messages in
>-# verbose replication diagnostic output. [#15788]
>-
>-# I allow matthias.andree@gmx.de and all freebsd committer to do changes
>-# to this package.
>-
>-MAINTAINER=	mandree@FreeBSD.org
>-COMMENT=	The Berkeley DB package, revision 4.6
>-
>-DEPRECATED=	Please use databases/db5 or db6 for new installs.
>-
>-BDBVER=		${PORTVERSION:R:R}
>-CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx \
>-		--enable-dynamic --enable-rpc --enable-pthread_api \
>-		--includedir=${PREFIX}/include/${PORTNAME} \
>-		--libdir=${PREFIX}/lib/${PORTNAME} \
>-		--bindir=${PREFIX}/bin/${PORTNAME}
>-CONFIGURE_SCRIPT=	../dist/configure
>-GNU_CONFIGURE=	yes
>-INSTALL_TARGET=	install_include install_lib install_utilities
>-LIBTOOLFILES=	${CONFIGURE_SCRIPT}
>-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
>-USE_LDCONFIG=	yes
>-
>-INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
>-PORTDOCS=	*
>-
>-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>
>Index: databases/db46/distinfo
>===================================================================
>--- databases/db46/distinfo	(revision 365033)
>+++ databases/db46/distinfo	(working copy)
>@@ -1,10 +0,0 @@
>-SHA256 (bdb/db-4.6.21.tar.gz) = 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21
>-SIZE (bdb/db-4.6.21.tar.gz) = 11881885
>-SHA256 (bdb/patch.4.6.21.1) = d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53
>-SIZE (bdb/patch.4.6.21.1) = 2475
>-SHA256 (bdb/patch.4.6.21.2) = 9496a6cad44377ad1fab8c617f17c6f541e3423814663bfa81c3abb4001622d9
>-SIZE (bdb/patch.4.6.21.2) = 892
>-SHA256 (bdb/patch.4.6.21.3) = ad6951ec702e3d6cd539ba86d51b3b0436da43b17814c197c2d277fa5e1cb620
>-SIZE (bdb/patch.4.6.21.3) = 1911
>-SHA256 (bdb/patch.4.6.21.4) = 98bb4499dc7408c27a8a855330972a69abd3b29d0ff3820d6e1da790593a5bb7
>-SIZE (bdb/patch.4.6.21.4) = 41501
>Index: databases/db46/files/patch-dist__configure
>===================================================================
>--- databases/db46/files/patch-dist__configure	(revision 365033)
>+++ databases/db46/files/patch-dist__configure	(working copy)
>@@ -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}"
>- 
>Index: databases/db46/pkg-descr
>===================================================================
>--- databases/db46/pkg-descr	(revision 365033)
>+++ databases/db46/pkg-descr	(working copy)
>@@ -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/
>Index: databases/db46/pkg-plist
>===================================================================
>--- databases/db46/pkg-plist	(revision 365033)
>+++ databases/db46/pkg-plist	(working copy)
>@@ -1,52 +0,0 @@
>-bin/berkeley_db_svc-4.6
>-bin/db46/berkeley_db_svc
>-bin/db46/db_archive
>-bin/db46/db_checkpoint
>-bin/db46/db_codegen
>-bin/db46/db_deadlock
>-bin/db46/db_dump
>-bin/db46/db_dump185
>-bin/db46/db_hotbackup
>-bin/db46/db_load
>-bin/db46/db_printlog
>-bin/db46/db_recover
>-bin/db46/db_stat
>-bin/db46/db_upgrade
>-bin/db46/db_verify
>-bin/db_archive-4.6
>-bin/db_checkpoint-4.6
>-bin/db_codegen-4.6
>-bin/db_deadlock-4.6
>-bin/db_dump-4.6
>-bin/db_dump185-4.6
>-bin/db_hotbackup-4.6
>-bin/db_load-4.6
>-bin/db_printlog-4.6
>-bin/db_recover-4.6
>-bin/db_stat-4.6
>-bin/db_upgrade-4.6
>-bin/db_verify-4.6
>-include/db46/db.h
>-include/db46/db_185.h
>-include/db46/db_cxx.h
>-lib/db46/libdb-4.6.a
>-lib/db46/libdb-4.6.la
>-lib/db46/libdb-4.6.so
>-lib/db46/libdb-4.6.so.0
>-lib/db46/libdb-4.so
>-lib/db46/libdb.a
>-lib/db46/libdb.so
>-lib/db46/libdb_cxx-4.6.a
>-lib/db46/libdb_cxx-4.6.la
>-lib/db46/libdb_cxx-4.6.so
>-lib/db46/libdb_cxx-4.6.so.0
>-lib/db46/libdb_cxx-4.so
>-lib/db46/libdb_cxx.a
>-lib/db46/libdb_cxx.so
>-lib/libdb-4.6.so
>-lib/libdb-4.6.so.0
>-lib/libdb_cxx-4.6.so
>-lib/libdb_cxx-4.6.so.0
>-@dirrmtry lib/db46
>-@dirrmtry include/db46
>-@dirrmtry bin/db46
>Index: databases/db47/Makefile
>===================================================================
>--- databases/db47/Makefile	(revision 365033)
>+++ databases/db47/Makefile	(working copy)
>@@ -1,59 +0,0 @@
>-# Created by: Gea-Suan Lin <gslin@gslin.org>
>-# $FreeBSD$
>-
>-PORTNAME=	db47
>-PORTVERSION=	4.7.25.4
>-CATEGORIES=	databases
>-MASTER_SITES=	http://download.oracle.com/berkeley-db/ 
>-PKGNAMEPREFIX?=
>-DISTNAME=	db-${PORTVERSION:R}
>-DIST_SUBDIR=	bdb
>-
>-PATCH_SITES=	http://download.oracle.com/berkeley-db/patches/db/${PORTVERSION:R}/
>-PATCHFILES=	patch.4.7.25.1 patch.4.7.25.2 patch.4.7.25.3
>-PATCH_DIST_STRIP=	-d .. --ignore-whitespace
>-# * patch.4.7.25.1: -----------------------------------------------------------
>-# # [#16406] Replication clients should be able to open a sequence.
>-# * patch.4.7.25.2: -----------------------------------------------------------
>-# # [#16415] DB_ENV->lock_get may self deadlock if user defined locks
>-#	     are used and there is only one lock partition defined.
>-# * patch.4.7.25.3: -----------------------------------------------------------
>-# # [#16541] Fix for dd segfaults.
>-# * patch.4.7.25.4: -----------------------------------------------------------
>-# # [#16299] Fix a bug which could cause a SEGV in __repmgr_available_site if a
>-#            site becomes master after winning an election but is still
>-#            processing client messages.
>-
>-# I allow matthias.andree@gmx.de and all freebsd committer to do changes
>-# to this package.
>-
>-MAINTAINER=	mandree@FreeBSD.org
>-COMMENT=	The Berkeley DB package, revision 4.7
>-
>-DEPRECATED=	Please use databases/db5 or db6 for new installs.
>-
>-BDBVER=		${PORTVERSION:R:R}
>-CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx \
>-		--enable-dynamic --enable-rpc --enable-pthread_api \
>-		--includedir=${PREFIX}/include/${PORTNAME} \
>-		--libdir=${PREFIX}/lib/${PORTNAME} \
>-		--bindir=${PREFIX}/bin/${PORTNAME}
>-CONFIGURE_SCRIPT=	../dist/configure
>-GNU_CONFIGURE=	yes
>-INSTALL_TARGET=	install_include install_lib install_utilities
>-LIBTOOLFILES=	${CONFIGURE_SCRIPT}
>-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
>-USE_LDCONFIG=	yes
>-
>-INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
>-PORTDOCS=	*
>-
>-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>
>Index: databases/db47/distinfo
>===================================================================
>--- databases/db47/distinfo	(revision 365033)
>+++ databases/db47/distinfo	(working copy)
>@@ -1,8 +0,0 @@
>-SHA256 (bdb/db-4.7.25.tar.gz) = f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e
>-SIZE (bdb/db-4.7.25.tar.gz) = 13124129
>-SHA256 (bdb/patch.4.7.25.1) = e91590af872705efc34414afb702abc630a75c55ba61570dca2216c783e0a83a
>-SIZE (bdb/patch.4.7.25.1) = 2072
>-SHA256 (bdb/patch.4.7.25.2) = 05d6cde0ab1bfdb80394a7a88ff7233d0407f0b09103b0dd3791ebfccbbcca31
>-SIZE (bdb/patch.4.7.25.2) = 2210
>-SHA256 (bdb/patch.4.7.25.3) = e5393cbfc8538cc21cc939d26ceca3e5782b4a4259a644884d91790e18ed39f3
>-SIZE (bdb/patch.4.7.25.3) = 8442
>Index: databases/db47/files/patch-dist__configure
>===================================================================
>--- databases/db47/files/patch-dist__configure	(revision 365033)
>+++ databases/db47/files/patch-dist__configure	(working copy)
>@@ -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}"
>- 
>Index: databases/db47/files/patch.4.7.25.4
>===================================================================
>--- databases/db47/files/patch.4.7.25.4	(revision 365033)
>+++ databases/db47/files/patch.4.7.25.4	(working copy)
>@@ -1,183 +0,0 @@
>-*** dbinc/repmgr.h.orig	2009-05-04 10:33:55.000000000 -0400
>---- dbinc/repmgr.h	2009-05-04 10:27:26.000000000 -0400
>-***************
>-*** 374,379 ****
>---- 374,380 ----
>-  #define	SITE_FROM_EID(eid)	(&db_rep->sites[eid])
>-  #define	EID_FROM_SITE(s)	((int)((s) - (&db_rep->sites[0])))
>-  #define	IS_VALID_EID(e)		((e) >= 0)
>-+ #define	IS_KNOWN_REMOTE_SITE(e)	((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt)
>-  #define	SELF_EID		INT_MAX
>-  
>-  #define	IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS ||		\
>-*** cvotn/rep/rep_elect.c.orig	2009-05-04 10:35:50.000000000 -0400
>---- cvotn/rep/rep_elect.c	2009-05-04 10:31:24.000000000 -0400
>-***************
>-*** 33,39 ****
>-  static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
>-  static void __rep_elect_master __P((ENV *, REP *));
>-  static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
>-! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t));
>-  
>-  /*
>-   * __rep_elect --
>---- 33,39 ----
>-  static int __rep_fire_elected __P((ENV *, REP *, u_int32_t));
>-  static void __rep_elect_master __P((ENV *, REP *));
>-  static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t));
>-! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t));
>-  
>-  /*
>-   * __rep_elect --
>-***************
>-*** 55,61 ****
>-  	ENV *env;
>-  	LOG *lp;
>-  	REP *rep;
>-! 	int done, eid, elected, full_elect, locked, in_progress, need_req;
>-  	int ret, send_vote, t_ret;
>-  	u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
>-  	u_int32_t tiebreaker;
>---- 55,61 ----
>-  	ENV *env;
>-  	LOG *lp;
>-  	REP *rep;
>-! 	int done, elected, full_elect, locked, in_progress, need_req;
>-  	int ret, send_vote, t_ret;
>-  	u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri;
>-  	u_int32_t tiebreaker;
>-***************
>-*** 181,188 ****
>-  			REP_SYSTEM_UNLOCK(env);
>-  			(void)__rep_send_message(env, DB_EID_BROADCAST,
>-  			    REP_MASTER_REQ, NULL, NULL, 0, 0);
>-! 			ret = __rep_wait(env, &to, &eid,
>-! 			    0, REP_F_EPHASE0);
>-  			REP_SYSTEM_LOCK(env);
>-  			F_CLR(rep, REP_F_EPHASE0);
>-  			switch (ret) {
>---- 181,187 ----
>-  			REP_SYSTEM_UNLOCK(env);
>-  			(void)__rep_send_message(env, DB_EID_BROADCAST,
>-  			    REP_MASTER_REQ, NULL, NULL, 0, 0);
>-! 			ret = __rep_wait(env, &to, 0, REP_F_EPHASE0);
>-  			REP_SYSTEM_LOCK(env);
>-  			F_CLR(rep, REP_F_EPHASE0);
>-  			switch (ret) {
>-***************
>-*** 286,296 ****
>-  		REP_SYSTEM_LOCK(env);
>-  		goto vote;
>-  	}
>-! 	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1);
>-  	switch (ret) {
>-  		case 0:
>-  			/* Check if election complete or phase complete. */
>-! 			if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) {
>-  				RPRINT(env, DB_VERB_REP_ELECT,
>-  				    (env, "Ended election phase 1"));
>-  				goto edone;
>---- 285,295 ----
>-  		REP_SYSTEM_LOCK(env);
>-  		goto vote;
>-  	}
>-! 	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1);
>-  	switch (ret) {
>-  		case 0:
>-  			/* Check if election complete or phase complete. */
>-! 			if (!IN_ELECTION(rep)) {
>-  				RPRINT(env, DB_VERB_REP_ELECT,
>-  				    (env, "Ended election phase 1"));
>-  				goto edone;
>-***************
>-*** 398,412 ****
>-  		REP_SYSTEM_LOCK(env);
>-  		goto i_won;
>-  	}
>-! 	ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2);
>-  	RPRINT(env, DB_VERB_REP_ELECT,
>-  	    (env, "Ended election phase 2 %d", ret));
>-  	switch (ret) {
>-  		case 0:
>-! 			if (eid != DB_EID_INVALID)
>-! 				goto edone;
>-! 			ret = DB_REP_UNAVAIL;
>-! 			break;
>-  		case DB_REP_EGENCHG:
>-  			if (to > timeout)
>-  				to = timeout;
>---- 397,408 ----
>-  		REP_SYSTEM_LOCK(env);
>-  		goto i_won;
>-  	}
>-! 	ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2);
>-  	RPRINT(env, DB_VERB_REP_ELECT,
>-  	    (env, "Ended election phase 2 %d", ret));
>-  	switch (ret) {
>-  		case 0:
>-! 			goto edone;
>-  		case DB_REP_EGENCHG:
>-  			if (to > timeout)
>-  				to = timeout;
>-***************
>-*** 1050,1062 ****
>-  	ENV *env;
>-  	REP *rep;
>-  {
>-- 	/*
>-- 	 * We often come through here twice, sometimes even more.  We mustn't
>-- 	 * let the redundant calls affect stats counting.  But rep_elect relies
>-- 	 * on this first part for setting eidp.
>-- 	 */
>-- 	rep->master_id = rep->eid;
>-- 
>-  	if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) {
>-  		/* We've been through here already; avoid double counting. */
>-  		return;
>---- 1046,1051 ----
>-***************
>-*** 1093,1102 ****
>-  	(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
>-  
>-  static int
>-! __rep_wait(env, timeoutp, eidp, full_elect, flags)
>-  	ENV *env;
>-  	db_timeout_t *timeoutp;
>-! 	int *eidp, full_elect;
>-  	u_int32_t flags;
>-  {
>-  	DB_REP *db_rep;
>---- 1082,1091 ----
>-  	(timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1);
>-  
>-  static int
>-! __rep_wait(env, timeoutp, full_elect, flags)
>-  	ENV *env;
>-  	db_timeout_t *timeoutp;
>-! 	int full_elect;
>-  	u_int32_t flags;
>-  {
>-  	DB_REP *db_rep;
>-***************
>-*** 1174,1180 ****
>-  			F_CLR(rep, REP_F_EGENUPDATE);
>-  			ret = DB_REP_EGENCHG;
>-  		} else if (phase_over) {
>-- 			*eidp = rep->master_id;
>-  			done = 1;
>-  			ret = 0;
>-  		}
>---- 1163,1168 ----
>-*** cvotn/repmgr/repmgr_net.c.orig	2009-05-04 10:34:46.000000000 -0400
>---- cvotn/repmgr/repmgr_net.c	2009-05-04 10:27:26.000000000 -0400
>-***************
>-*** 100,105 ****
>---- 100,107 ----
>-  		    control, rec, &nsites_sent, &npeers_sent)) != 0)
>-  			goto out;
>-  	} else {
>-+ 		DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid));
>-+ 
>-  		/*
>-  		 * If this is a request that can be sent anywhere, then see if
>-  		 * we can send it to our peer (to save load on the master), but
>Index: databases/db47/pkg-descr
>===================================================================
>--- databases/db47/pkg-descr	(revision 365033)
>+++ databases/db47/pkg-descr	(working copy)
>@@ -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/
>Index: databases/db47/pkg-plist
>===================================================================
>--- databases/db47/pkg-plist	(revision 365033)
>+++ databases/db47/pkg-plist	(working copy)
>@@ -1,52 +0,0 @@
>-bin/berkeley_db_svc-4.7
>-bin/db47/berkeley_db_svc
>-bin/db47/db_archive
>-bin/db47/db_checkpoint
>-bin/db47/db_codegen
>-bin/db47/db_deadlock
>-bin/db47/db_dump
>-bin/db47/db_dump185
>-bin/db47/db_hotbackup
>-bin/db47/db_load
>-bin/db47/db_printlog
>-bin/db47/db_recover
>-bin/db47/db_stat
>-bin/db47/db_upgrade
>-bin/db47/db_verify
>-bin/db_archive-4.7
>-bin/db_checkpoint-4.7
>-bin/db_codegen-4.7
>-bin/db_deadlock-4.7
>-bin/db_dump-4.7
>-bin/db_dump185-4.7
>-bin/db_hotbackup-4.7
>-bin/db_load-4.7
>-bin/db_printlog-4.7
>-bin/db_recover-4.7
>-bin/db_stat-4.7
>-bin/db_upgrade-4.7
>-bin/db_verify-4.7
>-include/db47/db.h
>-include/db47/db_185.h
>-include/db47/db_cxx.h
>-lib/db47/libdb-4.7.a
>-lib/db47/libdb-4.7.la
>-lib/db47/libdb-4.7.so
>-lib/db47/libdb-4.7.so.0
>-lib/db47/libdb-4.so
>-lib/db47/libdb.a
>-lib/db47/libdb.so
>-lib/db47/libdb_cxx-4.7.a
>-lib/db47/libdb_cxx-4.7.la
>-lib/db47/libdb_cxx-4.7.so
>-lib/db47/libdb_cxx-4.7.so.0
>-lib/db47/libdb_cxx-4.so
>-lib/db47/libdb_cxx.a
>-lib/db47/libdb_cxx.so
>-lib/libdb-4.7.so
>-lib/libdb-4.7.so.0
>-lib/libdb_cxx-4.7.so
>-lib/libdb_cxx-4.7.so.0
>-@dirrmtry lib/db47
>-@dirrmtry include/db47
>-@dirrmtry bin/db47
>Index: databases/fortytwo-bdb/Makefile
>===================================================================
>--- databases/fortytwo-bdb/Makefile	(revision 365033)
>+++ databases/fortytwo-bdb/Makefile	(working copy)
>@@ -21,7 +21,7 @@
> USE_GNUSTEP_LOCAL_LIBS+=	Encore:${ENCORE_PORT}
> DEFAULT_LIBVERSION=	0.1
> USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
>-USE_BDB=	43
>+USE_BDB=	43+
> 
> WRKSRC=		${WRKDIR}/BDB-${PORTVERSION}
> DOCSDIR=	${GNUSTEP_PREFIX}/Local/Library/Documentation/BDB
>Index: mail/popular/Makefile
>===================================================================
>--- mail/popular/Makefile	(revision 365033)
>+++ mail/popular/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	popular
> PORTVERSION=	1.5.5
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	mail
> MASTER_SITES=	http://www.remote.org/jochen/mail/popular/download/
> 
>@@ -25,19 +25,6 @@
> 
> USE_RC_SUBR=	pcheckd pproxy pserv 0ringd
> 
>-OPTIONS_DEFINE=	DB4
>-OPTIONS_DEFAULT=	DB4
>-OPTIONS_SUB=	yes
>-
>-DB4_DESC=	Build db4 pdm module
>-DB4_LIB_DEPENDS=	libdb4.so:${PORTSDIR}/databases/db4
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MDB4}
>-PDM_MODULES+=	db4
>-.endif
>-
> post-install:
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}
> 	${INSTALL_DATA} ${WRKSRC}/conf/pproxy.rc ${STAGEDIR}${ETCDIR}/pproxy.rc.sample
>Index: mail/popular/pkg-plist
>===================================================================
>--- mail/popular/pkg-plist	(revision 365033)
>+++ mail/popular/pkg-plist	(working copy)
>@@ -29,9 +29,9 @@
> lib/popular/libpdm_master-1.5.5.so
> lib/popular/libpdm_master.a
> lib/popular/libpdm_master.so
>-%%DB4%%lib/popular/libpdm_db4-1.5.5.so
>-%%DB4%%lib/popular/libpdm_db4.a
>-%%DB4%%lib/popular/libpdm_db4.so
>+@comment %%DB4%%lib/popular/libpdm_db4-1.5.5.so
>+@comment %%DB4%%lib/popular/libpdm_db4.a
>+@comment %%DB4%%lib/popular/libpdm_db4.so
> man/man1/pcheck.1.gz
> man/man1/pcontrol.1.gz
> man/man1/pdeliver.1.gz
>Index: net/openldap24-server/Makefile
>===================================================================
>--- net/openldap24-server/Makefile	(revision 365033)
>+++ net/openldap24-server/Makefile	(working copy)
>@@ -351,26 +351,12 @@
> 			BACK_HDB="@comment "
> .else
> 
>-WITH_BDB_VER?=		46
>-USE_BDB=		44+
>+USE_BDB=		48+
> 
>-# XXX Can BDB 5.x use XY instead of X as version?
>-.if ${WITH_BDB_VER} >= 43 || ${WITH_BDB_VER} == 5 || ${WITH_BDB_VER} == 6
> CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
> 			--enable-hdb=${BACKEND_ENABLE}
> PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
> 			BACK_HDB=${BACKEND_PLIST}
>-.elif ${WITH_BDB_VER} >= 4
>-CONFIGURE_ARGS+=	--disable-bdb \
>-			--enable-hdb=${BACKEND_ENABLE}
>-PLIST_SUB+=		BACK_BDB="@comment " \
>-			BACK_HDB=${BACKEND_PLIST}
>-.elif ${WITH_BDB_VER} == 3
>-CONFIGURE_ARGS+=	--disable-bdb \
>-			--disable-hdb
>-PLIST_SUB+=		BACK_BDB="@comment " \
>-			BACK_HDB="@comment "
>-.endif
> 
> CPPFLAGS+=		-I${BDB_INCLUDE_DIR}
> LDFLAGS+=		-L${BDB_LIB_DIR}
>Index: net-p2p/jigdo/Makefile
>===================================================================
>--- net-p2p/jigdo/Makefile	(revision 365033)
>+++ net-p2p/jigdo/Makefile	(working copy)
>@@ -15,7 +15,6 @@
> USES=		gmake tar:bzip2
> USE_SUBMAKE=	yes
> GNU_CONFIGURE=	yes
>-WITH_BDB_VER?=	43
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> 
>@@ -35,7 +34,7 @@
> BDB_CONFIGURE_OFF=	--without-libdb
> BDB_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
> BDB_LIBS=		-L${BDB_LIB_DIR}
>-BDB_USE=		BDB=${WITH_BDB_VER}
>+BDB_USE=		BDB=48+
> 
> NLS_CONFIGURE_ENABLE=	nls
> NLS_USES=		gettext
>Index: security/pks/Makefile
>===================================================================
>--- security/pks/Makefile	(revision 365033)
>+++ security/pks/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=		pks
> PORTVERSION=		0.9.6.20040312
>+PORTREVISION=		1
> CATEGORIES=		security www
> MASTER_SITES=		http://pks.sourceforge.net/:sf ${MASTER_SITE_LOCAL}:local
> MASTER_SITE_SUBDIR=	.:sf mandree:local
>@@ -11,17 +12,16 @@
> MAINTAINER=	tphilipp@potion-studios.com
> COMMENT=	PGP Public Key Server
> 
>-LICENSE=        BSD4CLAUSE
>+LICENSE=	BSD4CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> USE_GCC=	any
>-USE_BDB=	yes
>-WANT_BDB_VER=	41 # pks dumps core with 42 and doesn't build with 43+
>+USE_BDB=	48+
> 
>-OPTIONS_DEFINE= DOCS
>-PORTDOCS=       pks_help.* README EMAIL
>+OPTIONS_DEFINE=	DOCS
>+PORTDOCS=	pks_help.* README EMAIL
> GNU_CONFIGURE=	yes
> USE_AUTOTOOLS=	autoconf
> CONFIGURE_ARGS=	--datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
>@@ -31,10 +31,11 @@
> LDFLAGS+=	-L${LOCALBASE}/lib
> CONFIGURE_ENV=	DBLIB="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}" DBINC=-I${BDB_INCLUDE_DIR} DBHDR=db.h
> 
>-
> SUB_FILES=	pkg-message
> PKGMESSAGE=	${WRKDIR}/pkg-message
> 
>+PLIST_SUB+=	RESETPREFIX=${PREFIX}
>+
> USE_RC_SUBR=	pksd
> 
> .include <bsd.port.options.mk>
>Index: security/pks/files/patch-configure.in
>===================================================================
>--- security/pks/files/patch-configure.in	(revision 365033)
>+++ security/pks/files/patch-configure.in	(working copy)
>@@ -1,5 +1,5 @@
>---- ./configure.in.orig	2011-03-21 20:49:39.000000000 +0100
>-+++ ./configure.in	2011-03-21 20:50:42.000000000 +0100
>+--- ./configure.in.orig	2004-01-18 00:19:56.000000000 +0100
>++++ ./configure.in	2014-08-15 18:32:37.000000000 +0200
> @@ -74,126 +74,6 @@
>  # Checks for libraries.
>  dnl Checks for Berkeley DB
>Index: security/pks/files/patch-mkpksdconf.in
>===================================================================
>--- security/pks/files/patch-mkpksdconf.in	(revision 365033)
>+++ security/pks/files/patch-mkpksdconf.in	(working copy)
>@@ -1,5 +1,5 @@
>---- ./mkpksdconf.in.orig	2014-01-22 15:36:39.574285045 -0500
>-+++ ./mkpksdconf.in	2014-01-22 15:37:49.289280305 -0500
>+--- ./mkpksdconf.in.orig	2003-02-28 18:27:20.000000000 +0100
>++++ ./mkpksdconf.in	2014-08-15 18:32:37.000000000 +0200
> @@ -44,7 +44,7 @@
>  
>  cat << EOF
>Index: security/pks/pkg-descr
>===================================================================
>--- security/pks/pkg-descr	(revision 365033)
>+++ security/pks/pkg-descr	(working copy)
>@@ -1,4 +1,4 @@
> This program implements a standard PGP Key Server, which can be assumed 
> to be in addition to the public key server at MIT.
> 
>-WWW:	http://www.mit.edu/people/marc/pks/
>+WWW: http://www.mit.edu/people/marc/pks/
>Index: security/pks/pkg-plist
>===================================================================
>--- security/pks/pkg-plist	(revision 365033)
>+++ security/pks/pkg-plist	(working copy)
>@@ -17,7 +17,9 @@
> man/man8/pksclient.8.gz
> man/man8/pksd.8.gz
> man/man8/pksdctl.8.gz
>-/var/pks/index.html
>+@cwd /
>+var/pks/index.html
>+@cwd %%RESETPREFIX%%
> @unexec rmdir "/var/pks/db" >/dev/null 2>&1 || :
> @unexec rmdir "/var/pks/incoming" >/dev/null 2>&1 || :
> @unexec rmdir "/var/pks" >/dev/null 2>&1 || :
>Index: sysutils/cfengine22/Makefile
>===================================================================
>--- sysutils/cfengine22/Makefile	(revision 365033)
>+++ sysutils/cfengine22/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cfengine
> PORTVERSION=	2.2.10
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils
> MASTER_SITES=	https://s3.amazonaws.com/cfengine.package-repos/tarballs/
> PKGNAMESUFFIX=	22
>@@ -21,8 +21,7 @@
> USES=		libtool makeinfo shebangfix
> SHEBANG_FILES=	contrib/cfdoc
> 
>-WITH_BDB_VER?=	46
>-USE_BDB=	yes
>+USE_BDB=	48+
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-docs \
>Index: sysutils/cfengine22/pkg-plist
>===================================================================
>--- sysutils/cfengine22/pkg-plist	(revision 365033)
>+++ sysutils/cfengine22/pkg-plist	(working copy)
>@@ -52,6 +52,5 @@
> %%PORTDOCS%%%%DOCSDIR%%/TODO
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>Index: sysutils/cfengine32/Makefile
>===================================================================
>--- sysutils/cfengine32/Makefile	(revision 365033)
>+++ sysutils/cfengine32/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> COMMENT=	Systems administration tool for networks
> 
> LATEST_LINK=	cfengine32
>-FETCH_BEFORE_ARGS=   -o ${DISTDIR}/${DISTFILES}
>+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
> 
> CONFLICTS=	cfengine-[2]* cfengine-3.[345]* cfengine-devel-*
> 
>@@ -23,8 +23,7 @@
> LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
> 
> USES=		libtool
>-WITH_BDB_VER?=	47
>-USE_BDB=	yes
>+USE_BDB=	48+
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
> # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3

Actions: View | Diff

Attachments on bug 192690: 145841 | 145946 | 145947 | 146083