12 files changed, 43 insertions, 337 deletions
diff --git a/databases/bdb-xml/patches/patch-aa b/databases/bdb-xml/patches/patch-aa
deleted file mode 100644
index 870ee7b57f2..00000000000
--- a/databases/bdb-xml/patches/patch-aa
+++ /dev/null
@@ -1,146 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2009/07/17 18:26:30 hasso Exp $
-
---- ../dist/configure.orig	2004-01-27 18:12:02 +0200
-+++ ../dist/configure	2009-07-17 18:36:29 +0300
-@@ -3443,14 +3443,14 @@ echo "${ECHO_T}$with_berkeleydb" >&6
- if test "$with_berkeleydb" = "no"; then
- 	with_berkeleydb="/usr/local/BerkeleyDB.4.2"
- fi
--if test `ls "$with_berkeleydb"/lib/libdb_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then
-+if test `ls "$with_berkeleydb"/lib/libdb46_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then
- 	echo "$as_me:$LINENO: checking for Berkeley DB version from install tree" >&5
- echo $ECHO_N "checking for Berkeley DB version from install tree... $ECHO_C" >&6
--	db_version=`ls "$with_berkeleydb"/lib/libdb_cxx-*.la | sed 's/.*db_cxx-\(.*\).la/\1/'`
-+	db_version=`ls "$with_berkeleydb"/lib/libdb46_cxx-*.la | sed 's/.*db46_cxx-\(.*\).la/\1/'`
- 	echo "$as_me:$LINENO: result: $db_version" >&5
- echo "${ECHO_T}$db_version" >&6
--	echo "$CPPFLAGS" | grep "$with_berkeleydb/include" >/dev/null 2>&1 || CPPFLAGS="$CPPFLAGS -I$with_berkeleydb/include"
--	LIBS="$LIBS $with_berkeleydb/lib/libdb_cxx-$db_version.la"
-+	echo "$CPPFLAGS" | grep "$with_berkeleydb/include/db46" >/dev/null 2>&1 || CPPFLAGS="$CPPFLAGS -I$with_berkeleydb/include/db46"
-+	LIBS="$LIBS $with_berkeleydb/lib/libdb46_cxx-$db_version.la"
- 
- 	# find test lib locations, if specified, and possible
- 	# it could be safer to require that --with-berkelydb point to a build
-@@ -3628,7 +3628,7 @@ bsdi3*)	optimize_def="-O2"
- 	CC=${CC-"shlicc2"}
- 	LIBS="$LIBS -lipc";;
- bsdi*)	optimize_def="-O2";;
--freebsd*)
-+freebsd* | dragonfly*)
- 	optimize_def="-O2"
- 	CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
- 	LDFLAGS="$LDFLAGS -pthread";;
-@@ -4799,7 +4799,7 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-@@ -7926,7 +7926,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -8559,7 +8559,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -10723,7 +10723,7 @@ if test -z "$aix_libpath"; then aix_libp
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd*)
-+  freebsd* | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -11434,7 +11434,7 @@ echo $ECHO_N "checking for $compiler opt
- 	    ;;
- 	esac
- 	;;
--      freebsd*)
-+      freebsd* | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -12103,7 +12103,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -14447,7 +14447,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -15080,7 +15080,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -16712,7 +16712,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -17345,7 +17345,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd* | dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -19369,12 +19369,12 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
- INSTALLER="\$(LIBTOOL) --mode=install cp -p"
- 
- MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
--MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
-+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
- MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
- MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
- MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
- MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
--LIBTOOL="$SHELL ./libtool"
-+LIBTOOL="libtool"
- 
- # Configure for shared libraries, static libraries, or both.  If both are
- # configured, build the utilities and example programs with shared versions.
-@@ -19825,7 +19825,7 @@ if test "$_JTOPDIR" != "/usr"; then
- 	case "$host_os" in
- 	aix*)		_JNI_INC_SUBDIRS="aix";;
- 	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
--	freebsd*)	_JNI_INC_SUBDIRS="freebsd";;
-+	freebsd*|dragonfly*)	_JNI_INC_SUBDIRS="freebsd";;
- 	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
- 	osf*)		_JNI_INC_SUBDIRS="alpha";;
- 	solaris*)	_JNI_INC_SUBDIRS="solaris";;
diff --git a/databases/bdb-xml/patches/patch-ab b/databases/bdb-xml/patches/patch-ab
deleted file mode 100644
index 464d3424f50..00000000000
--- a/databases/bdb-xml/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/04/03 11:18:23 joerg Exp $
-
---- ../dist/Makefile.in.orig	2003-12-17 00:23:30.000000000 +0100
-+++ ../dist/Makefile.in
-@@ -6,12 +6,12 @@ builddir=.
- ##################################################
- # Installation directories and permissions.
- ##################################################
--prefix=	@prefix@
-+prefix=	${DESTDIR}@prefix@
- exec_prefix=@exec_prefix@
- bindir=	@bindir@
- includedir=@includedir@/dbxml
- libdir=	@libdir@
--docdir=	$(prefix)/docs
-+docdir=	$(prefix)/share/doc/dbxml
- 
- dmode=	755
- emode=	555
-@@ -41,7 +41,7 @@ INSTALLER=	@INSTALLER@
- LIBTOOL=	@LIBTOOL@
- 
- POSTLINK=	@POSTLINK@
--SOLINK=		@MAKEFILE_SOLINK@
-+SOLINK=		@MAKEFILE_SOLINK@ -version-info @DB_VERSION_MINOR@:@DB_VERSION_PATCH@
- SOFLAGS=	@SOFLAGS@
- SOMAJOR=	@DBXML_VERSION_MAJOR@
- SOVERSION=	@DBXML_VERSION_MAJOR@.@DBXML_VERSION_MINOR@
diff --git a/databases/bdb-xml/patches/patch-ac b/databases/bdb-xml/patches/patch-ac
deleted file mode 100644
index 877d4d15793..00000000000
--- a/databases/bdb-xml/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/09/24 20:16:18 kristerw Exp $
-
---- ../src/dbxml/KeyGenerator.hpp.orig	Fri Sep 24 22:01:12 2004
-+++ ../src/dbxml/KeyGenerator.hpp	Fri Sep 24 22:03:23 2004
-@@ -82,7 +82,7 @@
- 			{
- 				if(isCharacter(c))
- 				{
--#if (_MSC_VER==1200) // Microsoft Visual Studio 6
-+#if (__GNUC__==2) || (_MSC_VER==1200) // Microsoft Visual Studio 6
- 					v_.push_back(tolower(c));
- #else
- 					v_.push_back(std::tolower(c));
diff --git a/databases/bdb-xml/patches/patch-ad b/databases/bdb-xml/patches/patch-ad
deleted file mode 100644
index 46dca8339a2..00000000000
--- a/databases/bdb-xml/patches/patch-ad
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/04/03 11:18:23 joerg Exp $
-
-Replace non-portable function with gettimeofday.
-
---- ../src/dbxml/HighResTimer.cpp.orig	2003-05-09 02:01:45.000000000 +0200
-+++ ../src/dbxml/HighResTimer.cpp
-@@ -17,8 +17,6 @@ static const char revid[] = "$Id: HighRe
- #include <iostream>
- #include <sstream>
- 
--extern "C" int __os_clock(DB_ENV *, u_int32_t *, u_int32_t *);
--
- using namespace DbXml;
- 
- #ifdef _MSC_VER
-@@ -96,6 +94,10 @@ void HighResTimer::reset()
- 
- #else /* !_MSC_VER */
- 
-+extern "C" {
-+#include <sys/time.h>
-+}
-+
- HighResTimer::HighResTimer(const char *name, const char *what, const char *whats)
- 	: name_(name),
- 	what_(what),
-@@ -110,14 +112,22 @@ HighResTimer::~HighResTimer()
- 
- void HighResTimer::start()
- {
--	(void)__os_clock(NULL, &start_secs, &start_usecs);
-+	struct timeval tv;
-+
-+	gettimeofday(&tv, NULL);
-+	start_secs = tv.tv_sec;
-+	start_usecs = tv.tv_usec;
- }
- 
- void HighResTimer::stop()
- {
- #define	USECS_PER_SEC 1000000
-+	struct timeval tv;
- 	u_int32_t stop_secs, stop_usecs;
--	(void)__os_clock(NULL, &stop_secs, &stop_usecs);
-+
-+	gettimeofday(&tv, NULL);
-+	stop_secs = tv.tv_sec;
-+	stop_usecs = tv.tv_usec;
- 	duration_secs += (stop_secs - start_secs);
- 	duration_usecs += (stop_usecs - start_usecs);
- 	// fixup for usec under/overflow
diff --git a/databases/bdb-xml/patches/patch-ae b/databases/bdb-xml/patches/patch-ae
deleted file mode 100644
index 5291a22dc47..00000000000
--- a/databases/bdb-xml/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/05/16 19:27:07 hasso Exp $
-
---- ../src/dbxml/Indexer.cpp.orig
-+++ ../src/dbxml/Indexer.cpp
-@@ -22,6 +22,7 @@
- #include <xercesc/framework/MemBufInputSource.hpp>
- #include <xercesc/sax2/SAX2XMLReader.hpp>
- #include <xercesc/sax2/XMLReaderFactory.hpp>
-+#include <xercesc/sax2/Attributes.hpp> 
- #if defined(XERCES_HAS_CPP_NAMESPACE)
-   XERCES_CPP_NAMESPACE_USE
- #endif
diff --git a/databases/bdb-xml/patches/patch-af b/databases/bdb-xml/patches/patch-af
deleted file mode 100644
index bd81d9a389a..00000000000
--- a/databases/bdb-xml/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/01/29 21:48:41 markd Exp $
-
-fix build with gcc4.3
-
---- ../lib/antlr/lib/cpp/antlr/CharScanner.hpp.orig	2003-04-11 02:04:00.000000000 +0000
-+++ ../lib/antlr/lib/cpp/antlr/CharScanner.hpp
-@@ -17,6 +17,9 @@
- #else
- #include <cctype>
- #endif
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
- 
- #include <antlr/TokenStream.hpp>
- #include <antlr/RecognitionException.hpp>
diff --git a/databases/bdb-xml/patches/patch-ag b/databases/bdb-xml/patches/patch-ag
deleted file mode 100644
index d23084dbf6a..00000000000
--- a/databases/bdb-xml/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/01/29 21:48:41 markd Exp $
-
-fix build with gcc4.3
-
---- ../lib/antlr/lib/cpp/src/Parser.cpp.orig	2003-04-11 02:04:08.000000000 +0000
-+++ ../lib/antlr/lib/cpp/src/Parser.cpp
-@@ -12,6 +12,7 @@
- #include "antlr/MismatchedTokenException.hpp"
- //#include "antlr/ASTFactory.hpp"
- #include <iostream>
-+#include <cstdlib>
- 
- #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
- namespace antlr {
diff --git a/databases/bdb-xml/patches/patch-ah b/databases/bdb-xml/patches/patch-ah
deleted file mode 100644
index 3d6c61fb6ec..00000000000
--- a/databases/bdb-xml/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2011/01/29 21:48:41 markd Exp $
-
-fix build with gcc4.3
-
---- ../lib/antlr/lib/cpp/src/TreeParser.cpp.orig	2003-04-11 02:04:09.000000000 +0000
-+++ ../lib/antlr/lib/cpp/src/TreeParser.cpp
-@@ -10,6 +10,7 @@
- #include "antlr/MismatchedTokenException.hpp"
- #include <iostream>
- #include <stdio.h>
-+#include <cstdlib>
- 
- #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
- namespace antlr {
diff --git a/databases/bdb-xml/patches/patch-ai b/databases/bdb-xml/patches/patch-ai
deleted file mode 100644
index bcdeced53f4..00000000000
--- a/databases/bdb-xml/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2011/01/29 21:48:41 markd Exp $
-
-fix build with gcc4.3
-
---- ../src/dbxml/Buffer.cpp.orig	2003-05-09 00:01:43.000000000 +0000
-+++ ../src/dbxml/Buffer.cpp
-@@ -13,6 +13,7 @@ static const char revid[] = "$Id: Buffer
- 
- #include <sstream>
- #include <cassert>
-+#include <cstring>
- 
- using namespace std;
- using namespace DbXml;
diff --git a/databases/bdb-xml/patches/patch-aj b/databases/bdb-xml/patches/patch-aj
deleted file mode 100644
index 042e59e2f1b..00000000000
--- a/databases/bdb-xml/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2011/01/29 21:48:41 markd Exp $
-
-fix build with gcc4.3
-
---- ../src/dbxml/IndexSpecification.hpp.orig	2003-09-17 13:08:51.000000000 +0000
-+++ ../src/dbxml/IndexSpecification.hpp
-@@ -12,6 +12,7 @@
- 
- #include <vector>
- #include <string>
-+#include <cstring>
- #include <map>
- #include "ID.hpp"
- #include "Name.hpp"
diff --git a/databases/bdb-xml/patches/patch-ak b/databases/bdb-xml/patches/patch-ak
deleted file mode 100644
index 8f8b00839a9..00000000000
--- a/databases/bdb-xml/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2011/01/29 21:48:41 markd Exp $
-
-fix build with gcc4.3
-
---- ../src/dbxml/XmlException.cpp.orig	2003-05-09 00:01:57.000000000 +0000
-+++ ../src/dbxml/XmlException.cpp
-@@ -15,6 +15,8 @@ static const char revid[] = "$Id: XmlExc
- 
- #include <string>
- #include <sstream>
-+#include <cstring>
-+#include <cstdlib>
- 
- using namespace DbXml;
- 
diff --git a/databases/bdb-xml/patches/patch-configure b/databases/bdb-xml/patches/patch-configure
new file mode 100644
index 00000000000..5c6c842c6ca
--- /dev/null
+++ b/databases/bdb-xml/patches/patch-configure
@@ -0,0 +1,43 @@
+$NetBSD: patch-configure,v 1.1 2011/02/23 10:32:29 adam Exp $
+
+--- configure.orig	2009-12-22 13:21:17.000000000 +0000
++++ configure
+@@ -2656,17 +2656,17 @@ DB_TEST_PATH="<replace_with:_path_to_db_
+ DB_UTIL_PATH="<replace_with:_path_to_db_build>/build_unix"
+ 
+ # Check for a DB install tree
+-if test `ls "$with_berkeleydb"/lib/libdb-*.la 2>/dev/null | wc -l` -gt 0 ; then
++if test `ls "$with_berkeleydb"/lib/lib${BDB_TYPE}-*.la 2>/dev/null | wc -l` -gt 0 ; then
+    	{ echo "$as_me:$LINENO: checking for Berkeley DB version from install tree" >&5
+ echo $ECHO_N "checking for Berkeley DB version from install tree... $ECHO_C" >&6; }
+-	db_version=`ls "$with_berkeleydb"/lib/libdb-*.la | sed 's/.*db-\(.*\).la/\1/'`
++	db_version=`ls "$with_berkeleydb"/lib/lib${BDB_TYPE}-*.la | sed 's/.*db.-\(.*\).la/\1/'`
+ 	{ echo "$as_me:$LINENO: result: $db_version" >&5
+ echo "${ECHO_T}$db_version" >&6; }
+ 
+ 	DB_TCLLIB="<replace_with:_path_to_db_libs_with_tcl>/libdb_tcl-$db_version"
+   	berkeleydb_include="-I$with_berkeleydb/include"
+ 	berkeleydb_lib="$with_berkeleydb/lib"
+-  	berkeleydb_library="db-$db_version"
++  	berkeleydb_library="${BDB_TYPE}-$db_version"
+   	berkeleydb_jar="$with_berkeleydb/lib/db.jar"
+ 
+ 
+@@ -2746,7 +2746,7 @@ echo "$as_me: error: $with_berkeleydb no
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-if test "$db_version" != "4.3" && test "$db_version" != "4.4" && test "$db_version" != "4.5" && test "$db_version" != "4.6" && test "$db_version" != "4.7" && test "$db_version" != "4.8"; then
++if test "$db_version" != "4.3" && test "$db_version" != "4.4" && test "$db_version" != "4.5" && test "$db_version" != "4.6" && test "$db_version" != "4.7" && test "$db_version" != "4.8" && test "$db_version" != "5.1"; then
+ 		{ { echo "$as_me:$LINENO: error: $with_berkeleydb is version $db_version, which is not a supported version of Berkeley DB. The version must be at least 4.3" >&5
+ echo "$as_me: error: $with_berkeleydb is version $db_version, which is not a supported version of Berkeley DB. The version must be at least 4.3" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -2995,7 +2995,7 @@ echo "${ECHO_T}$with_zlib" >&6; }
+   if test "$with_zlib" != "no"; then
+      { echo "$as_me:$LINENO: checking if the ZLIB library is present" >&5
+ echo $ECHO_N "checking if the ZLIB library is present... $ECHO_C" >&6; }
+-     if test `ls $with_zlib/lib/libz.a 2>/dev/null | wc -l` -gt 0 ; then
++     if test `ls $with_zlib/include/zlib.h 2>/dev/null | wc -l` -gt 0 ; then
+         { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+         zlib_lib="-L$with_zlib/lib -R$with_zlib/lib"