Sat May 16 19:27:07 2009 UTC ()
* Fix a typo in patch-aa.
* Fix build with xerces-c 2.8.0.


(hasso)
diff -r1.6 -r1.7 pkgsrc/databases/bdb-xml/distinfo
diff -r1.3 -r1.4 pkgsrc/databases/bdb-xml/patches/patch-aa
diff -r0 -r1.1 pkgsrc/databases/bdb-xml/patches/patch-ae
cvs diff -r1.6 -r1.7 pkgsrc/databases/bdb-xml/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/bdb-xml/Attic/distinfo 2008/09/24 19:32:00 1.6
+++ pkgsrc/databases/bdb-xml/Attic/distinfo 2009/05/16 19:27:07 1.7
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.6 2008/09/24 19:32:00 minskim Exp $ 1$NetBSD: distinfo,v 1.7 2009/05/16 19:27:07 hasso Exp $
2 2
3SHA1 (dbxml-1.2.1.tar.gz) = cc6ce354b3fb2e00d5b424c0b15ecee4ec340842 3SHA1 (dbxml-1.2.1.tar.gz) = cc6ce354b3fb2e00d5b424c0b15ecee4ec340842
4RMD160 (dbxml-1.2.1.tar.gz) = 162f3e14e509aefd764bb97af80d5bbf06151df7 4RMD160 (dbxml-1.2.1.tar.gz) = 162f3e14e509aefd764bb97af80d5bbf06151df7
5Size (dbxml-1.2.1.tar.gz) = 3151529 bytes 5Size (dbxml-1.2.1.tar.gz) = 3151529 bytes
6SHA1 (patch-aa) = c868c2009ba44fcbb0fe22e0e9603743e6acba45 6SHA1 (patch-aa) = 1cddc485b2ba67244cecc5f6e96802deca8c49f9
7SHA1 (patch-ab) = 4e124704238d4d3c6fc753d28ce3cb0bd5e3731f 7SHA1 (patch-ab) = 4e124704238d4d3c6fc753d28ce3cb0bd5e3731f
8SHA1 (patch-ac) = b19ca080112614634660a8d77303bbdc0a4b7adc 8SHA1 (patch-ac) = b19ca080112614634660a8d77303bbdc0a4b7adc
9SHA1 (patch-ad) = dfbfa3fe27f8da99b35964223a754f8223a5b7e9 9SHA1 (patch-ad) = dfbfa3fe27f8da99b35964223a754f8223a5b7e9
 10SHA1 (patch-ae) = 75a640c3d00541891ff46096096d434d37c28669
cvs diff -r1.3 -r1.4 pkgsrc/databases/bdb-xml/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/databases/bdb-xml/patches/Attic/patch-aa 2008/09/24 19:32:00 1.3
+++ pkgsrc/databases/bdb-xml/patches/Attic/patch-aa 2009/05/16 19:27:07 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.3 2008/09/24 19:32:00 minskim Exp $ 1$NetBSD: patch-aa,v 1.4 2009/05/16 19:27:07 hasso Exp $
2 2
3--- ../dist/configure.orig 2004-01-27 16:12:02.000000000 +0000 3--- ../dist/configure.orig 2004-01-27 16:12:02.000000000 +0000
4+++ ../dist/configure 4+++ ../dist/configure
5@@ -3443,14 +3443,14 @@ echo "${ECHO_T}$with_berkeleydb" >&6 5@@ -3443,14 +3443,14 @@ echo "${ECHO_T}$with_berkeleydb" >&6
6 if test "$with_berkeleydb" = "no"; then 6 if test "$with_berkeleydb" = "no"; then
7 with_berkeleydb="/usr/local/BerkeleyDB.4.2" 7 with_berkeleydb="/usr/local/BerkeleyDB.4.2"
8 fi 8 fi
9-if test `ls "$with_berkeleydb"/lib/libdb_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then 9-if test `ls "$with_berkeleydb"/lib/libdb_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then
10+if test `ls "$with_berkeleydb"/lib/libdb46_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then 10+if test `ls "$with_berkeleydb"/lib/libdb46_cxx-*.la 2>/dev/null | wc -l` -gt 0 ; then
11 echo "$as_me:$LINENO: checking for Berkeley DB version from install tree" >&5 11 echo "$as_me:$LINENO: checking for Berkeley DB version from install tree" >&5
12 echo $ECHO_N "checking for Berkeley DB version from install tree... $ECHO_C" >&6 12 echo $ECHO_N "checking for Berkeley DB version from install tree... $ECHO_C" >&6
13- db_version=`ls "$with_berkeleydb"/lib/libdb_cxx-*.la | sed 's/.*db_cxx-\(.*\).la/\1/'` 13- db_version=`ls "$with_berkeleydb"/lib/libdb_cxx-*.la | sed 's/.*db_cxx-\(.*\).la/\1/'`
14+ db_version=`ls "$with_berkeleydb"/lib/libdb46_cxx-*.la | sed 's/.*db46_cxx-\(.*\).la/\1/'` 14+ db_version=`ls "$with_berkeleydb"/lib/libdb46_cxx-*.la | sed 's/.*db46_cxx-\(.*\).la/\1/'`
@@ -124,17 +124,17 @@ $NetBSD: patch-aa,v 1.3 2008/09/24 19:32 @@ -124,17 +124,17 @@ $NetBSD: patch-aa,v 1.3 2008/09/24 19:32
124 INSTALLER="\$(LIBTOOL) --mode=install cp -p" 124 INSTALLER="\$(LIBTOOL) --mode=install cp -p"
125  125
126 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" 126 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
127-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" 127-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
128+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" 128+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
129 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" 129 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
130 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" 130 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
131 MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" 131 MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
132@@ -19825,7 +19825,7 @@ if test "$_JTOPDIR" != "/usr"; then 132@@ -19825,7 +19825,7 @@ if test "$_JTOPDIR" != "/usr"; then
133 case "$host_os" in 133 case "$host_os" in
134 aix*) _JNI_INC_SUBDIRS="aix";; 134 aix*) _JNI_INC_SUBDIRS="aix";;
135 bsdi*) _JNI_INC_SUBDIRS="bsdos";; 135 bsdi*) _JNI_INC_SUBDIRS="bsdos";;
136- freebsd*) _JNI_INC_SUBDIRS="freebsd";; 136- freebsd*) _JNI_INC_SUBDIRS="freebsd";;
137+ freebsd*|drgaonfly*) _JNI_INC_SUBDIRS="freebsd";; 137+ freebsd*|dragonfly*) _JNI_INC_SUBDIRS="freebsd";;
138 linux*) _JNI_INC_SUBDIRS="linux genunix";; 138 linux*) _JNI_INC_SUBDIRS="linux genunix";;
139 osf*) _JNI_INC_SUBDIRS="alpha";; 139 osf*) _JNI_INC_SUBDIRS="alpha";;
140 solaris*) _JNI_INC_SUBDIRS="solaris";; 140 solaris*) _JNI_INC_SUBDIRS="solaris";;
File Added: pkgsrc/databases/bdb-xml/patches/Attic/patch-ae
$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