- Enable dbopen() in DB 1.85 even if !BDB because libhdb with

  no backend is very confusing.

- Fix build when !BDB[*]

PR:	215741 [*]

22 files changed, 71 insertions, 25 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index f4d3c7714e8b..7ef5e64f9543 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	heimdal
 PORTVERSION=	7.1.0
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.h5l.org/dist/src/ \
 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
@@ -18,8 +19,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 CONFLICTS=	krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* srp-[0-9]* \
 		wu-ftpd-[0-9]* wu-ftpd+ipv6-[0-9]*
 
-USES=		gettext gssapi:bootstrap,heimdal libtool pathfix pkgconfig \
-		readline makeinfo ssl
+USES=		gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \
+		pkgconfig readline makeinfo ssl
 USE_LDCONFIG=	${GSSAPILIBDIR}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_fnmatch_h=yes \
@@ -29,7 +30,8 @@ CONFIGURE_ENV=	ac_cv_header_fnmatch_h=yes \
 		ac_cv_header_db5_db_h=no \
 		ac_cv_header_db5_h=no \
 		ac_cv_prog_COMPILE_ET=${WRKSRC}/lib/com_err/compile_et
-CONFIGURE_ARGS=	--with-libintl \
+CONFIGURE_ARGS=	--with-berkeley-db \
+		--with-libintl \
 		--with-libintl-include="${LOCALBASE}/include" \
 		--with-libintl-lib="${LOCALBASE}/lib" \
 		--libdir="${GSSAPILIBDIR}" \
@@ -61,11 +63,13 @@ IPV6_CONFIGURE_WITH=	ipv6
 
 BDB_DESC=		Enable BerkeleyDB KDC backend support
 BDB_USES=		bdb:5 localbase
-BDB_CONFIGURE_WITH=	berkeley-db
 BDB_CONFIGURE_ENV=	ac_cv_header_db${BDB_VER}_db_h=yes \
 			ac_cv_func_db_create=yes \
 			ac_cv_funclib_db_create="-l${BDB_LIB_NAME}"
 BDB_CONFIGURE_ON=	--disable-ndbm-db
+BDB_CONFIGURE_ENV_OFF=	ac_cv_header_db_h=yes \
+			ac_cv_func_db_create=no
+BDB_CONFIGURE_OFF=	--enable-ndbm-db
 
 SQLITE_DESC=		Enable SQLite KDC backend support
 SQLITE_USES=		sqlite
diff --git a/security/heimdal/files/patch-admin-Makefile.in b/security/heimdal/files/patch-admin-Makefile.in
index d2343478d4a4..bfc511d04b04 100644
--- a/security/heimdal/files/patch-admin-Makefile.in
+++ b/security/heimdal/files/patch-admin-Makefile.in
@@ -1,4 +1,4 @@
---- admin/Makefile.in.orig	2017-01-03 13:45:05 UTC
+--- admin/Makefile.in.orig	2017-01-03 19:44:18 UTC
 +++ admin/Makefile.in
 @@ -156,9 +156,13 @@ dist_ktutil_OBJECTS = add.$(OBJEXT) chan
  	rename.$(OBJEXT)
diff --git a/security/heimdal/files/patch-appl-afsutil-Makefile.in b/security/heimdal/files/patch-appl-afsutil-Makefile.in
index 528bd79b976e..2d463d6d2d1d 100644
--- a/security/heimdal/files/patch-appl-afsutil-Makefile.in
+++ b/security/heimdal/files/patch-appl-afsutil-Makefile.in
@@ -1,4 +1,4 @@
---- appl/afsutil/Makefile.in.orig	2017-01-03 13:45:01 UTC
+--- appl/afsutil/Makefile.in.orig	2017-01-03 19:44:14 UTC
 +++ appl/afsutil/Makefile.in
 @@ -152,13 +152,17 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
  PROGRAMS = $(bin_PROGRAMS)
