17 files changed, 27 insertions, 39 deletions

diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index 72b9cbffc49e..e1e66904e1aa 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -294,7 +294,7 @@ AP_BUILDEXT=	la
 PLIST_SUB+=	APACHEMODDIR="libexec/apache2" \
 			APACHEINCLUDEDIR="include/apache2"
 APACHE_PORT=	www/apache${APACHE_VERSION}
-.elif ${APACHE_VERSION} >= "21"
+.elif ${APACHE_VERSION} >= 21
 AP_BUILDEXT=	la
 PLIST_SUB+=	APACHEMODDIR="libexec/apache${APACHE_VERSION}" \
 			APACHEINCLUDEDIR="include/apache${APACHE_VERSION}"
diff --git a/www/mod_access_identd/Makefile b/www/mod_access_identd/Makefile
index fb26bf1cc1cf..ca489f719fe9 100644
--- a/www/mod_access_identd/Makefile
+++ b/www/mod_access_identd/Makefile
@@ -14,10 +14,8 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module to supply access control based on ident reply
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-WANT_APACHE=	13
+USE_APACHE=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_access_identd/distinfo b/www/mod_access_identd/distinfo
index 82f0e97b50fe..602811687120 100644
--- a/www/mod_access_identd/distinfo
+++ b/www/mod_access_identd/distinfo
@@ -1,2 +1,3 @@
 MD5 (mod_access_identd-1.2.0.tar.gz) = 67a5a1b9d5862eeaf2ba812f6dca98d9
+SHA256 (mod_access_identd-1.2.0.tar.gz) = b9d0471c71e846659b46f9d7d8d1d3273bb3373ca936bc38d08e89c849afa72a
 SIZE (mod_access_identd-1.2.0.tar.gz) = 10500
diff --git a/www/mod_access_referer/Makefile b/www/mod_access_referer/Makefile
index cf9d3a7e9bca..8e00f6062669 100644
--- a/www/mod_access_referer/Makefile
+++ b/www/mod_access_referer/Makefile
@@ -21,14 +21,11 @@ PATCH_DIST_STRIP=	-l
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Provides access control based on Referer HTTP header for Apache
 
-WANT_APACHE=	13
+USE_APACHE=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 PORTDOCS=		HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -38,4 +35,4 @@ post-install:
 .endif
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_access_referer/distinfo b/www/mod_access_referer/distinfo
index c929e17a67d5..30fb13fcc1ef 100644
--- a/www/mod_access_referer/distinfo
+++ b/www/mod_access_referer/distinfo
@@ -1,4 +1,6 @@
 MD5 (apache/mod_access_referer-1.0.2.tar.gz) = f1726cfe5965eda1bdca90b8db475377
+SHA256 (apache/mod_access_referer-1.0.2.tar.gz) = 83876c4fc182052672dad9ae3c38f6be2bdcaab5d56bb56570a5f94645b86be4
 SIZE (apache/mod_access_referer-1.0.2.tar.gz) = 9745
 MD5 (apache/mod_access_referer_1.0.2_third_part_patch.txt) = 4a1e4c0c9f39bf522f36b60178256072
+SHA256 (apache/mod_access_referer_1.0.2_third_part_patch.txt) = bb6bf88fec976c5dd86f588a7d9a92d4ed2a67ff6ca4670979d10e18d118d6ae
 SIZE (apache/mod_access_referer_1.0.2_third_part_patch.txt) = 1122
diff --git a/www/mod_accesscookie/Makefile b/www/mod_accesscookie/Makefile
index f14f6a08f81b..535dc37c1538 100644
--- a/www/mod_accesscookie/Makefile
+++ b/www/mod_accesscookie/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Supply access control based cookies stored in a MySQL database
 
 USE_MYSQL=	YES
-WANT_APACHE=	13
+USE_APACHE=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_INC+=	${LOCALBASE}/include/mysql
@@ -23,8 +23,6 @@ AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 
 PORTDOCS=	README
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -32,4 +30,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_accesscookie/distinfo b/www/mod_accesscookie/distinfo
index 3461a91b871d..64d087c0d11c 100644
--- a/www/mod_accesscookie/distinfo
+++ b/www/mod_accesscookie/distinfo
@@ -1,2 +1,3 @@
 MD5 (mod_accessCookie-0.4.tgz) = 638d06ed61a7bda08a69c5c86343302e
+SHA256 (mod_accessCookie-0.4.tgz) = 019588b46f4918884b34fe1e44ec6fb876be22517787ce15d52e7984ce1cb8e1
 SIZE (mod_accessCookie-0.4.tgz) = 7638
diff --git a/www/mod_auth_cookie_mysql/Makefile b/www/mod_auth_cookie_mysql/Makefile
index 379cf923b09b..ba90edb12d22 100644
--- a/www/mod_auth_cookie_mysql/Makefile
+++ b/www/mod_auth_cookie_mysql/Makefile
@@ -16,17 +16,16 @@ MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows authentication against a MySQL database via a secure cookie
 
 USE_MYSQL=	YES
+
 # If someone can test it with MySQL 4.1 ;-)
 BROKEN_WITH_MYSQL=	41
 
-WANT_APACHE=	13
+USE_APACHE=	13
 
 AP_FAST_BUILD=	YES
 AP_INC?=	${LOCALBASE}/include/mysql
 AP_LIB?=	${LOCALBASE}/lib/mysql -lmysqlclient -lz
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@(cd ${WRKSRC} && ${APXS} -A -i ${PORTNAME}.so)
 .if !defined(NOPORTDOCS)
