- Move headers and libraries into PREFIX/{include,lib}/heimdal. This

  prevents build breakage when a port depends on heimdal in base and
  some other libraries in LOCALBASE/lib such as OpenSSL from ports
  at the same time.

- Always build libcom_err[*].

PR:	194475 [*]

5 files changed, 187 insertions, 181 deletions

diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
index e15ffc33c4f7..2914ee7e7928 100644
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk
@@ -74,9 +74,6 @@
 .if !defined(_INCLUDE_USES_GSSAPI_MK)
 _INCLUDE_USES_GSSAPI_MK=	yes
 
-GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
-GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
-
 _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:${PORTSDIR}/security/heimdal
 _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:${PORTSDIR}/security/krb5
 _HEADERS=	sys/types.h sys/stat.h stdint.h
@@ -89,31 +86,35 @@ _local:=	${_A}
 .if ${_local} == "base"
 HEIMDAL_HOME=	/usr
 GSSAPIBASEDIR=	${HEIMDAL_HOME}
+GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
+GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
 _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
-GSSAPICPPFLAGS=	-I${GSSAPIINCDIR}
+GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
 .elif ${_local} == "heimdal"
 HEIMDAL_HOME?=	${LOCALBASE}
 GSSAPIBASEDIR=	${HEIMDAL_HOME}
+GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib/heimdal
+GSSAPIINCDIR=	${GSSAPIBASEDIR}/include/heimdal
+_HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 .if !defined(_KRB_BOOTSTRAP)
 BUILD_DEPENDS+=	${_HEIMDAL_DEPENDS}
 RUN_DEPENDS+=	${_HEIMDAL_DEPENDS}
-_HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 .else
 PREFIX=		${HEIMDAL_HOME}
 .endif
-GSSAPICPPFLAGS=	-I${GSSAPIINCDIR}
+GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILIBS=	-lkrb5 -lgssapi
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
 _RPATH=		${GSSAPILIBDIR}
 .elif ${_local} == "mit"
 KRB5_HOME?=	${LOCALBASE}
 GSSAPIBASEDIR=	${KRB5_HOME}
+_HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 .if !defined(_KRB_BOOTSTRAP)
 BUILD_DEPENDS+=	${_MITKRB5_DEPENDS}
 RUN_DEPENDS+=	${_MITKRB5_DEPENDS}
-_HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 .else
 PREFIX=		${KRB5_HOME}
 .endif
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index ba4deac5cabb..b33d7635c5f1 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	heimdal
 PORTVERSION=	1.5.2
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.h5l.org/dist/src/ \
 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
@@ -25,10 +25,13 @@ USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-CONFIGURE_ENV=	ac_cv_header_fnmatch_h=yes
+CONFIGURE_ENV=	ac_cv_header_fnmatch_h=yes \
+		ac_cv_prog_COMPILE_ET=${WRKSRC}/lib/com_err/compile_et
 CONFIGURE_ARGS=	--with-libintl \
 		--with-libintl-include="${LOCALBASE}/include" \
 		--with-libintl-lib="${LOCALBASE}/lib" \
+		--libdir="${PREFIX}/lib/${PORTNAME}" \
+		--includedir="${PREFIX}/include/${PORTNAME}" \
 		--with-kcm \
 		--with-openssl \
 		--with-openssl-include="${OPENSSLINC}" \
@@ -81,7 +84,7 @@ KX509_DESC=		Enable kx509 support
 KX509_CONFIGURE_ENABLE=	kx509
 
 CRACKLIB_DESC=		Use CrackLib for password quality checking