diff --git a/security/heimdal/files/patch-appl-gssmask-Makefile.in b/security/heimdal/files/patch-appl-gssmask-Makefile.in
index df672dfe07eb..481eb252361e 100644
--- a/security/heimdal/files/patch-appl-gssmask-Makefile.in
+++ b/security/heimdal/files/patch-appl-gssmask-Makefile.in
@@ -1,4 +1,4 @@
---- appl/gssmask/Makefile.in.orig	2017-01-03 13:45:01 UTC
+--- appl/gssmask/Makefile.in.orig	2017-01-03 19:44:14 UTC
 +++ appl/gssmask/Makefile.in
 @@ -151,9 +151,15 @@ CONFIG_CLEAN_VPATH_FILES =
  PROGRAMS = $(noinst_PROGRAMS)
diff --git a/security/heimdal/files/patch-appl-kf-Makefile.in b/security/heimdal/files/patch-appl-kf-Makefile.in
index 277d9cd3bdb9..c9f064961c3b 100644
--- a/security/heimdal/files/patch-appl-kf-Makefile.in
+++ b/security/heimdal/files/patch-appl-kf-Makefile.in
@@ -1,4 +1,4 @@
---- appl/kf/Makefile.in.orig	2017-01-03 13:45:01 UTC
+--- appl/kf/Makefile.in.orig	2017-01-03 19:44:14 UTC
 +++ appl/kf/Makefile.in
 @@ -154,9 +154,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
  PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
diff --git a/security/heimdal/files/patch-appl-su-Makefile.in b/security/heimdal/files/patch-appl-su-Makefile.in
index ba9144d3681e..d378ea93226b 100644
--- a/security/heimdal/files/patch-appl-su-Makefile.in
+++ b/security/heimdal/files/patch-appl-su-Makefile.in
@@ -1,4 +1,4 @@
---- appl/su/Makefile.in.orig	2017-01-03 13:45:01 UTC
+--- appl/su/Makefile.in.orig	2017-01-03 19:44:14 UTC
 +++ appl/su/Makefile.in
 @@ -152,12 +152,16 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
  PROGRAMS = $(bin_PROGRAMS)
diff --git a/security/heimdal/files/patch-appl-test-Makefile.in b/security/heimdal/files/patch-appl-test-Makefile.in
index 81e3bb6b172b..619d0025905c 100644
--- a/security/heimdal/files/patch-appl-test-Makefile.in
+++ b/security/heimdal/files/patch-appl-test-Makefile.in
@@ -1,4 +1,4 @@
---- appl/test/Makefile.in.orig	2017-01-03 13:45:01 UTC
+--- appl/test/Makefile.in.orig	2017-01-03 19:44:14 UTC
 +++ appl/test/Makefile.in
 @@ -170,11 +170,15 @@ am_gssapi_server_OBJECTS = gssapi_server
  	gss_common.$(OBJEXT) common.$(OBJEXT)
diff --git a/security/heimdal/files/patch-configure b/security/heimdal/files/patch-configure
index 308c4a2146c2..5bd26a6d42a2 100644
--- a/security/heimdal/files/patch-configure
+++ b/security/heimdal/files/patch-configure
@@ -18,7 +18,26 @@
  	;;
  *-*-openbsd*)
  	native_pthread_support=yes
-@@ -28685,7 +28685,7 @@ fi
+@@ -16776,7 +16776,7 @@ fi
+ 
+ fi
+ 
+-for db_type in unknown $db_type_preference; do
++for db_type in $db_type_preference unknown; do
+     if eval test \"x\$have_${db_type}\" = xyes; then
+         break
+     fi
+@@ -16935,6 +16935,9 @@ esac
+ 
+ $as_echo "#define HAVE_NDBM 1" >>confdefs.h
+       have_ndbm=yes
++      if test "$db_type" = "unknown"; then
++      db_type=ndbm
++      fi
+     else
+ 
+       $as_unset ac_cv_func_dbm_firstkey
+@@ -28685,7 +28688,7 @@ fi
  
  krb_cv_compile_et="no"
  krb_cv_com_err_need_r=""