@@ -37,4 +36,4 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/putcookie.cgi ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_auth_cookie_mysql/distinfo b/www/mod_auth_cookie_mysql/distinfo
index bbf20dbde96e..650a329d8156 100644
--- a/www/mod_auth_cookie_mysql/distinfo
+++ b/www/mod_auth_cookie_mysql/distinfo
@@ -1,2 +1,3 @@
 MD5 (apache/mod_auth_cookie_mysql-1.0.tar.gz) = 84ab8b4a0e19bfc3af808b11a399b050
+SHA256 (apache/mod_auth_cookie_mysql-1.0.tar.gz) = 716e19d801f6872b5f58010e4b17550302f2382f0c876ab69473ef7de7a9d9e1
 SIZE (apache/mod_auth_cookie_mysql-1.0.tar.gz) = 14688
diff --git a/www/mod_auth_imap/Makefile b/www/mod_auth_imap/Makefile
index 4d829c8065b8..83d0d4c0afb9 100644
--- a/www/mod_auth_imap/Makefile
+++ b/www/mod_auth_imap/Makefile
@@ -14,19 +14,16 @@ DIST_SUBDIR=	apache
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	An Apache module to provide authentication via an IMAP mail server
 
-WANT_APACHE=	13
+USE_APACHE=	13
 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:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/examples && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_auth_imap/distinfo b/www/mod_auth_imap/distinfo
index 8318cda40f81..fd372346aa16 100644
--- a/www/mod_auth_imap/distinfo
+++ b/www/mod_auth_imap/distinfo
@@ -1,2 +1,3 @@
 MD5 (apache/mod_auth_imap-1.1.tar.gz) = 43adcd9d754786306107b4425116663e
+SHA256 (apache/mod_auth_imap-1.1.tar.gz) = acccf10c4b5ff4aeac24351a9231e6e13f73436bcc6f77f4433c977d20062522
 SIZE (apache/mod_auth_imap-1.1.tar.gz) = 12532
diff --git a/www/mod_auth_useragent/Makefile b/www/mod_auth_useragent/Makefile
index c939fc3f1939..cc8b0b1138f4 100644
--- a/www/mod_auth_useragent/Makefile
+++ b/www/mod_auth_useragent/Makefile
@@ -14,13 +14,12 @@ MASTER_SITES=	http://download.tangent.org/ \
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows you to forbid clients based on their User-Agent
 
-WANT_APACHE=	13
+USE_APACHE=	13
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 PORTDOCS=	README faq.html
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
@@ -28,4 +27,4 @@ PORTDOCS=	README faq.html
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_auth_useragent/distinfo b/www/mod_auth_useragent/distinfo
index 94f2dff93ae9..b9d62d5ec50d 100644
--- a/www/mod_auth_useragent/distinfo
+++ b/www/mod_auth_useragent/distinfo
@@ -1,2 +1,3 @@
 MD5 (mod_auth_useragent-1.0.tar.gz) = 1eec76c001085d1d1c21aae72ce40034
+SHA256 (mod_auth_useragent-1.0.tar.gz) = a023e0d1949a1e1cc1e98be49a53c343ccf9ec75c0b8854587af9da63be218c7
 SIZE (mod_auth_useragent-1.0.tar.gz) = 5243
diff --git a/www/mod_curb/Makefile b/www/mod_curb/Makefile
index 3dd83b19c7ff..37dc98653a4a 100644
--- a/www/mod_curb/Makefile
+++ b/www/mod_curb/Makefile
@@ -15,17 +15,14 @@ DIST_SUBDIR=	apache
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	A per-server bandwidth limiter module for Apache 1.3
 
-WANT_APACHE=	13
+USE_APACHE=	13
 
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 PORTDOCS=	README
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
-
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_curb/distinfo b/www/mod_curb/distinfo
index fc1f2b3d0549..e69de29bb2d1 100644
--- a/www/mod_curb/distinfo
+++ b/www/mod_curb/distinfo
@@ -1,2 +0,0 @@
-MD5 (apache/mod-curb-1.1.tar.gz) = 89db4cebe55f7301fc8404e409203315
-SIZE (apache/mod-curb-1.1.tar.gz) = 5104
diff --git a/www/mod_macro/Makefile b/www/mod_macro/Makefile
index 6cf88a0d57e3..6df85de27158 100644
--- a/www/mod_macro/Makefile
+++ b/www/mod_macro/Makefile
@@ -14,18 +14,15 @@ MASTER_SITES=	http://www.cri.ensmp.fr/~coelho/mod_macro/
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for use macros in config files
 
-WANT_APACHE=	13
+USE_APACHE=	13
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 PORTDOCS=	${PORTNAME}.html
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_macro/distinfo b/www/mod_macro/distinfo
index 191422a9029c..c7f2c103d7d9 100644
--- a/www/mod_macro/distinfo
+++ b/www/mod_macro/distinfo
@@ -1,2 +1,3 @@
 MD5 (mod_macro-1.1.2.tar.gz) = d9761cbaa5e14c064bed29cd0dab918a
+SHA256 (mod_macro-1.1.2.tar.gz) = 437f433eaf95a4ef7211df03deb61bbaaa689949ea773b15ad8085845581474e
 SIZE (mod_macro-1.1.2.tar.gz) = 13349