-CRACKLIB_BUILD_DEPENDS=	${PREFIX}/lib/libcrack.a:${PORTSDIR}/security/cracklib
+CRACKLIB_BUILD_DEPENDS=	${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
 
 X11_DESC=		Build X11 utilies
 X11_USE=		XORG=x11,xt
@@ -89,16 +92,6 @@ X11_CONFIGURE_WITH=	x
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD
-.if ${OSVERSION} < 1000000
-PLIST_SUB+=	LIBCOM_ERR=""
-.else
-PLIST_SUB+=	LIBCOM_ERR="@comment "
-.endif
-.else
-PLIST_SUB+=	LIBCOM_ERR=""
-.endif
-
 .if ${PORT_OPTIONS:MLDAP}
 WANT_OPENLDAP_SASL?=	yes
 .endif
diff --git a/security/heimdal/files/kpasswdd-Makefile b/security/heimdal/files/kpasswdd-Makefile
index 426074e91ff8..189a47d91dae 100644
--- a/security/heimdal/files/kpasswdd-Makefile
+++ b/security/heimdal/files/kpasswdd-Makefile
@@ -11,7 +11,7 @@ kpasswdd-cracklib.so: kpasswdd-cracklib.c
 
 install-strip: install
 
-install: ${DESTDIR}${PREFIX}/lib/kpasswdd-cracklib.so
+install: ${DESTDIR}${PREFIX}/lib/heimdal/kpasswdd-cracklib.so
 
-${DESTDIR}${PREFIX}/lib/kpasswdd-cracklib.so: kpasswdd-cracklib.so
+${DESTDIR}${PREFIX}/lib/heimdal/kpasswdd-cracklib.so: kpasswdd-cracklib.so
 	${BSD_INSTALL_LIB} ${.ALLSRC} ${.TARGET}
diff --git a/security/heimdal/files/patch-configure b/security/heimdal/files/patch-configure
index e81b494103c6..795d6f9f1bea 100644
--- a/security/heimdal/files/patch-configure
+++ b/security/heimdal/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2014-08-30 19:16:38.000000000 +0900
-+++ configure	2014-08-30 19:18:12.000000000 +0900
+--- configure.orig	2014-10-20 14:24:44.000000000 +0900
++++ configure	2014-10-20 14:27:30.000000000 +0900
 @@ -9567,29 +9567,6 @@
        hardcode_shlibpath_var=no
        ;;
@@ -41,7 +41,15 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -10590,18 +10563,6 @@
+@@ -10572,7 +10545,6 @@
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
+@@ -10590,18 +10562,6 @@
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -60,7 +68,7 @@
    *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-@@ -14227,7 +14188,7 @@
+@@ -14227,7 +14187,7 @@
  	native_pthread_support="netbsd 3 uses explict pthread"
  		PTHREAD_LIBADD="-lpthread"
  	;;
@@ -69,3 +77,12 @@
  	native_pthread_support=yes
  	PTHREAD_LIBADD="-pthread"
  	;;
+@@ -28245,7 +28205,7 @@
+ 
+ krb_cv_compile_et="no"
+ krb_cv_com_err_need_r=""
+-krb_cv_compile_et_cross=no
++krb_cv_compile_et_cross=yes
+ if test "${COMPILE_ET}" = "compile_et"; then
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compile_et has the features we need" >&5
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index 6e39764a1e65..7ef779510507 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -28,156 +28,156 @@ bin/telnet
 %%X11%%bin/tenletxr
 bin/verify_krb5_conf
 %%X11%%bin/xnlock
-include/asn1-common.h
-include/asn1_err.h
-include/base64.h
-include/cms_asn1.h
-include/crmf_asn1.h
-include/der-private.h
-include/der-protos.h
-include/der.h
-include/digest_asn1.h
-include/getarg.h
-include/gssapi.h
-include/gssapi/gkrb5_err.h
-include/gssapi/gssapi.h
-include/gssapi/gssapi_krb5.h
-include/gssapi/gssapi_ntlm.h
-include/gssapi/gssapi_oid.h
-include/gssapi/gssapi_spnego.h
-include/hdb-protos.h
-include/hdb.h
-include/hdb_asn1.h
-include/hdb_err.h
-include/heim-ipc.h
-include/heim_asn1.h
-include/heim_err.h
-include/heimbase.h
-include/heimntlm-protos.h
-include/heimntlm.h
-include/hex.h
-include/hx509-protos.h
-include/hx509.h
-include/hx509_err.h
-include/k524_err.h
-include/kadm5/admin.h
-include/kadm5/kadm5-private.h
-include/kadm5/kadm5-protos.h
-include/kadm5/kadm5-pwcheck.h
-include/kadm5/kadm5_err.h
-include/kadm5/private.h
-include/kafs.h
-include/kdc-protos.h
-include/kdc.h
-include/krb5-private.h
-include/krb5-protos.h
-include/krb5-types.h
-include/krb5.h
-include/krb5/ccache_plugin.h
-include/krb5/locate_plugin.h
-include/krb5/send_to_kdc_plugin.h
-include/krb5/windc_plugin.h
-include/krb5_asn1.h
-include/krb5_ccapi.h
-include/krb5_err.h
-include/kx509_asn1.h
-include/ntlm_err.h
-include/ocsp_asn1.h
-include/otp.h
-include/parse_bytes.h
-include/parse_time.h
-include/parse_units.h
-include/pkcs10_asn1.h
-include/pkcs12_asn1.h
-include/pkcs8_asn1.h
-include/pkcs9_asn1.h
-include/pkinit_asn1.h
-include/resolve.h
-include/rfc2459_asn1.h
-include/roken-common.h
-include/roken.h
-include/rtbl.h
-include/sl.h
-include/wind.h
-include/wind_err.h
-include/xdbm.h
-%%CRACKLIB%%lib/kpasswdd-cracklib.so
-lib/libasn1.a
-lib/libasn1.so
-lib/libasn1.so.8
-lib/libasn1.so.8.0.0
-%%LIBCOM_ERR%%lib/libcom_err.a
-%%LIBCOM_ERR%%lib/libcom_err.so
-%%LIBCOM_ERR%%lib/libcom_err.so.1
-%%LIBCOM_ERR%%lib/libcom_err.so.1.1.3
-lib/libgssapi.a
-lib/libgssapi.so
-lib/libgssapi.so.3
-lib/libgssapi.so.3.0.0
-lib/libhdb.a
-lib/libhdb.so
-lib/libhdb.so.9
-lib/libhdb.so.9.2.0
-lib/libheimbase.a
-lib/libheimbase.so
-lib/libheimbase.so.1
-lib/libheimbase.so.1.0.0
-lib/libheimedit.a
-lib/libheimedit.so
-lib/libheimedit.so.0
-lib/libheimedit.so.0.0.36
-lib/libheimntlm.a
-lib/libheimntlm.so
-lib/libheimntlm.so.0
-lib/libheimntlm.so.0.1.0
-%%NO_SQLITE%%lib/libheimsqlite.a
-%%NO_SQLITE%%lib/libheimsqlite.so
-%%NO_SQLITE%%lib/libheimsqlite.so.0
-%%NO_SQLITE%%lib/libheimsqlite.so.0.0.0
-lib/libhx509.a
-lib/libhx509.so
-lib/libhx509.so.5
-lib/libhx509.so.5.0.0
-lib/libkadm5clnt.a
-lib/libkadm5clnt.so
-lib/libkadm5clnt.so.7
-lib/libkadm5clnt.so.7.0.1
-lib/libkadm5srv.a
-lib/libkadm5srv.so
-lib/libkadm5srv.so.8
-lib/libkadm5srv.so.8.0.1
-lib/libkafs.a
-lib/libkafs.so
-lib/libkafs.so.0
-lib/libkafs.so.0.5.1
-lib/libkdc.a
-lib/libkdc.so
-lib/libkdc.so.2
-lib/libkdc.so.2.0.0
-lib/libkrb5.a
-lib/libkrb5.so
-lib/libkrb5.so.26
-lib/libkrb5.so.26.0.0
-lib/libotp.a
-lib/libotp.so
-lib/libotp.so.0
-lib/libotp.so.0.1.5
-lib/libroken.a
-lib/libroken.so
-lib/libroken.so.18
-lib/libroken.so.18.1.0
-lib/libsl.a
-lib/libsl.so
-lib/libsl.so.0
-lib/libsl.so.0.2.1
-lib/libwind.a
-lib/libwind.so
-lib/libwind.so.0
-lib/libwind.so.0.0.0
-lib/windc.a
-lib/windc.so
-lib/windc.so.0
-lib/windc.so.0.0.0
+include/heimdal/asn1-common.h
+include/heimdal/asn1_err.h
+include/heimdal/base64.h
+include/heimdal/cms_asn1.h
+include/heimdal/crmf_asn1.h
+include/heimdal/der-private.h
+include/heimdal/der-protos.h
+include/heimdal/der.h
+include/heimdal/digest_asn1.h
+include/heimdal/getarg.h
+include/heimdal/gssapi.h
+include/heimdal/gssapi/gkrb5_err.h
+include/heimdal/gssapi/gssapi.h
+include/heimdal/gssapi/gssapi_krb5.h
+include/heimdal/gssapi/gssapi_ntlm.h
+include/heimdal/gssapi/gssapi_oid.h
+include/heimdal/gssapi/gssapi_spnego.h
+include/heimdal/hdb-protos.h
+include/heimdal/hdb.h
+include/heimdal/hdb_asn1.h
+include/heimdal/hdb_err.h
+include/heimdal/heim-ipc.h
+include/heimdal/heim_asn1.h
+include/heimdal/heim_err.h
+include/heimdal/heimbase.h
+include/heimdal/heimntlm-protos.h
+include/heimdal/heimntlm.h
+include/heimdal/hex.h
+include/heimdal/hx509-protos.h
+include/heimdal/hx509.h
+include/heimdal/hx509_err.h
+include/heimdal/k524_err.h
+include/heimdal/kadm5/admin.h
+include/heimdal/kadm5/kadm5-private.h
+include/heimdal/kadm5/kadm5-protos.h
+include/heimdal/kadm5/kadm5-pwcheck.h
+include/heimdal/kadm5/kadm5_err.h
+include/heimdal/kadm5/private.h
+include/heimdal/kafs.h
+include/heimdal/kdc-protos.h
+include/heimdal/kdc.h
+include/heimdal/krb5-private.h
+include/heimdal/krb5-protos.h
+include/heimdal/krb5-types.h
+include/heimdal/krb5.h
+include/heimdal/krb5/ccache_plugin.h
+include/heimdal/krb5/locate_plugin.h
+include/heimdal/krb5/send_to_kdc_plugin.h
+include/heimdal/krb5/windc_plugin.h
+include/heimdal/krb5_asn1.h
+include/heimdal/krb5_ccapi.h
+include/heimdal/krb5_err.h
+include/heimdal/kx509_asn1.h
+include/heimdal/ntlm_err.h
+include/heimdal/ocsp_asn1.h
+include/heimdal/otp.h
+include/heimdal/parse_bytes.h
+include/heimdal/parse_time.h
+include/heimdal/parse_units.h
+include/heimdal/pkcs10_asn1.h
+include/heimdal/pkcs12_asn1.h
+include/heimdal/pkcs8_asn1.h
+include/heimdal/pkcs9_asn1.h
+include/heimdal/pkinit_asn1.h
+include/heimdal/resolve.h
+include/heimdal/rfc2459_asn1.h
+include/heimdal/roken-common.h
+include/heimdal/roken.h
+include/heimdal/rtbl.h
+include/heimdal/sl.h
+include/heimdal/wind.h
+include/heimdal/wind_err.h
+include/heimdal/xdbm.h
+%%CRACKLIB%%lib/heimdal/kpasswdd-cracklib.so
+lib/heimdal/libasn1.a
+lib/heimdal/libasn1.so
+lib/heimdal/libasn1.so.8
+lib/heimdal/libasn1.so.8.0.0
+lib/heimdal/libcom_err.a
+lib/heimdal/libcom_err.so
+lib/heimdal/libcom_err.so.1
+lib/heimdal/libcom_err.so.1.1.3
+lib/heimdal/libgssapi.a
+lib/heimdal/libgssapi.so
+lib/heimdal/libgssapi.so.3
+lib/heimdal/libgssapi.so.3.0.0
+lib/heimdal/libhdb.a
+lib/heimdal/libhdb.so
+lib/heimdal/libhdb.so.9
+lib/heimdal/libhdb.so.9.2.0
+lib/heimdal/libheimbase.a
+lib/heimdal/libheimbase.so
+lib/heimdal/libheimbase.so.1
+lib/heimdal/libheimbase.so.1.0.0
+lib/heimdal/libheimedit.a
+lib/heimdal/libheimedit.so
+lib/heimdal/libheimedit.so.0
+lib/heimdal/libheimedit.so.0.0.36
+lib/heimdal/libheimntlm.a
+lib/heimdal/libheimntlm.so
+lib/heimdal/libheimntlm.so.0
+lib/heimdal/libheimntlm.so.0.1.0
+%%NO_SQLITE%%lib/heimdal/libheimsqlite.a
+%%NO_SQLITE%%lib/heimdal/libheimsqlite.so
+%%NO_SQLITE%%lib/heimdal/libheimsqlite.so.0
+%%NO_SQLITE%%lib/heimdal/libheimsqlite.so.0.0.0
+lib/heimdal/libhx509.a
+lib/heimdal/libhx509.so
+lib/heimdal/libhx509.so.5
+lib/heimdal/libhx509.so.5.0.0
+lib/heimdal/libkadm5clnt.a
+lib/heimdal/libkadm5clnt.so
+lib/heimdal/libkadm5clnt.so.7
+lib/heimdal/libkadm5clnt.so.7.0.1
+lib/heimdal/libkadm5srv.a
+lib/heimdal/libkadm5srv.so
+lib/heimdal/libkadm5srv.so.8
+lib/heimdal/libkadm5srv.so.8.0.1
+lib/heimdal/libkafs.a
+lib/heimdal/libkafs.so
+lib/heimdal/libkafs.so.0
+lib/heimdal/libkafs.so.0.5.1
+lib/heimdal/libkdc.a
+lib/heimdal/libkdc.so
+lib/heimdal/libkdc.so.2
+lib/heimdal/libkdc.so.2.0.0
+lib/heimdal/libkrb5.a
+lib/heimdal/libkrb5.so
+lib/heimdal/libkrb5.so.26
+lib/heimdal/libkrb5.so.26.0.0
+lib/heimdal/libotp.a
+lib/heimdal/libotp.so
+lib/heimdal/libotp.so.0
+lib/heimdal/libotp.so.0.1.5
+lib/heimdal/libroken.a
+lib/heimdal/libroken.so
+lib/heimdal/libroken.so.18
+lib/heimdal/libroken.so.18.1.0
+lib/heimdal/libsl.a
+lib/heimdal/libsl.so
+lib/heimdal/libsl.so.0
+lib/heimdal/libsl.so.0.2.1
+lib/heimdal/libwind.a
+lib/heimdal/libwind.so
+lib/heimdal/libwind.so.0
+lib/heimdal/libwind.so.0.0.0
+lib/heimdal/windc.a
+lib/heimdal/windc.so
+lib/heimdal/windc.so.0
+lib/heimdal/windc.so.0.0.0
 libdata/pkgconfig/heimdal-gssapi.pc
 libexec/digest-service
 libexec/ftpd
@@ -1226,8 +1226,3 @@ sbin/iprop-log
 sbin/kadmin
 sbin/kstash
 sbin/ktutil
-@dirrm libexec/heimdal
-@dirrm include/roken
-@dirrm include/krb5
-@dirrm include/kadm5
-@dirrm include/gssapi