3 files changed, 16 insertions, 223 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 55258db58368..84da1e69eb4d 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -17,6 +17,7 @@ CONFLICTS=	krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* srp-[0-9]*
 
 OPTIONS_DEFINE=	IPV6 KCM BDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB X11
 OPTIONS_DEFAULT=	KCM BDB PKINIT DIGEST KX509
+OPTIONS_SUB=	yes
 KCM_DESC=	Enable Kerberos Credentials Manager
 BDB_DESC=	Enable BerkeleyDB KDC backend support
 SQLITE_DESC=	Enable SQLite KDC backend support
@@ -27,11 +28,20 @@ KX509_DESC=	Enable kx509 support
 CRACKLIB_DESC=	Use CrackLib for password quality checking
 X11_DESC=	Build X11 utilies
 
+IPV6_CONFIGURE_WITH=		ipv6
+KCM_CONFIGURE_ENABLE=		kcm
+X11_CONFIGURE_WITH=		x
+KX509_CONFIGURE_ENABLE=		kx509
+DIGEST_CONFIGURE_ENABLE=	digest
+PKINIT_CONFIGURE_ENABLE=	pk-init
+CRACKLIB_BUILD_DEPENDS=		${PREFIX}/lib/libcrack.a:${PORTSDIR}/security/cracklib
+
 USE_AUTOTOOLS=	autoconf autoheader libtool
 USE_OPENSSL=	yes
 USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_ARGS+=	--with-libintl=${LOCALBASE} \
 			--with-readline=${DESTDIR}/usr \
 			--enable-pthread-support \
@@ -48,32 +58,11 @@ PLIST=		${WRKDIR}/PLIST
 CFLAGS+=	-fPIC
 .endif
 
-.if ${OSVERSION} >= 700000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc__Makefile.in
-PLIST_SUB+=	HCRYPTO="@comment "
-.else
-PLIST_SUB+=	HCRYPTO=""
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--with-ipv6
-.else
-CONFIGURE_ARGS+=	--without-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MKCM}
-CONFIGURE_ARGS+=	--enable-kcm
-PLIST_SUB+=	KCM=""
-.else
-CONFIGURE_ARGS+=	--disable-kcm
-PLIST_SUB+=	KCM="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MBDB}
-USE_BDB=	yes
-CFLAGS+=	-I${BDB_INCLUDE_DIR}
-CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
-LDFLAGS+=	-L${BDB_LIB_DIR}
+USE_BDB=		yes
+CFLAGS+=		-I${BDB_INCLUDE_DIR}
+CPPFLAGS+=		-I${BDB_INCLUDE_DIR}
+LDFLAGS+=		-L${BDB_LIB_DIR}
 CONFIGURE_ARGS+=	--with-berkeley-db=${LOCALBASE} \
 			--with-berkeley-db-include=${BDB_INCLUDE_DIR}
 .else
@@ -81,12 +70,10 @@ CONFIGURE_ARGS+=	--with-berkeley-db=no
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
+USE_SQLITE=		yes
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
-PLIST_SUB+=	SQLITE="@comment "
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
-PLIST_SUB+=	SQLITE=""
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
@@ -103,33 +90,8 @@ _SOCK=		${LDAP_RUN_DIR:C|/|%2f|g}%2fldapi
 CONFIGURE_ARGS+=	--without-openldap
 .endif
 
-.if ! ${PORT_OPTIONS:MPKINIT}
-CONFIGURE_ARGS+=	--disable-pk-init
-.else
-CONFIGURE_ARGS+=	--enable-pk-init
-.endif
-
-.if ! ${PORT_OPTIONS:MDIGEST}
-CONFIGURE_ARGS+=	--disable-digest
-.else
-CONFIGURE_ARGS+=	--enable-digest
-.endif
-
-.if ! ${PORT_OPTIONS:MKX509}
-CONFIGURE_ARGS+=	--disable-kx509
-.else
-CONFIGURE_ARGS+=	--enable-kx509
-.endif
-
-.if ${PORT_OPTIONS:MCRACKLIB}
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
-.endif
-
 .if ${PORT_OPTIONS:MX11}
