- Convert to new USE_APACHE

- Add SHA256

7 files changed, 15 insertions, 14 deletions

diff --git a/www/mod_rpaf/Makefile b/www/mod_rpaf/Makefile
index 5f624744df9a..a69ac9ead1fb 100644
--- a/www/mod_rpaf/Makefile
+++ b/www/mod_rpaf/Makefile
@@ -13,12 +13,16 @@ MASTER_SITES=	http://stderr.net/apache/rpaf/download/
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Make proxied requests appear with client IP
 
+USE_APACHE?=	1.3+
 AP_FAST_BUILD=	YES
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
-AP2_SRC_FILE=	mod_rpaf-2.0.c
-AP2_PKGNAMESUFFIX=	-ap2
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
+
+.if ${APACHE_VERSION} >= 20
+AP${APACHE_VERSION}_SRC_FILE=	mod_rpaf-2.0.c
+AP${APACHE_VERSION}_PKGNAMESUFFIX=-ap${APACHE_VERSION}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/www/mod_rpaf/distinfo b/www/mod_rpaf/distinfo
index 8b06e2f6ed2d..98b8ea9d181f 100644
--- a/www/mod_rpaf/distinfo
+++ b/www/mod_rpaf/distinfo
@@ -1,2 +1,3 @@
 MD5 (mod_rpaf-0.5.tar.gz) = 471fb059d6223a394f319b7c8ab45c4d
+SHA256 (mod_rpaf-0.5.tar.gz) = 5b9257b69fccd11d573b34d3a4014086abc9f2558e819005f71e44b094f5b2a5
 SIZE (mod_rpaf-0.5.tar.gz) = 4482
diff --git a/www/mod_rpaf2/Makefile b/www/mod_rpaf2/Makefile
index a5f3499dd8b1..5a801dd48263 100644
--- a/www/mod_rpaf2/Makefile
+++ b/www/mod_rpaf2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-WANT_APACHE=	2
+USE_APACHE=	20+
 LATEST_LINK=	mod_rpaf2
 MASTERDIR=	${.CURDIR}/../mod_rpaf
 
diff --git a/www/mod_tidy/Makefile b/www/mod_tidy/Makefile
index 31dffb9063f5..5597e8b93b16 100644
--- a/www/mod_tidy/Makefile
+++ b/www/mod_tidy/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Validates the HTML output of your apache2 webserver
 LIB_DEPENDS=	tidy:${PORTSDIR}/www/tidy-lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-WANT_APACHE=	2
+USE_APACHE=	20
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 AP_INC+=	${LOCALBASE}/include/tidy
@@ -25,11 +25,8 @@ AP_LIB+=	${LOCALBASE}/lib -ltidy
 PLIST_FILES=	${DOCSDIR:S/${PREFIX}\///}/LICENSE
 PLIST_DIRS=	${DOCSDIR:S/${PREFIX}\///}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
-
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/../LICENSE ${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_tidy/distinfo b/www/mod_tidy/distinfo
index 7feefb67ba4d..c49ce12a43dc 100644
--- a/www/mod_tidy/distinfo
+++ b/www/mod_tidy/distinfo
@@ -1,2 +1,3 @@
 MD5 (apache2/mod_tidy-0.5.tar.gz) = d1c38516120da0f22b94caff21a1c831
+SHA256 (apache2/mod_tidy-0.5.tar.gz) = 84132638deec2ef74171b9e089bbc69d4db5ae7d9c1cc01ee8b11dcc2bc701ff
 SIZE (apache2/mod_tidy-0.5.tar.gz) = 292979
diff --git a/www/mod_vdbh/Makefile b/www/mod_vdbh/Makefile
index 6bb500bc7902..dacc8a6c25e1 100644
--- a/www/mod_vdbh/Makefile
+++ b/www/mod_vdbh/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	apache
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows mass virtual hosting using a MySQL backend with Apache 2.0.x
 
-WANT_APACHE=	2
+USE_APACHE=	20+
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 USE_MYSQL=	YES
@@ -25,9 +25,6 @@ AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 
 PORTDOCS=	AUTHORS README TODO
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
-
 post-install:
 .if !defined (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -36,4 +33,4 @@ post-install:
 .   endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_vdbh/distinfo b/www/mod_vdbh/distinfo
index aa77c1a1c833..47b87ba4c946 100644
--- a/www/mod_vdbh/distinfo
+++ b/www/mod_vdbh/distinfo
@@ -1,2 +1,3 @@
 MD5 (apache/mod_vdbh-1.0.3.tar.gz) = 3bd571f4d35f6b7b9f11b6eacab3947c
+SHA256 (apache/mod_vdbh-1.0.3.tar.gz) = ff034dc4a77d82085dad1b867af8d913034c476d7cc2bf3472e6ae38cef40225
 SIZE (apache/mod_vdbh-1.0.3.tar.gz) = 8053