- Cleanup apxs -> APXS usage

- Clean up PLIST_SUB vars
- Use %%AP*%% in pkg-plist

www/mod_auth_kerb/Makefile

@@ -17,29 +17,12 @@ MASTER_SITE_SUBDIR=modauthkerb
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	An Apache module for authenticating users with Kerberos v5
 
-#
-# This module allows users to send their Kerberos password in
-# plain text; it should only be used over an encrypted connection
-# (i.e., HTTP over SSL/TLS).  Thus, we require as a dependency
-# a version of Apache which can do this.
-#
 USE_APACHE=	1.3
 USE_GMAKE=	yes
-# Don't fsck with CFLAGS
-CFLAGS:=
 GNU_CONFIGURE=	yes
 
 PORTSCOUT=	limit:^5.3
 
-.include <bsd.port.pre.mk>
-
-.if exists(${PREFIX}/sbin/apxs)
-APACHE_MODULE_DIR!=${PREFIX}/sbin/apxs -q LIBEXECDIR
-.else
-APACHE_MODULE_DIR=libexec/apache
-.endif
-PLIST_SUB+=	APMODDIR=${APACHE_MODULE_DIR:S/^${PREFIX}\///}
-
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 CONFIGURE_ARGS+=	--with-krb5=${KRB5_HOME} --without-krb4
 .elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
@@ -51,4 +34,4 @@ LIB_DEPENDS+=	krb5:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE} --without-krb4
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

www/mod_auth_kerb/pkg-plist

@@ -1,3 +1,3 @@
-%%APMODDIR%%/mod_auth_kerb.so
+%%APACHEMODDIR%%/mod_auth_kerb.so
 @exec %D/sbin/apxs -e -A -n auth_kerb %D/%F
 @unexec %D/sbin/apxs -e -A -n auth_kerb %D/%F