configure looks for and finds -ltermcap too late in the process for it to

be linked in when testing -lreadline usability so that test fails on
Solaris - so pass that lib into configure at the start via the environment.

Also allow optional use of db4 rather that db.

4 files changed, 63 insertions, 2 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 6c734adc612..16892d713dd 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:52 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/22 11:59:50 markd Exp $
 
 DISTNAME=		heimdal-0.6
 CATEGORIES=		security
@@ -32,9 +32,15 @@ CONFIGURE_ARGS+=	--without-krb4
 BUILDLINK_INCDIRS.readline=	include/readline
 .include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
+LIBS.SunOS=		-ltermcap
 
+BUILD_DEFS+=		USE_DB4
+.if defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS])
+.include "../../databases/db4/buildlink3.mk"
+.else
 USE_DB185=		yes
 .include "../../databases/db/buildlink3.mk"
+.endif
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 .include "../../security/openssl/buildlink3.mk"
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 58a528f5119..c625b15188e 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/01/13 02:05:29 markd Exp $
+$NetBSD: distinfo,v 1.3 2004/02/22 11:59:50 markd Exp $
 
 SHA1 (heimdal-0.6.tar.gz) = 06f00ea8ec26d64729806960f2f7f66bee8275bd
 Size (heimdal-0.6.tar.gz) = 3135319 bytes
@@ -7,3 +7,5 @@ SHA1 (patch-ab) = 400a9ac3a76ac7e8b4dcc230e0bdf7fc5222fbb7
 SHA1 (patch-ac) = 121961811f559822c6a4f3d7f7e4646b16908942
 SHA1 (patch-ad) = 47b4a76c1021f2683bd7f9940df78e2b38cf5448
 SHA1 (patch-ae) = 46d5125deec8b82c821208aa0091d96f625d8e88
+SHA1 (patch-af) = 7df1c2dfd7cb69d7ec657e4be0d56a57b394e3fd
+SHA1 (patch-ag) = 80c85e544f6be3ecdd538c89e888a80e77a2a630
diff --git a/security/heimdal/patches/patch-af b/security/heimdal/patches/patch-af
new file mode 100644
index 00000000000..0746db4c673
--- /dev/null
+++ b/security/heimdal/patches/patch-af
@@ -0,0 +1,37 @@
+$NetBSD: patch-af,v 1.1 2004/02/22 11:59:50 markd Exp $
+
+--- lib/hdb/db3.c.orig	2001-08-09 20:41:48.000000000 +1200
++++ lib/hdb/db3.c
+@@ -37,7 +37,13 @@ RCSID("$Id: db3.c,v 1.8 2001/08/09 08:41
+ 
+ #if HAVE_DB3
+ 
++#if defined(HAVE_DB4_DB_H)
++#include <db4/db.h>
++#elif defined(HAVE_DB3_DB_H)
++#include <db3/db.h>
++#else
+ #include <db.h>
++#endif
+ 
+ static krb5_error_code
+ DB_close(krb5_context context, HDB *db)
+@@ -262,10 +268,18 @@ DB_open(krb5_context context, HDB *db, i
+     }
+     db_create(&d, NULL, 0);
+     db->db = d;
++#if defined(HAVE_DB4_DB_H)
++    if ((ret = d->open(db->db, NULL, fn, NULL, DB_BTREE, myflags, mode))) {
++#else
+     if ((ret = d->open(db->db, fn, NULL, DB_BTREE, myflags, mode))) {
++#endif
+       if(ret == ENOENT)
+ 	/* try to open without .db extension */
++#if defined(HAVE_DB4_DB_H)
++	if (d->open(db->db, NULL, db->name, NULL, DB_BTREE, myflags, mode)) {
++#else
+ 	if (d->open(db->db, db->name, NULL, DB_BTREE, myflags, mode)) {
++#endif
+ 	  free(fn);
+ 	  krb5_set_error_string(context, "opening %s: %s",
+ 				db->name, strerror(ret));
diff --git a/security/heimdal/patches/patch-ag b/security/heimdal/patches/patch-ag
new file mode 100644
index 00000000000..a7f0b6e5b28
--- /dev/null
+++ b/security/heimdal/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2004/02/22 11:59:50 markd Exp $
+
+--- lib/roken/ndbm_wrap.c.orig	2002-05-01 04:37:08.000000000 +1200
++++ lib/roken/ndbm_wrap.c
+@@ -165,7 +165,11 @@ dbm_open (const char *file, int flags, m
+ 	free(fn);
+ 	return NULL;
+     }
++#if defined(HAVE_DB4_DB_H)
++    if(db->open(db, NULL, fn, NULL, DB_BTREE, myflags, mode) != 0) {
++#else
+     if(db->open(db, fn, NULL, DB_BTREE, myflags, mode) != 0) {
++#endif
+ 	free(fn);
+ 	db->close(db, 0);
+ 	return NULL;