security/heimdal-devel: Fix configure and package

Remove libmicrohttpd support. If installed it will automatically detect
and build the necessary binaries to support a microhttpd KDC server.
It is felt that a KDC with httpd support is another vector of concern.

Fixes:		4e44a84

security/heimdal-devel/Makefile

@@ -18,14 +18,15 @@ GH_TAGNAME=	${HASH}
 
 CONFLICTS=	krb5 krb5-*
 
-USES=		cpe gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \
-		pkgconfig python:build readline makeinfo ssl
+USES=		autoreconf:build cpe gettext-runtime gssapi:bootstrap,heimdal \
+		libtool pathfix pkgconfig python:build readline makeinfo ssl
 CPE_VENDOR=	${PORTNAME}_project
 USE_LDCONFIG=	${GSSAPILIBDIR}
 
 # Needs clang-format which is only provided by the port.
 # Else asm1_fails resulting in a command not found error.
-BUILD_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
+BUILD_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
+		p5-JSON>0:converters/p5-JSON
 
 LIB_DEPENDS=	liblockfile.so:devel/liblockfile
 
@@ -53,7 +54,8 @@ CONFIGURE_ARGS=	--with-berkeley-db \
 		--with-hdbdir="/var/${PORTNAME}" \
 		--sysconfdir="${PREFIX}/etc" \
 		CLANG_FORMAT="${LOCALBASE}/bin/clang-format${LLVM_DEFAULT}" \
-		--enable-kx509
+		--enable-kx509 \
+		--without-microhttpd
 # XXX --with-readline picks up libreadline even if found in /usr/lib.
 MAKE_ENV=	INSTALL_CATPAGES=no
 INSTALL_TARGET=	install-strip

security/heimdal-devel/pkg-plist

@@ -253,15 +253,6 @@ lib/heimdal/negotiate_token_validator.a
 lib/heimdal/negotiate_token_validator.so
 lib/heimdal/negotiate_token_validator.so.0
 lib/heimdal/negotiate_token_validator.so.0.0.0
-lib/heimdal/pkgconfig/heimdal-gssapi.pc
-lib/heimdal/pkgconfig/heimdal-kadm-client.pc
-lib/heimdal/pkgconfig/heimdal-kadm-server.pc
-lib/heimdal/pkgconfig/heimdal-krb5.pc
-lib/heimdal/pkgconfig/kadm-client.pc
-lib/heimdal/pkgconfig/kadm-server.pc
-lib/heimdal/pkgconfig/kafs.pc
-lib/heimdal/pkgconfig/krb5-gssapi.pc
-lib/heimdal/pkgconfig/krb5.pc
 lib/heimdal/simple_csr_authorizer.a
 lib/heimdal/simple_csr_authorizer.so
 lib/heimdal/simple_csr_authorizer.so.0
@@ -270,12 +261,19 @@ lib/heimdal/test_negoex_mech.a
 lib/heimdal/test_negoex_mech.so
 lib/heimdal/test_negoex_mech.so.0
 lib/heimdal/test_negoex_mech.so.0.0.0
-libexec/bx509d
+libdata/pkgconfig/heimdal-gssapi.pc
+libdata/pkgconfig/heimdal-kadm-client.pc
+libdata/pkgconfig/heimdal-kadm-server.pc
+libdata/pkgconfig/heimdal-krb5.pc
+libdata/pkgconfig/kadm-client.pc
+libdata/pkgconfig/kadm-server.pc
+libdata/pkgconfig/kafs.pc
+libdata/pkgconfig/krb5-gssapi.pc
+libdata/pkgconfig/krb5.pc
 libexec/digest-service
 libexec/heimdal/slc
 libexec/hprop
 libexec/hpropd
-libexec/httpkadmind
 libexec/ipropd-master
 libexec/ipropd-slave
 libexec/kadmind