-USE_XORG=		x11 xt
-CONFIGURE_ARGS+=	--with-x
-.else
-CONFIGURE_ARGS+=	--without-x
+USE_XORG=	x11 xt
 .endif
 
 .if defined(HEIMDAL_HOME)
diff --git a/security/heimdal/files/extra-patch-doc__Makefile.in b/security/heimdal/files/patch-doc__Makefile.in
index 602ba8523413..602ba8523413 100644
--- a/security/heimdal/files/extra-patch-doc__Makefile.in
+++ b/security/heimdal/files/patch-doc__Makefile.in
diff --git a/security/heimdal/pkg-plist b/security/heimdal/pkg-plist
index da28cb2cf8df..07c407c858bd 100644
--- a/security/heimdal/pkg-plist
+++ b/security/heimdal/pkg-plist
@@ -41,29 +41,6 @@ include/gssapi/gssapi_ntlm.h
 include/gssapi/gssapi_krb5.h
 include/gssapi/gssapi_oid.h
 include/gssapi/gssapi_spnego.h
-%%HCRYPTO%%include/hcrypto/aes.h
-%%HCRYPTO%%include/hcrypto/bn.h
-%%HCRYPTO%%include/hcrypto/des.h
-%%HCRYPTO%%include/hcrypto/dh.h
-%%HCRYPTO%%include/hcrypto/dsa.h
-%%HCRYPTO%%include/hcrypto/ec.h
-%%HCRYPTO%%include/hcrypto/ecdh.h
-%%HCRYPTO%%include/hcrypto/ecdsa.h
-%%HCRYPTO%%include/hcrypto/engine.h
-%%HCRYPTO%%include/hcrypto/evp.h
-%%HCRYPTO%%include/hcrypto/evp-cc.h
-%%HCRYPTO%%include/hcrypto/evp-hcrypto.h
-%%HCRYPTO%%include/hcrypto/hmac.h
-%%HCRYPTO%%include/hcrypto/md2.h
-%%HCRYPTO%%include/hcrypto/md4.h
-%%HCRYPTO%%include/hcrypto/md5.h
-%%HCRYPTO%%include/hcrypto/pkcs12.h
-%%HCRYPTO%%include/hcrypto/rand.h
-%%HCRYPTO%%include/hcrypto/rc2.h
-%%HCRYPTO%%include/hcrypto/rc4.h
-%%HCRYPTO%%include/hcrypto/rsa.h
-%%HCRYPTO%%include/hcrypto/sha.h
-%%HCRYPTO%%include/hcrypto/ui.h
 include/hdb-protos.h
 include/hdb.h
 include/hdb_asn1.h
@@ -128,10 +105,6 @@ lib/libgssapi.a
 lib/libgssapi.la
 lib/libgssapi.so
 lib/libgssapi.so.3
-%%HCRYPTO%%lib/libhcrypto.a
-%%HCRYPTO%%lib/libhcrypto.la
-%%HCRYPTO%%lib/libhcrypto.so
-%%HCRYPTO%%lib/libhcrypto.so.5
 lib/libheimbase.a
 lib/libheimbase.la
 lib/libheimbase.so
@@ -237,148 +210,7 @@ man/man1/su.1.gz
 man/man1/telnet.1.gz
 man/man1/tenletxr.1.gz
 man/man1/xnlock.1.gz
