summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2010-06-03 07:58:37 +0000
committertnn <tnn@pkgsrc.org>2010-06-03 07:58:37 +0000
commit03d2351c52ab99ca0e4ff25fa97b1f8bdc18e4c4 (patch)
tree8e14e722b6e2a245334538fab802829c2b218cf2 /misc
parentf499e7db28032d5e8b7986ddb839d95974ef4690 (diff)
downloadpkgsrc-03d2351c52ab99ca0e4ff25fa97b1f8bdc18e4c4.tar.gz
Let configure accept bdb 4.8.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice3/distinfo4
-rw-r--r--misc/openoffice3/patches/patch-ba13
2 files changed, 13 insertions, 4 deletions
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 5fbdbb06612..3805638d0d3 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2010/03/16 15:58:54 tnn Exp $
+$NetBSD: distinfo,v 1.27 2010/06/03 07:58:37 tnn Exp $
SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0
@@ -33,7 +33,7 @@ SHA1 (patch-aq) = 3e9a156887e108126c76f0735abb4dce177efa4b
SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
SHA1 (patch-as) = c8a532c2b8a4dd676f09aba8d42677349f58c0a9
SHA1 (patch-aw) = a331b0130b0b6bac0b81ee6a1aeeb7b216d5f511
-SHA1 (patch-ba) = 8379e5fd3be80eda480911017a4091b9190251ea
+SHA1 (patch-ba) = c759a1fca8893095d88e7f4ee30830fd01213a69
SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4
SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
diff --git a/misc/openoffice3/patches/patch-ba b/misc/openoffice3/patches/patch-ba
index bb156931c19..e0f66c12387 100644
--- a/misc/openoffice3/patches/patch-ba
+++ b/misc/openoffice3/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.5 2009/09/10 00:14:55 tnn Exp $
+$NetBSD: patch-ba,v 1.6 2010/06/03 07:58:37 tnn Exp $
---- configure.orig 2009-04-22 16:54:40.000000000 +0200
+--- configure.orig 2009-04-22 14:54:40.000000000 +0000
+++ configure
@@ -4222,11 +4222,11 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6; }
test_randr=no
@@ -77,6 +77,15 @@ $NetBSD: patch-ba,v 1.5 2009/09/10 00:14:55 tnn Exp $
else
CFLAGS=-I/usr/include/db4
+@@ -15054,7 +15055,7 @@ fi
+
+ { echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5
+ echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6; }
+- for v in `seq 1 7`; do
++ for v in `seq 1 8`; do
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
@@ -15122,13 +15123,13 @@ echo "$as_me: error: no. you need at lea
#AC_CHECK_LIB(db, db_create, [],
# [AC_MSG_ERROR([db library not installed or functional])], [])