diff --git a/security/heimdal/files/patch-doc__Makefile.in b/security/heimdal/files/patch-doc__Makefile.in
index d9b67a9866bc..29b24841673f 100644
--- a/security/heimdal/files/patch-doc__Makefile.in
+++ b/security/heimdal/files/patch-doc__Makefile.in
@@ -1,4 +1,4 @@
---- doc/Makefile.in.orig	2017-01-03 13:44:59 UTC
+--- doc/Makefile.in.orig	2017-01-03 19:44:12 UTC
 +++ doc/Makefile.in
 @@ -501,7 +501,7 @@ texi_subst = sed -e 's,[@]dbdir[@],$(loc
  	-e 's,[@]dbtype[@],$(db_type),g' \
diff --git a/security/heimdal/files/patch-kadmin-Makefile.in b/security/heimdal/files/patch-kadmin-Makefile.in
index caf1bdf1288b..c6db200d36d6 100644
--- a/security/heimdal/files/patch-kadmin-Makefile.in
+++ b/security/heimdal/files/patch-kadmin-Makefile.in
@@ -1,4 +1,4 @@
---- kadmin/Makefile.in.orig	2017-01-03 13:45:01 UTC
+--- kadmin/Makefile.in.orig	2017-01-03 19:44:14 UTC
 +++ kadmin/Makefile.in
 @@ -166,6 +166,8 @@ am__DEPENDENCIES_2 = $(top_builddir)/lib
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
diff --git a/security/heimdal/files/patch-kcm-Makefile.in b/security/heimdal/files/patch-kcm-Makefile.in
index 20cc44579cbb..43d53ac2ec74 100644
--- a/security/heimdal/files/patch-kcm-Makefile.in
+++ b/security/heimdal/files/patch-kcm-Makefile.in
@@ -1,4 +1,4 @@
---- kcm/Makefile.in.orig	2017-01-03 13:45:00 UTC
+--- kcm/Makefile.in.orig	2017-01-03 19:44:13 UTC
 +++ kcm/Makefile.in
 @@ -157,10 +157,12 @@ am_kcm_OBJECTS = acl.$(OBJEXT) acquire.$
  	events.$(OBJEXT) glue.$(OBJEXT) log.$(OBJEXT) main.$(OBJEXT) \
