- add stage support

- add license
- minor cleanups

with hat apache@

25 files changed, 68 insertions, 163 deletions

diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index c088fb89fc3e..7806419611f7 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -6,6 +6,7 @@ PORTVERSION=	1.10
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.heuer.org/mod_auth_mysql/old/
+PKGNAMESUFFIX=	2
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	apache2
@@ -15,8 +16,6 @@ COMMENT=	MySQL-based authentication module with VirtualHost support
 
 LICENSE=	AL2
 
-LATEST_LINK=	mod_auth_mysql2
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_MYSQL=	yes
 USE_APACHE=	22+
@@ -30,15 +29,10 @@ USE_OPENSSL=	yes
 AP_EXTRAS+=	-DMYSQL_USE_SSL
 .endif
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	INSTALL example_data.html htpasswd.sql
-.endif
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile
index 329306c596b0..5122c39d4c23 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -11,6 +11,7 @@ PKGNAMESUFFIX=	_another
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use MySQL databases for user authentication
 
+#LICENSE=	AL10
 
 USE_MYSQL=	yes
 USE_APACHE=	22
@@ -23,23 +24,14 @@ AP_LIB=	${LOCALBASE}/lib/mysql
 AP_EXTRAS=	-lmysqlclient -lz -lm
 AP_EXTRAS+=	-DAPACHE2
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+PORTDOCS=	CONFIGURE CHANGES
 
 post-patch:
 	${REINPLACE_CMD} -e "s|APR_XtOffsetOf|APR_OFFSETOF|g" \
 		-e "s|APR_XtOffset|APR_OFFSET|g" ${WRKSRC}/mod_auth_mysql.c
 
-.if !defined(NOPORTDOCS)
-post-build:
-	@${ECHO} "%%PORTDOCS%%%%DOCSDIR%%/CONFIGURE" >> ${PLIST}
-	@${ECHO} "%%PORTDOCS%%%%DOCSDIR%%/CHANGES" >> ${PLIST}
-	@${ECHO} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST}
-
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/CONFIGURE ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_authnz_external/Makefile b/www/mod_authnz_external/Makefile
index ff04af0a120c..eb3ef743e554 100644
--- a/www/mod_authnz_external/Makefile
+++ b/www/mod_authnz_external/Makefile
@@ -11,7 +11,6 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	Allows users authentication based on external mechanisms on apache 2.2
 
-
 USE_APACHE=	22
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
@@ -21,13 +20,8 @@ PROJECTHOST=	mod-auth-external
 PORTDOCS=	AUTHENTICATORS INSTALL README	\
 		CHANGES UPGRADE INSTALL.HARDCODE
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.   for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.   endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/mod_domaintree/Makefile b/www/mod_domaintree/Makefile
index a0a8ede600a2..de2c0de894b5 100644
--- a/www/mod_domaintree/Makefile
+++ b/www/mod_domaintree/Makefile
@@ -11,7 +11,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	danger@FreeBSD.org
 COMMENT=	Hostname to filesystem mapper for Apache 2
 
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
@@ -19,13 +18,8 @@ AP_GENPLIST=	yes
 
 PORTDOCS=	LICENSE.txt ChangeLog
 
