1 files changed, 16 insertions, 54 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)