diff --git a/security/heimdal/files/patch-kdc-Makefile.in b/security/heimdal/files/patch-kdc-Makefile.in
index bbf0139d99fe..d8689840d282 100644
--- a/security/heimdal/files/patch-kdc-Makefile.in
+++ b/security/heimdal/files/patch-kdc-Makefile.in
@@ -1,4 +1,4 @@
---- kdc/Makefile.in.orig	2017-01-03 13:45:00 UTC
+--- kdc/Makefile.in.orig	2017-01-03 19:44:12 UTC
 +++ kdc/Makefile.in
 @@ -213,6 +213,8 @@ PROGRAMS = $(bin_PROGRAMS) $(libexec_PRO
  am_digest_service_OBJECTS = digest-service.$(OBJEXT)
diff --git a/security/heimdal/files/patch-kpasswd-Makefile.in b/security/heimdal/files/patch-kpasswd-Makefile.in
index 291412705069..84283115317d 100644
--- a/security/heimdal/files/patch-kpasswd-Makefile.in
+++ b/security/heimdal/files/patch-kpasswd-Makefile.in
@@ -1,4 +1,4 @@
---- kpasswd/Makefile.in.orig	2017-01-03 13:45:01 UTC
+--- kpasswd/Makefile.in.orig	2017-01-03 19:44:14 UTC
 +++ kpasswd/Makefile.in
 @@ -155,9 +155,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
  PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
diff --git a/security/heimdal/files/patch-kuser-Makefile.in b/security/heimdal/files/patch-kuser-Makefile.in
index d48980c3043f..ee0820a00c1f 100644
--- a/security/heimdal/files/patch-kuser-Makefile.in
+++ b/security/heimdal/files/patch-kuser-Makefile.in
@@ -1,4 +1,4 @@
---- kuser/Makefile.in.orig	2017-01-03 13:45:00 UTC
+--- kuser/Makefile.in.orig	2017-01-03 19:44:13 UTC
 +++ kuser/Makefile.in
 @@ -157,9 +157,13 @@ am__installdirs = "$(DESTDIR)$(bindir)" 
  PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
diff --git a/security/heimdal/files/patch-lib-base-Makefile.in b/security/heimdal/files/patch-lib-base-Makefile.in
index ee74c4eb5303..a207fdd0f4de 100644
--- a/security/heimdal/files/patch-lib-base-Makefile.in
+++ b/security/heimdal/files/patch-lib-base-Makefile.in
@@ -1,5 +1,19 @@
---- lib/base/Makefile.in.orig	2017-01-03 13:45:02 UTC
+--- lib/base/Makefile.in.orig	2017-01-03 19:44:15 UTC
 +++ lib/base/Makefile.in
+@@ -222,11 +222,11 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(INCLUDE_libintl)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
++	$(AM_CFLAGS) $(CFLAGS) $(INCLUDE_libintl)
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+ am__v_CC_0 = @echo "  CC      " $@;
 @@ -705,7 +705,7 @@ heim_verbose_0 = @echo "  GEN    "$@;
  IMPLEMENT_TLS = $(am__append_1)
  lib_LTLIBRARIES = libheimbase.la
diff --git a/security/heimdal/files/patch-lib-gssapi-Makefile.in b/security/heimdal/files/patch-lib-gssapi-Makefile.in
index 590b87e16579..291274eb232c 100644
--- a/security/heimdal/files/patch-lib-gssapi-Makefile.in
+++ b/security/heimdal/files/patch-lib-gssapi-Makefile.in
@@ -1,4 +1,4 @@
---- lib/gssapi/Makefile.in.orig	2017-01-03 13:45:04 UTC
+--- lib/gssapi/Makefile.in.orig	2017-01-03 19:44:17 UTC
 +++ lib/gssapi/Makefile.in
 @@ -304,8 +304,14 @@ test_acquire_cred_DEPENDENCIES = libgssa
  	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1)
diff --git a/security/heimdal/files/patch-lib-hdb-Makefile.in b/security/heimdal/files/patch-lib-hdb-Makefile.in
index 8880d9386c2c..4f75e6894351 100644
--- a/security/heimdal/files/patch-lib-hdb-Makefile.in
+++ b/security/heimdal/files/patch-lib-hdb-Makefile.in
@@ -1,4 +1,4 @@
---- lib/hdb/Makefile.in.orig	2017-01-03 13:45:03 UTC
+--- lib/hdb/Makefile.in.orig	2017-01-03 19:44:16 UTC
 +++ lib/hdb/Makefile.in
 @@ -225,26 +225,46 @@ libhdb_la_LINK = $(LIBTOOL) $(AM_V_lt) -
  PROGRAMS = $(noinst_PROGRAMS)
diff --git a/security/heimdal/files/patch-lib-hx509-Makefile.in b/security/heimdal/files/patch-lib-hx509-Makefile.in
index 7a37252af57c..b9451bbe7407 100644
--- a/security/heimdal/files/patch-lib-hx509-Makefile.in
+++ b/security/heimdal/files/patch-lib-hx509-Makefile.in
@@ -1,4 +1,4 @@
---- lib/hx509/Makefile.in.orig	2017-01-03 13:45:03 UTC
+--- lib/hx509/Makefile.in.orig	2017-01-03 19:44:16 UTC
 +++ lib/hx509/Makefile.in
 @@ -859,7 +859,9 @@ hxtool_LDADD = \
  	libhx509.la \
