summaryrefslogtreecommitdiff
path: root/databases/bdb-xml
diff options
context:
space:
mode:
authorhasso <hasso@pkgsrc.org>2009-07-17 18:26:30 +0000
committerhasso <hasso@pkgsrc.org>2009-07-17 18:26:30 +0000
commit98a9486cdfe4cc04cd6c24340772c925bdb5230c (patch)
tree91953e0cedc3db7a468edf725262d4814b890b81 /databases/bdb-xml
parenta06574d56c46094026dee77691a3075aa3cc9ca4 (diff)
downloadpkgsrc-98a9486cdfe4cc04cd6c24340772c925bdb5230c.tar.gz
Make it not use included libtool in the configure phase. Makes it build
again on DragonFly.
Diffstat (limited to 'databases/bdb-xml')
-rw-r--r--databases/bdb-xml/distinfo4
-rw-r--r--databases/bdb-xml/patches/patch-aa14
2 files changed, 12 insertions, 6 deletions
diff --git a/databases/bdb-xml/distinfo b/databases/bdb-xml/distinfo
index 74ba1c4cbf0..c0930d4b451 100644
--- a/databases/bdb-xml/distinfo
+++ b/databases/bdb-xml/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2009/05/16 19:27:07 hasso Exp $
+$NetBSD: distinfo,v 1.8 2009/07/17 18:26:30 hasso 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) = 1cddc485b2ba67244cecc5f6e96802deca8c49f9
+SHA1 (patch-aa) = 6694b534ce0d48c9387c3f3f06e73963fa97c089
SHA1 (patch-ab) = 4e124704238d4d3c6fc753d28ce3cb0bd5e3731f
SHA1 (patch-ac) = b19ca080112614634660a8d77303bbdc0a4b7adc
SHA1 (patch-ad) = dfbfa3fe27f8da99b35964223a754f8223a5b7e9
diff --git a/databases/bdb-xml/patches/patch-aa b/databases/bdb-xml/patches/patch-aa
index b6cfbfbabcf..870ee7b57f2 100644
--- a/databases/bdb-xml/patches/patch-aa
+++ b/databases/bdb-xml/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2009/05/16 19:27:07 hasso Exp $
+$NetBSD: patch-aa,v 1.5 2009/07/17 18:26:30 hasso Exp $
---- ../dist/configure.orig 2004-01-27 16:12:02.000000000 +0000
-+++ ../dist/configure
+--- ../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"
@@ -120,7 +120,7 @@ $NetBSD: patch-aa,v 1.4 2009/05/16 19:27:07 hasso Exp $
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
+@@ -19369,12 +19369,12 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
INSTALLER="\$(LIBTOOL) --mode=install cp -p"
MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -129,6 +129,12 @@ $NetBSD: patch-aa,v 1.4 2009/05/16 19:27:07 hasso Exp $
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";;