-%%HCRYPTO%%man/man3/DES_cbc_cksum.3.gz
-%%HCRYPTO%%man/man3/DES_cbc_encrypt.3.gz
-%%HCRYPTO%%man/man3/DES_cfb64_encrypt.3.gz
-%%HCRYPTO%%man/man3/DES_check_key_parity.3.gz
-%%HCRYPTO%%man/man3/DES_ecb3_encrypt.3.gz
-%%HCRYPTO%%man/man3/DES_ecb_encrypt.3.gz
-%%HCRYPTO%%man/man3/DES_ede3_cbc_encrypt.3.gz
-%%HCRYPTO%%man/man3/DES_encrypt.3.gz
-%%HCRYPTO%%man/man3/DES_init_random_number_generator.3.gz
-%%HCRYPTO%%man/man3/DES_is_weak_key.3.gz
-%%HCRYPTO%%man/man3/DES_key_sched.3.gz
-%%HCRYPTO%%man/man3/DES_new_random_key.3.gz
-%%HCRYPTO%%man/man3/DES_pcbc_encrypt.3.gz
-%%HCRYPTO%%man/man3/DES_random_key.3.gz
-%%HCRYPTO%%man/man3/DES_set_key.3.gz
-%%HCRYPTO%%man/man3/DES_set_key_checked.3.gz
-%%HCRYPTO%%man/man3/DES_set_key_unchecked.3.gz
-%%HCRYPTO%%man/man3/DES_set_odd_parity.3.gz
-%%HCRYPTO%%man/man3/DES_string_to_key.3.gz
-%%HCRYPTO%%man/man3/DH_check_pubkey.3.gz
-%%HCRYPTO%%man/man3/DH_compute_key.3.gz
-%%HCRYPTO%%man/man3/DH_free.3.gz
-%%HCRYPTO%%man/man3/DH_generate_key.3.gz
-%%HCRYPTO%%man/man3/DH_generate_parameters_ex.3.gz
-%%HCRYPTO%%man/man3/DH_get_default_method.3.gz
-%%HCRYPTO%%man/man3/DH_get_ex_data.3.gz
-%%HCRYPTO%%man/man3/DH_ltm_method.3.gz
-%%HCRYPTO%%man/man3/DH_new.3.gz
-%%HCRYPTO%%man/man3/DH_new_method.3.gz
-%%HCRYPTO%%man/man3/DH_null_method.3.gz
-%%HCRYPTO%%man/man3/DH_set_default_method.3.gz
-%%HCRYPTO%%man/man3/DH_set_ex_data.3.gz
-%%HCRYPTO%%man/man3/DH_set_method.3.gz
-%%HCRYPTO%%man/man3/DH_size.3.gz
-%%HCRYPTO%%man/man3/DH_up_ref.3.gz
-%%HCRYPTO%%man/man3/EVP_BytesToKey.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_block_size.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_cipher.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_cleanup.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_ctrl.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_flags.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_get_app_data.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_init.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_iv_length.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_key_length.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_mode.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_rand_key.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_set_app_data.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_CTX_set_key_length.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_block_size.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_iv_length.3.gz
-%%HCRYPTO%%man/man3/EVP_CIPHER_key_length.3.gz
-%%HCRYPTO%%man/man3/EVP_CipherFinal_ex.3.gz
-%%HCRYPTO%%man/man3/EVP_CipherInit_ex.3.gz
-%%HCRYPTO%%man/man3/EVP_CipherUpdate.3.gz
-%%HCRYPTO%%man/man3/EVP_Digest.3.gz
-%%HCRYPTO%%man/man3/EVP_DigestFinal_ex.3.gz
-%%HCRYPTO%%man/man3/EVP_DigestInit_ex.3.gz
-%%HCRYPTO%%man/man3/EVP_DigestUpdate.3.gz
-%%HCRYPTO%%man/man3/EVP_MD_CTX_block_size.3.gz
-%%HCRYPTO%%man/man3/EVP_MD_CTX_cleanup.3.gz
-%%HCRYPTO%%man/man3/EVP_MD_CTX_create.3.gz
-%%HCRYPTO%%man/man3/EVP_MD_CTX_destroy.3.gz
-%%HCRYPTO%%man/man3/EVP_MD_CTX_init.3.gz
-%%HCRYPTO%%man/man3/EVP_MD_CTX_md.3.gz
-%%HCRYPTO%%man/man3/EVP_MD_CTX_size.3.gz
-%%HCRYPTO%%man/man3/EVP_MD_block_size.3.gz
-%%HCRYPTO%%man/man3/EVP_MD_size.3.gz
-%%HCRYPTO%%man/man3/EVP_aes_128_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_aes_128_cfb8.3.gz
-%%HCRYPTO%%man/man3/EVP_aes_192_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_aes_192_cfb8.3.gz
-%%HCRYPTO%%man/man3/EVP_aes_256_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_aes_256_cfb8.3.gz
-%%HCRYPTO%%man/man3/EVP_camellia_128_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_camellia_192_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_camellia_256_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_des_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_des_ede3_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_enc_null.3.gz
-%%HCRYPTO%%man/man3/EVP_get_cipherbyname.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_aes_128_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_aes_128_cfb8.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_aes_192_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_aes_192_cfb8.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_aes_256_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_aes_256_cfb8.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_camellia_128_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_camellia_192_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_camellia_256_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_des_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_des_ede3_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_md2.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_md4.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_md5.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_rc2_40_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_rc2_64_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_rc2_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_sha1.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_sha256.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_sha384.3.gz
-%%HCRYPTO%%man/man3/EVP_hcrypto_sha512.3.gz
-%%HCRYPTO%%man/man3/EVP_md2.3.gz
-%%HCRYPTO%%man/man3/EVP_md4.3.gz
-%%HCRYPTO%%man/man3/EVP_md5.3.gz
-%%HCRYPTO%%man/man3/EVP_md_null.3.gz
-%%HCRYPTO%%man/man3/EVP_rc2_40_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_rc2_64_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_rc2_cbc.3.gz
-%%HCRYPTO%%man/man3/EVP_rc4.3.gz
-%%HCRYPTO%%man/man3/EVP_rc4_40.3.gz
-%%HCRYPTO%%man/man3/EVP_sha.3.gz
-%%HCRYPTO%%man/man3/EVP_sha1.3.gz
-%%HCRYPTO%%man/man3/EVP_sha256.3.gz
-%%HCRYPTO%%man/man3/EVP_sha384.3.gz
-%%HCRYPTO%%man/man3/EVP_sha512.3.gz
-%%HCRYPTO%%man/man3/EVP_wincrypt_des_ede3_cbc.3.gz
 man/man3/HDB.3.gz