-PLIST_FILES=	share/doc/mod_domaintree/LICENSE.txt \
-		share/doc/mod_domaintree/ChangeLog
-PLIST_DIRS=	share/doc/mod_domaintree
-
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/mod_evasive/Makefile b/www/mod_evasive/Makefile
index af70d80168d3..635b0e3e7e17 100644
--- a/www/mod_evasive/Makefile
+++ b/www/mod_evasive/Makefile
@@ -10,33 +10,26 @@ DISTNAME=	mod_evasive_${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	kiwi@oav.net
-COMMENT=	An Apache module to try to protect the HTTP Server from DoS/DDoS attacks
+COMMENT=	Apache module to try to protect the HTTP Server from DoS/DDoS attacks
 
+LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_APACHE=	22
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
-
-PORTDOCS=	LICENSE README test.pl
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 MODULENAME=	${PORTNAME}20
 
+PORTDOCS=	README test.pl
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
 		${WRKSRC}/mod_evasive.c ${WRKSRC}/mod_evasive20.c \
 		${WRKSRC}/mod_evasiveNSAPI.c
 
 post-install:
-.if !defined (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.   for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.   endfor
-.endif
-
-.include <bsd.port.post.mk>
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/www/mod_fileiri/Makefile b/www/mod_fileiri/Makefile
index 0efff78414d6..1afe5040ccac 100644
--- a/www/mod_fileiri/Makefile
+++ b/www/mod_fileiri/Makefile
@@ -10,13 +10,12 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	apache@FreeBSD.org
-COMMENT=	A http IRIs module for Apache 2
+COMMENT=	Apache 2.x http IRIs module
 
+#LICENSE=	AL11
 
 USE_APACHE=	22+
-
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mod_flickr/Makefile b/www/mod_flickr/Makefile
index 7056a598eafd..2ed06a4e7303 100644
--- a/www/mod_flickr/Makefile
+++ b/www/mod_flickr/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	http://www.vshank.com/modcode/
 MAINTAINER=	venkyshankar@yahoo.com
 COMMENT=	Apache module for Flickr API access
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 XTRA_FLAGS=	-lcurl
 
@@ -29,7 +28,6 @@ USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e '/<curl\/types.h>/d' ${WRKSRC}/mod_flickr.c
 
diff --git a/www/mod_geoip2/Makefile b/www/mod_geoip2/Makefile
index d409285a4e60..f7dde6bed307 100644
--- a/www/mod_geoip2/Makefile
+++ b/www/mod_geoip2/Makefile
@@ -8,16 +8,13 @@ MASTER_SITES=	http://geolite.maxmind.com/download/geoip/api/mod_geoip2/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	jau@iki.fi
-COMMENT=	An Apache module that provides the country code of the client's IP
+COMMENT=	Apache module that provides the country code of the client IP
 
 LICENSE=	AL2
 
 BUILD_DEPENDS=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
 RUN_DEPENDS=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
 
-
-CONFLICTS=	mod_geoip-[0-9]*
-
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
 USE_APACHE=	22
@@ -30,12 +27,8 @@ AP_LIB+=	${LOCALBASE}/lib -lGeoIP
 SUB_FILES+=	pkg-message
 PORTDOCS=	Changes INSTALL README README.php
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/mod_gzip2/Makefile b/www/mod_gzip2/Makefile
index c70f852e5fbb..1413d30d9f2d 100644
--- a/www/mod_gzip2/Makefile
+++ b/www/mod_gzip2/Makefile
@@ -9,8 +9,9 @@ MASTER_SITES=	http://www.gknw.net/development/apache/httpd-2.0/unix/modules/
 DISTNAME=	mod_gzip-${PORTVERSION}
 
 MAINTAINER=	sec@42.org
-COMMENT=	An Internet Content Acceleration module for Apache2+
+COMMENT=	Apache 2.x Internet Content Acceleration module
 
+#LICENSE=	AL11
 
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
@@ -18,24 +19,16 @@ AP_GENPLIST=	yes
 MAKE_ENV+=	"APXS=${APXS}"
 USE_GMAKE=	yes
 
-.if !defined(NOPORTDOCS)
-PLIST_FILES=	${DOCSDIR:S/${PREFIX}\///}/commands.txt
-PLIST_FILES+=	${DOCSDIR:S/${PREFIX}\///}/samples.txt
-PLIST_DIRS=	${DOCSDIR:S/${PREFIX}\///}
-.endif
-PLIST_FILES+=	share/examples/mod_gzip2/mod_gzip2.conf.sample
-PLIST_DIRS+=	share/examples/mod_gzip2
+PORTDOCS=	commands.txt samples.txt
+PORTEXAMPLES=	mod_gzip2.conf.sample
 
-NO_STAGE=	yes
 post-patch:
 	@${MV} ${WRKSRC}/mod_gzip.c ${WRKSRC}/${PORTNAME}.c
 
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/my_cfg.txt ${EXAMPLESDIR}/mod_gzip2.conf.sample
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/commands.txt ${WRKSRC}/samples.txt ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/my_cfg.txt ${STAGEDIR}${EXAMPLESDIR}/mod_gzip2.conf.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile
index 3b191c83028b..d5e73d89bd93 100644
--- a/www/mod_hosts_access/Makefile
+++ b/www/mod_hosts_access/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES=	LOCAL/pgollucci
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module that makes Apache respect hosts.allow and hosts.deny
 
+LICENSE=	AL2
 
 USE_APACHE=	22
 AP_FAST_BUILD=	yes
@@ -17,5 +18,4 @@ AP_GENPLIST=	yes
 
 AP_LIB+=	${LOCALBASE}/lib -lwrap
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mod_limitipconn2/Makefile b/www/mod_limitipconn2/Makefile
index 3543487d1cc9..f9e50881f6a6 100644
--- a/www/mod_limitipconn2/Makefile
+++ b/www/mod_limitipconn2/Makefile
@@ -7,13 +7,13 @@ PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://dominia.org/djao/limit/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	2
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Allows you to limit the number of simultaneous connexions
 
-
-LATEST_LINK=	mod_limitipconn2
+LICENSE=	AL2
 
 USE_APACHE=	22
 USE_BZIP2=	yes
@@ -25,13 +25,8 @@ PLIST_FILES+=	${APACHEMODDIR}/${PORTNAME}.so
 
 PORTDOCS=	ChangeLog INSTALL README
 
-NO_STAGE=	yes
 post-install:
-.if !defined (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/
-.   for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
-.   endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/www/mod_log_firstbyte/Makefile b/www/mod_log_firstbyte/Makefile
index 274792e854db..7149a56ba2e6 100644
--- a/www/mod_log_firstbyte/Makefile
+++ b/www/mod_log_firstbyte/Makefile
@@ -13,7 +13,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Log the time between request and the first byte of the response served
 
-
 USE_APACHE=	22+
 
 PROJECTHOST=	mod-log-firstbyte
@@ -22,12 +21,8 @@ PKGMESSAGE=	${WRKSRC}/readme.txt
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
-NO_STAGE=	yes
 do-extract:
 	${MKDIR} ${WRKSRC}
-	cd ${DISTDIR}/${DIST_SUBDIR} && ${CP} ${DISTFILES} ${WRKSRC}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${CP} ${DISTFILES:S|^|${DISTDIR}/${DIST_SUBDIR}/|} ${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/www/mod_macro22/Makefile b/www/mod_macro22/Makefile
index 1a8d2b4cc02c..cd0f197df34c 100644
--- a/www/mod_macro22/Makefile
+++ b/www/mod_macro22/Makefile
@@ -14,6 +14,9 @@ LICENSE_NAME=	mod_macro license (apache with postcard request)
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 USE_APACHE=	22
 LATEST_LINK=	mod_macro22
@@ -23,15 +26,8 @@ PORTDOCS=	${PORTNAME}.html
 
 PORTSCOUT=	limit:^1\.1\.
 
-OPTIONS_DEFINE=	DOCS
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}/
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/mod_memcache/Makefile b/www/mod_memcache/Makefile
index e6fef9193569..d9cdb0756cfa 100644
--- a/www/mod_memcache/Makefile
+++ b/www/mod_memcache/Makefile
@@ -11,7 +11,6 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Apache 2.2.x module to manage apr_memcache connections
 
-
 GNU_CONFIGURE=	yes
 PROJECTHOST=	modmemcache
 USE_APACHE=	22+
@@ -20,5 +19,4 @@ AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	src/${PORTNAME}.c
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mod_memcache_block/Makefile b/www/mod_memcache_block/Makefile
index 774d8ed9a876..6842eeac837b 100644
--- a/www/mod_memcache_block/Makefile
+++ b/www/mod_memcache_block/Makefile
@@ -9,9 +9,9 @@ DISTNAME=	mod_memcache_block-${GITVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	gaod@hychen.org
-COMMENT=	An Apache 2 module to block ip from lists stored in memcache
+COMMENT=	Apache 2.2 module to block IPs from lists stored in memcache
 
-LIB_DEPENDS+=	memcached:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS+=	libmemcached.so:${PORTSDIR}/databases/libmemcached
 
 FETCH_ARGS=	-Fpr
 GITVERSION=	7b1fcec
@@ -24,5 +24,4 @@ AP_GENPLIST=	yes
 AP_INC=		${LOCALBASE}/include/libmemcached
 AP_LIB=		${LOCALBASE}/lib -lmemcached
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mod_proxy_xml/Makefile b/www/mod_proxy_xml/Makefile
index 4078c08e5fc9..c7b2d259b8c5 100644
--- a/www/mod_proxy_xml/Makefile
+++ b/www/mod_proxy_xml/Makefile
@@ -12,9 +12,6 @@ DISTFILES=	xmlns.h mod_proxy_xml.c
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for rewriting URI references in XML
 
-
-WRKSRC=	${WRKDIR}
-
 USE_GNOME=	libxml2
 USE_APACHE=	22+
 
@@ -23,11 +20,10 @@ AP_GENPLIST=	yes
 AP_INC=	${LOCALBASE}/include/libxml2
 AP_LIB=	${LOCALBASE}/lib -lxml2
 
-NO_STAGE=	yes
 pre-extract:
-	@${MKDIR} ${WRKDIR}
+	@${MKDIR} ${WRKSRC}
 
 do-extract:
-	@${CP} ${DISTDIR}/xmlns.h ${DISTDIR}/mod_proxy_xml.c ${WRKDIR}/
+	@${CP} ${DISTDIR}/xmlns.h ${DISTDIR}/mod_proxy_xml.c ${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/www/mod_qos/Makefile b/www/mod_qos/Makefile
index b39c9fb8899e..a8ca261b8f2e 100644
--- a/www/mod_qos/Makefile
+++ b/www/mod_qos/Makefile
@@ -11,6 +11,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	andrea@cervesato.it
 COMMENT=	Qos for Apache
 
+LICENSE=	GPLv2
 
 USE_APACHE=	22+
 AP_GENPLIST=	yes
@@ -18,5 +19,4 @@ AP_FAST_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/apache2
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mod_remoteip/Makefile b/www/mod_remoteip/Makefile
index 0f5f942d5850..0735b250a5b2 100644
--- a/www/mod_remoteip/Makefile
+++ b/www/mod_remoteip/Makefile
@@ -10,12 +10,10 @@ DISTNAME=	httpd-2.3.5-alpha
 MAINTAINER=	ports@christianserving.org
 COMMENT=	Replaces the client IP address/hostname with that given by a proxy
 
-
 USE_APACHE=	22
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
 SRC_FILE=	modules/metadata/${PORTNAME}.c
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mod_reproxy/Makefile b/www/mod_reproxy/Makefile
index 8d182291132f..56318d7403b6 100644
--- a/www/mod_reproxy/Makefile
+++ b/www/mod_reproxy/Makefile
@@ -9,10 +9,12 @@ MASTER_SITE_SUBDIR=	kuriyama
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Apache module to support x-reproxy-url header
 
+LICENSE=	AL2
+
 WRKSRC=		${WRKDIR}/lestrrat-mod_reproxy-0f945ff
+
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile
index 32100b3467ba..3e20bd2a558f 100644
--- a/www/mod_scgi/Makefile
+++ b/www/mod_scgi/Makefile
@@ -9,21 +9,13 @@ MASTER_SITES=	http://dryice.name/computer/FreeBSD/distfiles/
 DISTNAME=	scgi-${PORTVERSION:S/.a/a/}
 
 MAINTAINER=	dryice@dryice.name
-COMMENT=	Apache module that implements the client side of the SCGI protocol
-
+COMMENT=	Apache 2.2 module that implements the client side of the SCGI protocol
 
 SCGI_DIR=	apache2
 WRKSRC=		${WRKDIR}/${DISTNAME}/${SCGI_DIR}
 
 USE_APACHE=	22
-
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_setenvifplus/Makefile b/www/mod_setenvifplus/Makefile
index 0fedd488ad9b..c96617a45dd9 100644
--- a/www/mod_setenvifplus/Makefile
+++ b/www/mod_setenvifplus/Makefile
@@ -19,5 +19,4 @@ AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	${WRKSRC}/apache2/${MODULENAME}.c
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mod_uid/Makefile b/www/mod_uid/Makefile
index a56b6779f7fc..67af50d78daf 100644
--- a/www/mod_uid/Makefile
+++ b/www/mod_uid/Makefile
@@ -7,31 +7,17 @@ CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.lexa.ru/pub/apache-rus/contrib/
 
 MAINTAINER=	leeym@FreeBSD.org
-COMMENT=	A module issuing the "correct" cookies for counting the site visitors
-
+COMMENT=	Apache module issuing the "correct" cookies for counting the site visitors
 
 USE_APACHE=	22
-
-PORTDOCS=	README.html
-
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${APACHE_VERSION} == 13
-MODULENAME=	mod_uid
-.else
 MODULENAME=	mod_uid2
-.endif
+
+PORTDOCS=	README.html
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_umask/Makefile b/www/mod_umask/Makefile
index 30614305fcf2..ce1276a41671 100644
--- a/www/mod_umask/Makefile
+++ b/www/mod_umask/Makefile
@@ -11,6 +11,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	gebhart@secnetix.de
 COMMENT=	Apache 2.x module to set umask of created files
 
+LICENSE=	AL2
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -20,5 +21,4 @@ AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 SRC_FILE=	src/${PORTNAME}.c
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/mod_xml2enc/Makefile b/www/mod_xml2enc/Makefile
index 74b5cc346fd9..b55f966fcb12 100644
--- a/www/mod_xml2enc/Makefile
+++ b/www/mod_xml2enc/Makefile
@@ -11,6 +11,7 @@ DIST_SUBDIR=	mod_proxy_html
 MAINTAINER=	dnaeon@gmail.com
 COMMENT=	Apache module for converting encoding before and/or after a filter run
 
+LICENSE=	GPLv2
 
 # included in apache24
 # http://httpd.apache.org/docs/2.4/mod/mod_xml2enc.html
@@ -25,12 +26,10 @@ AP_INC+=	${LOCALBASE}/include/libxml2 -I${WRKSRC}
 AP_LIB+=	${LOCALBASE}/lib
 AP_EXTRAS+=	-lxml2
 
-PLIST_FILES=	%%DOCSDIR%%/COPYING
-PLIST_DIRS=	%%DOCSDIR%%
+PORTDOCS=	COPYING
 
-NO_STAGE=	yes
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/mod_xsendfile/Makefile b/www/mod_xsendfile/Makefile
index 9d6bbb340637..2f71ebbb59ad 100644
--- a/www/mod_xsendfile/Makefile
+++ b/www/mod_xsendfile/Makefile
@@ -9,12 +9,12 @@ MASTER_SITES=	https://tn123.org/mod_xsendfile/ \
 		http://cloud.github.com/downloads/potatosalad/mod_xsendfile/
 
 MAINTAINER=	potatosaladx@gmail.com
-COMMENT=	An Apache2 module that processes X-SENDFILE headers
+COMMENT=	Apache2 module that processes X-SENDFILE headers
 
+LICENSE=	AL2
 
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
 AP_GENPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>