Override config.*. Fix DragonFly support in configure's libtool fragment.

3 files changed, 116 insertions, 5 deletions

diff --git a/databases/bdb-xml/Makefile b/databases/bdb-xml/Makefile
index fe030d2eb0e..a8e8f15f6d4 100644
--- a/databases/bdb-xml/Makefile
+++ b/databases/bdb-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/08/14 18:00:15 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/02 17:32:13 joerg Exp $
 
 DISTNAME=	dbxml-1.2.1
 PKGNAME=	${DISTNAME:S/db/bdb-/}
@@ -15,6 +15,9 @@ CONFLITCS=	dbxml<=1.2.1
 WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 GNU_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	../dist/configure
+CONFIG_GUESS_OVERRIDE=	../dist/config.guess
+CONFIG_SUB_OVERRIDE=	../dist/config.sub
+CONFIG_STATUS_OVERRIDE=	../dist/config.status
 USE_LIBTOOL=		YES
 
 CONFIGURE_ARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4}
diff --git a/databases/bdb-xml/distinfo b/databases/bdb-xml/distinfo
index c0a43725966..88cd208746f 100644
--- a/databases/bdb-xml/distinfo
+++ b/databases/bdb-xml/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 16:33:05 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/02 17:32:13 joerg Exp $
 
 SHA1 (dbxml-1.2.1.tar.gz) = cc6ce354b3fb2e00d5b424c0b15ecee4ec340842
 RMD160 (dbxml-1.2.1.tar.gz) = 162f3e14e509aefd764bb97af80d5bbf06151df7
 Size (dbxml-1.2.1.tar.gz) = 3151529 bytes
-SHA1 (patch-aa) = 24b9e137eeb9d5c123c168738d553ca8f7ed1c61
+SHA1 (patch-aa) = 8bf913113e7fe700adb94463b5f69e99b3c20063
 SHA1 (patch-ab) = 39612561440760dc353ba471808065b5d48ab51e
 SHA1 (patch-ac) = b19ca080112614634660a8d77303bbdc0a4b7adc
diff --git a/databases/bdb-xml/patches/patch-aa b/databases/bdb-xml/patches/patch-aa
index e998ea6c75b..f70a750f020 100644
--- a/databases/bdb-xml/patches/patch-aa
+++ b/databases/bdb-xml/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/31 17:15:58 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/02 17:32:13 joerg Exp $
 
---- ../dist/configure.orig	2003-12-21 17:51:52.000000000 -0600
+--- ../dist/configure.orig	2004-01-27 16:12:02.000000000 +0000
 +++ ../dist/configure
 @@ -3443,14 +3443,14 @@ echo "${ECHO_T}$with_berkeleydb" >&6
  if test "$with_berkeleydb" = "no"; then
@@ -21,6 +21,105 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/31 17:15:58 minskim Exp $
  
  	# 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,7 +19369,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
@@ -30,3 +129,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/31 17:15:58 minskim Exp $
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
+@@ -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*|drgaonfly*)	_JNI_INC_SUBDIRS="freebsd";;
+ 	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
+ 	osf*)		_JNI_INC_SUBDIRS="alpha";;
+ 	solaris*)	_JNI_INC_SUBDIRS="solaris";;