- Convert to new USE_APACHE

- Add SHA256

8 files changed, 12 insertions, 16 deletions

diff --git a/www/mod_auth_external2/Makefile b/www/mod_auth_external2/Makefile
index 3ac40ed7396..f4466792f00 100644
--- a/www/mod_auth_external2/Makefile
+++ b/www/mod_auth_external2/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users authentication based on external mechanisms
 
-WANT_APACHE=	2
+USE_APACHE=	20+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 LATEST_LINK=	mod_auth_external2
@@ -21,8 +21,6 @@ SHORTMODNAME=	external_auth
 
 PORTDOCS=	AUTHENTICATORS INSTALL README
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -31,4 +29,4 @@ post-install:
 .   endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_auth_external2/distinfo b/www/mod_auth_external2/distinfo
index bdf9f41d2dd..8663a1ff0ff 100644
--- a/www/mod_auth_external2/distinfo
+++ b/www/mod_auth_external2/distinfo
@@ -1,2 +1,3 @@
 MD5 (apache2/mod_auth_external-2.2.10.tar.gz) = 48956bd1cdc54eac3dd603d030a38f48
+SHA256 (apache2/mod_auth_external-2.2.10.tar.gz) = 5114cc67c5bc4fe3a922aabc30a82a7fbea8f6a7b25a2752c53d28e9be13f0d1
 SIZE (apache2/mod_auth_external-2.2.10.tar.gz) = 51917
diff --git a/www/mod_auth_imap2/Makefile b/www/mod_auth_imap2/Makefile
index 24beee8d95f..9cbde573d37 100644
--- a/www/mod_auth_imap2/Makefile
+++ b/www/mod_auth_imap2/Makefile
@@ -16,14 +16,12 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	An Apache 2 module to provide authentication via an IMAP mail server
 
 WRKSRC=		${WRKDIR}/${PORTNAME}2-${PORTVERSION}
-WANT_APACHE=	2
+USE_APACHE=	20
 LATEST_LINK=	mod_auth_imap2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 PORTDOCS=	htaccess-example httpd.conf-append-example
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 .if !defined(NOPORTDOCS)
 post-install:
@@ -31,4 +29,4 @@ post-install:
 	@cd ${WRKSRC}/examples && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_auth_imap2/distinfo b/www/mod_auth_imap2/distinfo
index f071660cda1..2c01ef46821 100644
--- a/www/mod_auth_imap2/distinfo
+++ b/www/mod_auth_imap2/distinfo
@@ -1,2 +1,3 @@
 MD5 (apache2/mod_auth_imap-2.0.2.tar.gz) = e49a8c061a659c19bca3a53098fbe792
+SHA256 (apache2/mod_auth_imap-2.0.2.tar.gz) = 8bdbf043d46bcb9ee57eb77825b5202e80cbaa865c640db663ab2143ace71dfc
 SIZE (apache2/mod_auth_imap-2.0.2.tar.gz) = 12699
diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index fae0df18b7a..6440420d3d2 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -20,7 +20,7 @@ LATEST_LINK=	mod_auth_mysql2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_MYSQL=	YES
-WANT_APACHE=	2
+USE_APACHE=	20
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_INC+=	${LOCALBASE}/include/mysql
@@ -28,10 +28,8 @@ AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 
 PORTDOCS=	INSTALL example_data.html htpasswd.sql
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_auth_mysql2/distinfo b/www/mod_auth_mysql2/distinfo
index 485803d1445..1a3ac33a7eb 100644
--- a/www/mod_auth_mysql2/distinfo
+++ b/www/mod_auth_mysql2/distinfo
@@ -1,2 +1,3 @@
 MD5 (apache2/mod_auth_mysql_1.5.tgz) = d52b83b22ec49bf915e19cbf6720bf7b
+SHA256 (apache2/mod_auth_mysql_1.5.tgz) = a6e6d453d0f3e4a093e0ca7d22da467e2d34b63b8647e191324939d9f7bd3bdd
 SIZE (apache2/mod_auth_mysql_1.5.tgz) = 14844
diff --git a/www/mod_bw/Makefile b/www/mod_bw/Makefile
index 228593b69e5..fdf61557ffe 100644
--- a/www/mod_bw/Makefile
+++ b/www/mod_bw/Makefile
@@ -16,18 +16,16 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Bandwidth and Connection control per Virtual Host or Directory
 
-WANT_APACHE=	2
+USE_APACHE=	20+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 SRC_FILE=	bw_mod-0.6.c
 PORTDOCS=	APACHE2-LICENSE LICENSE bw_mod-0.6.txt
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_bw/distinfo b/www/mod_bw/distinfo
index eb34626134a..ba91d5fa9bb 100644
--- a/www/mod_bw/distinfo
+++ b/www/mod_bw/distinfo
@@ -1,2 +1,3 @@
 MD5 (apache2/bw_mod-0.6.tgz) = 0c92fa6344f487321291a592dbb49856
+SHA256 (apache2/bw_mod-0.6.tgz) = 7b99f80cfc1ad2ec895ef7acb1bc2bbea53153057106790e79a2459ec77bab8c
 SIZE (apache2/bw_mod-0.6.tgz) = 50298