-%%HCRYPTO%%man/man3/OpenSSL_add_all_algorithms.3.gz
-%%HCRYPTO%%man/man3/OpenSSL_add_all_algorithms_conf.3.gz
-%%HCRYPTO%%man/man3/OpenSSL_add_all_algorithms_noconf.3.gz
-%%HCRYPTO%%man/man3/PKCS5_PBKDF2_HMAC_SHA1.3.gz
-%%HCRYPTO%%man/man3/RAND_add.3.gz
-%%HCRYPTO%%man/man3/RAND_bytes.3.gz
-%%HCRYPTO%%man/man3/RAND_cleanup.3.gz
-%%HCRYPTO%%man/man3/RAND_file_name.3.gz
-%%HCRYPTO%%man/man3/RAND_get_rand_method.3.gz
-%%HCRYPTO%%man/man3/RAND_load_file.3.gz
-%%HCRYPTO%%man/man3/RAND_pseudo_bytes.3.gz
-%%HCRYPTO%%man/man3/RAND_seed.3.gz
-%%HCRYPTO%%man/man3/RAND_set_rand_engine.3.gz
-%%HCRYPTO%%man/man3/RAND_set_rand_method.3.gz
-%%HCRYPTO%%man/man3/RAND_status.3.gz
-%%HCRYPTO%%man/man3/RAND_write_file.3.gz
-%%HCRYPTO%%man/man3/RSA_free.3.gz
-%%HCRYPTO%%man/man3/RSA_get_app_data.3.gz
-%%HCRYPTO%%man/man3/RSA_get_method.3.gz
-%%HCRYPTO%%man/man3/RSA_new.3.gz
-%%HCRYPTO%%man/man3/RSA_new_method.3.gz
-%%HCRYPTO%%man/man3/RSA_set_app_data.3.gz
-%%HCRYPTO%%man/man3/RSA_set_method.3.gz
-%%HCRYPTO%%man/man3/RSA_up_ref.3.gz
 man/man3/__gss_c_attr_stream_sizes_oid_desc.3.gz
 man/man3/arg_printusage.3.gz
 man/man3/challenge.3.gz
@@ -1382,7 +1214,6 @@ sbin/kstash
 sbin/ktutil
 @dirrm include/krb5
 @dirrm include/kadm5
-%%HCRYPTO%%@dirrm include/hcrypto
 @dirrm include/gssapi
 @dirrm include/roken
 @dirrm libexec/heimdal