svn commit: r430529 - in head/security/heimdal: . files

[Hiroki Sato]

Author: hrs
Date: Wed Jan  4 02:09:18 2017
New Revision: 430529
URL: https://svnweb.freebsd.org/changeset/ports/430529

Log:
  - Fix krb5-config --libs to provide a list of libraries including
    dependency.  This broke ports which depend on this utility.
  
  - Add LMDB option to support database/lmdb.

Added:
  head/security/heimdal/files/patch-tools-krb5-config.in   (contents, props changed)
Modified:
  head/security/heimdal/Makefile
  head/security/heimdal/files/patch-configure

Modified: head/security/heimdal/Makefile
==============================================================================
--- head/security/heimdal/Makefile	Wed Jan  4 02:00:23 2017	(r430528)
+++ head/security/heimdal/Makefile	Wed Jan  4 02:09:18 2017	(r430529)
@@ -3,7 +3,7 @@
 
 PORTNAME=	heimdal
 PORTVERSION=	7.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.h5l.org/dist/src/ \
 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
@@ -55,7 +55,7 @@ INFO=		heimdal hx509
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	IPV6 BDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB
+OPTIONS_DEFINE=	IPV6 BDB LMDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB
 OPTIONS_DEFAULT=     BDB             PKINIT DIGEST KX509
 OPTIONS_SUB=	yes
 
@@ -71,6 +71,10 @@ BDB_CONFIGURE_ENV_OFF=	ac_cv_header_db_h
 			ac_cv_func_db_create=no
 BDB_CONFIGURE_OFF=	--enable-ndbm-db
 
+LMDB_DESC=		Enable LMDB KDC backend support
+LMDB_CONFIGURE_ENABLE=	mdb_db
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+
 SQLITE_DESC=		Enable SQLite KDC backend support
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite3-include="${LOCALBASE}/include" \

Modified: head/security/heimdal/files/patch-configure
==============================================================================
--- head/security/heimdal/files/patch-configure	Wed Jan  4 02:00:23 2017	(r430528)
+++ head/security/heimdal/files/patch-configure	Wed Jan  4 02:09:18 2017	(r430529)
@@ -18,15 +18,6 @@
  	;;
  *-*-openbsd*)
  	native_pthread_support=yes
-@@ -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

Added: head/security/heimdal/files/patch-tools-krb5-config.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/heimdal/files/patch-tools-krb5-config.in	Wed Jan  4 02:09:18 2017	(r430529)
@@ -0,0 +1,10 @@
+--- tools/krb5-config.in.orig	2017-01-04 10:37:40.213263000 +0900
++++ tools/krb5-config.in	2017-01-04 10:37:56.622658000 +0900
+@@ -82,6 +82,7 @@
+     ;;
+   --libs)
+     do_libs=yes
++    do_lib_deps=yes
+     ;;
+   --deps)
+     do_lib_deps=yes