diff --git a/security/heimdal/files/patch-lib-kadm5-Makefile.in b/security/heimdal/files/patch-lib-kadm5-Makefile.in
index 226ccb92a011..be5b92a247cd 100644
--- a/security/heimdal/files/patch-lib-kadm5-Makefile.in
+++ b/security/heimdal/files/patch-lib-kadm5-Makefile.in
@@ -1,4 +1,4 @@
---- lib/kadm5/Makefile.in.orig	2017-01-03 13:45:02 UTC
+--- lib/kadm5/Makefile.in.orig	2017-01-03 19:44:15 UTC
 +++ lib/kadm5/Makefile.in
 @@ -253,6 +253,8 @@ iprop_log_OBJECTS = $(dist_iprop_log_OBJ
  iprop_log_DEPENDENCIES = libkadm5srv.la \
@@ -66,3 +66,12 @@
  	$(top_builddir)/lib/hdb/libhdb.la \
  	$(top_builddir)/lib/krb5/libkrb5.la \
  	$(top_builddir)/lib/asn1/libasn1.la \
+@@ -1166,7 +1182,7 @@ libkadm5srv_la-get_princs_s.lo: get_prin
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5srv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5srv_la-get_princs_s.lo `test -f 'get_princs_s.c' || echo '$(srcdir)/'`get_princs_s.c
+ 
+ libkadm5srv_la-get_s.lo: get_s.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5srv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5srv_la-get_s.lo -MD -MP -MF $(DEPDIR)/libkadm5srv_la-get_s.Tpo -c -o libkadm5srv_la-get_s.lo `test -f 'get_s.c' || echo '$(srcdir)/'`get_s.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(INCLUDE_libintl) $(libkadm5srv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5srv_la-get_s.lo -MD -MP -MF $(DEPDIR)/libkadm5srv_la-get_s.Tpo -c -o libkadm5srv_la-get_s.lo `test -f 'get_s.c' || echo '$(srcdir)/'`get_s.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5srv_la-get_s.Tpo $(DEPDIR)/libkadm5srv_la-get_s.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='get_s.c' object='libkadm5srv_la-get_s.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff --git a/security/heimdal/files/patch-lib-krb5-Makefile.in b/security/heimdal/files/patch-lib-krb5-Makefile.in
index baae3317a4f5..bd94b9eee182 100644
--- a/security/heimdal/files/patch-lib-krb5-Makefile.in
+++ b/security/heimdal/files/patch-lib-krb5-Makefile.in
@@ -1,4 +1,4 @@
---- lib/krb5/Makefile.in.orig	2017-01-03 13:45:04 UTC
+--- lib/krb5/Makefile.in.orig	2017-01-03 19:44:17 UTC
 +++ lib/krb5/Makefile.in
 @@ -330,10 +330,12 @@ derived_key_test_DEPENDENCIES = libkrb5.
  	$(am__DEPENDENCIES_1)
diff --git a/security/heimdal/files/patch-lib-roken-Makefile.in b/security/heimdal/files/patch-lib-roken-Makefile.in
index 4b43e134c98c..e6f839eac50a 100644
--- a/security/heimdal/files/patch-lib-roken-Makefile.in
+++ b/security/heimdal/files/patch-lib-roken-Makefile.in
@@ -1,4 +1,4 @@
---- lib/roken/Makefile.in.orig	2017-01-03 13:45:03 UTC
+--- lib/roken/Makefile.in.orig	2017-01-03 19:44:15 UTC
 +++ lib/roken/Makefile.in
 @@ -194,8 +194,7 @@ am__uninstall_files_from_dir = { \
           $(am__cd) "$$dir" && rm -f $$files; }; \
diff --git a/security/heimdal/pkg-message b/security/heimdal/pkg-message
index b358931b2249..e66561acb92d 100644
--- a/security/heimdal/pkg-message
+++ b/security/heimdal/pkg-message
@@ -1,5 +1,5 @@
 ====
-heimdal-7.1.0 uses a new database format which is incompatible
+heimdal-7.1.0_1 uses a new database format which is incompatible
 with Heimdal in the base system and heimdal-1.5.3_6 or prior.
 
 Please read 20161112 in /usr/ports/UPDATING carefully to upgrade