[pkgsrc/trunk]: pkgsrc/databases/db4 PR pkg/38616: Hasso Tepper: Fix build on...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28610310bb19
branches:  trunk
changeset: 542229:28610310bb19
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri May 09 10:14:28 2008 +0000

description:
PR pkg/38616: Hasso Tepper: Fix build on DragonFlyBSD.

The configure script checks for sizeof(FILE), which is an opaque type.
It can be argued that it should check for FILE* instead because that's
what it uses, but take the shortest path of resistance and disable
the check on DragonFly. Upstream is aware of the issue.

diffstat:

 databases/db4/distinfo         |   4 ++--
 databases/db4/patches/patch-ab |  21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r d1ef2b363507 -r 28610310bb19 databases/db4/distinfo
--- a/databases/db4/distinfo    Fri May 09 10:06:10 2008 +0000
+++ b/databases/db4/distinfo    Fri May 09 10:14:28 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2008/01/10 21:55:52 adam Exp $
+$NetBSD: distinfo,v 1.29 2008/05/09 10:14:28 tnn Exp $
 
 SHA1 (db-4.6.21.tar.gz) = 5be3beb82e42a78ff671a3f5a4c30e5652972119
 RMD160 (db-4.6.21.tar.gz) = ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e
 Size (db-4.6.21.tar.gz) = 11881885 bytes
 SHA1 (patch-aa) = 003eae2562496764c2ba15aee14a5894cca23ca4
-SHA1 (patch-ab) = 32af80b165582baa259a487950e6a165f0d8f86b
+SHA1 (patch-ab) = 929b88a7aed640721542e7079675d18eff5b62f5
 SHA1 (patch-ac) = 72930ded2e676e810242df60f94703f37a8be853
diff -r d1ef2b363507 -r 28610310bb19 databases/db4/patches/patch-ab
--- a/databases/db4/patches/patch-ab    Fri May 09 10:06:10 2008 +0000
+++ b/databases/db4/patches/patch-ab    Fri May 09 10:14:28 2008 +0000
@@ -1,7 +1,5 @@
-$NetBSD: patch-ab,v 1.17 2008/01/10 21:55:53 adam Exp $
-
---- dist/configure.orig        2007-09-27 17:32:04.000000000 +0200
-+++ dist/configure
+--- dist/configure.orig        2007-09-27 18:32:04 +0300
++++ dist/configure     2008-05-09 01:20:00 +0300
 @@ -5938,6 +5938,7 @@ db_cv_gxx_except=no;
  if test "$GXX" = "yes"; then
        GXX_VERSION=`${MAKEFILE_CXX} --version`
@@ -45,7 +43,20 @@
        hp*)            _JNI_INC_SUBDIRS="hp-ux";;
        linux*)         _JNI_INC_SUBDIRS="linux genunix";;
        osf*)           _JNI_INC_SUBDIRS="alpha";;
-@@ -29859,7 +29859,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -28547,10 +28547,12 @@ typedef FILE ac__type_new_;
+ int
+ main ()
+ {
++#ifndef __DragonFly__
+ if ((ac__type_new_ *) 0)
+   return 0;
+ if (sizeof (ac__type_new_))
+   return 0;
++#endif
+   ;
+   return 0;
+ }
+@@ -29859,7 +29861,7 @@ rm -f core conftest.err conftest.$ac_obj
        # If the user specified we use POSIX pthreads mutexes, and we fail to
        # find the full interface, try and configure for just intra-process
        # support.