14 files changed, 14 insertions, 81 deletions

diff --git a/ftp/proma/Makefile b/ftp/proma/Makefile
index a76178bfd3b7..bb32934d8309 100644
--- a/ftp/proma/Makefile
+++ b/ftp/proma/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    proma
-# Date created:         25.08.2003
-# Whom:                 HSIN-HSIUNG CHANG <sexbear@tmu.edu.tw>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	proma
 PORTVERSION=	0.8.3
@@ -35,7 +30,7 @@ SUB_FILES=	pkg-message
 RUN_DEPENDS+=	${LOCALBASE}/libexec/proftpd/mod_sql_mysql.so:${PORTSDIR}/databases/proftpd-mod_sql_mysql
 .endif
 .if defined(WITH_APACHE)
-USE_APACHE=	22
+USE_APACHE_RUN=	22
 .endif
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
diff --git a/games/hlstatsx/Makefile b/games/hlstatsx/Makefile
index 934cfda69ef9..a5bd1b83f1f2 100644
--- a/games/hlstatsx/Makefile
+++ b/games/hlstatsx/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:   hlstatsx
-# Date created:        2006-06-12
-# Whom:                Babak Farrokhi <babak@farrokhi.net>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	hlstatsx
 DISTVERSION=	1.20RC2
@@ -16,7 +11,7 @@ MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Real-time player and clan rankings and statistics for HL2 and mods
 
 NO_BUILD=	yes
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 USE_PHP=	gd mysql
 USE_PERL5_RUN=	yes
 USE_ZIP=	yes
diff --git a/net-mgmt/ocsinventory-ng/Makefile b/net-mgmt/ocsinventory-ng/Makefile
index a2e49bab4e2a..56c17471a4db 100644
--- a/net-mgmt/ocsinventory-ng/Makefile
+++ b/net-mgmt/ocsinventory-ng/Makefile
@@ -1,7 +1,3 @@
-# New ports collection makefile for:   	ocsinventory-ng
-# Date created:                         28 Sep 2007
-# Whom:                                	araujo
-#
 # $FreeBSD$
 
 PORTNAME=	ocsinventory-ng
@@ -24,7 +20,7 @@ RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
 		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
 		p5-XML-Entities>=0:${PORTSDIR}/textproc/p5-XML-Entities
 
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 USE_MYSQL=	41+
 USE_PERL5=	5.8.0+
 WANT_PHP_WEB=	yes
diff --git a/net-p2p/rtgui/Makefile b/net-p2p/rtgui/Makefile
index ad20ae1c509e..c585fe7b0aa9 100644
--- a/net-p2p/rtgui/Makefile
+++ b/net-p2p/rtgui/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	rtgui
-# Date created:				14 December 2008
-# Whom:					Philippe Audeoud <jadawin@tuxaco.net>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	rtgui
 PORTVERSION=	0.2.7
@@ -23,7 +18,7 @@ BUILD_DEPENDS+=	xmlrpc-c-config:${PORTSDIR}/net/xmlrpc-c
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_APACHE)
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_scgi.so:${PORTSDIR}/www/mod_scgi
 .elif defined(WITH_LIGHTTPD)
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile
index 72d72fcf0a29..77c63a73b526 100644
--- a/net/prosearch/Makefile
+++ b/net/prosearch/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: prosearch
-# Date created:		20 May 2006
-# Whom:			Oleg Alexeenkov <proler@gmail.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	prosearch
 PORTVERSION=	0.19.2
@@ -69,7 +64,7 @@ RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
 .endif
 
 .if defined(WITH_APACHE)
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 .endif
 
 .if defined(WITH_NGINX)
diff --git a/www/dojo/Makefile b/www/dojo/Makefile
index 534fe4ffde10..b184ccce5a82 100644
--- a/www/dojo/Makefile
+++ b/www/dojo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	dojo
-# Date created:		2008-01-29
-# Whom:			Greg Larkin <glarkin@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=		dojo
 PORTVERSION=		1.5.0
@@ -22,7 +17,7 @@ OPTIONS=		APACHE  "Configure for Apache-2.x" off
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_APACHE)
-USE_APACHE=		22+
+USE_APACHE_RUN=		22+
 CONFDIR=		${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=		${APACHEETCDIR}/Includes
 PLIST_SUB+=		NOAPACHE="" CONFDIR=${CONFDIR_REL}
diff --git a/www/dotproject/Makefile b/www/dotproject/Makefile
index ca2563f7c76b..df4d34962dde 100644
--- a/www/dotproject/Makefile
+++ b/www/dotproject/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	dotproject
-# Date created:				12 April 2005
-# Whom:					Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
 # $FreeBSD$
-#
 
 PORTNAME=	dotproject
 PORTVERSION=	2.1.5
@@ -18,7 +13,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 USE_PHP=	gd mysql session zlib
 WANT_PHP_WEB=	yes
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 
 SUB_FILES=	pkg-message
 
diff --git a/www/foswiki/Makefile b/www/foswiki/Makefile
index 328c5ca7e687..971d60d3b3cb 100644
--- a/www/foswiki/Makefile
+++ b/www/foswiki/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	foswiki
-# Date created:		2009-04-13
-# Whom:			Greg Larkin <glarkin@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	foswiki
 PORTVERSION=	1.1.5
@@ -50,7 +45,7 @@ RUN_DEPENDS+=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
 .endif
 
 .if defined(WITH_APACHE)
-USE_APACHE?=	22+
+USE_APACHE_RUN?=22+
 PLIST_SUB+=	NOAPACHE=""
 PKGMESSAGE=	pkg-message-apache
 SUB_FILES+=	pkg-message-apache
diff --git a/www/rt38/Makefile b/www/rt38/Makefile
index 960facffce4a..9d4c33b4dd62 100644
--- a/www/rt38/Makefile
+++ b/www/rt38/Makefile
@@ -1,7 +1,3 @@
-# New ports collection makefile for:	rt38
-# Date created:							26 December 2008
-# Whom:									Philip M. Gollucci <pgollucci@p6m7g8.com>
-#
 # $FreeBSD$
 
 # TODO:
@@ -63,7 +59,7 @@ RUN_DEPENDS+=	${STANDALONE_DEPS}
 .endif
 
 .if !empty(PORT_OPTIONS:MAPACHE) || !empty(PORT_OPTIONS:MFASTCGI) || !empty(PORT_OPTIONS:MMODPERL)
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 .endif
 
 .if ${PORT_OPTIONS:MFASTCGI}
diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index f6cb37679547..bdf531eb3fe1 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -1,7 +1,3 @@
-# New ports collection makefile for:	rt38
-# Date created:							26 December 2008
-# Whom:									Philip M. Gollucci <pgollucci@p6m7g8.com>
-#
 # $FreeBSD$
 
 PORTNAME=	rt
@@ -85,7 +81,7 @@ RUN_DEPENDS+=	${MODPERL2_DEPS}
 .endif
 
 .if ${PORT_OPTIONS:MAP_MODFASTCGI}
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \
 		${FASTCGI_DEPS}
diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile
index 7f33e7b210bf..90f1a8969911 100644
--- a/www/thundercache/Makefile
+++ b/www/thundercache/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	thundercache
-# Date created:		2010-03-15
-# Whom:			Patrick Tracanelli <eksffa@freebsdbrasil.com.br>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	thundercache
 PORTVERSION=	6.1
@@ -51,7 +46,7 @@ DISTNAME=	thundercache-6.1.201104260900-32bits-fbsd
 WRKSRC=		${WRKDIR}/thunder
 
 .if defined (WITH_APACHE)
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 .endif
 
 .if defined (WITH_PGSQL)
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index 4fd02925e011..4eaf2d80d001 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	thundersnarf
-# Date created:		2010-05-20
-# Whom:			Patrick Tracanelli <eksffa@freebsdbrasil.com.br>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	thundersnarf
 PORTVERSION=	1.3
@@ -28,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME:R}
 .include <bsd.port.pre.mk>
 
 .if defined (WITH_APACHE)
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 .endif
 
 .if defined (WITH_PGSQL)
diff --git a/www/webcalendar-devel/Makefile b/www/webcalendar-devel/Makefile
index bc91695ec40b..aa46e0df9d14 100644
--- a/www/webcalendar-devel/Makefile
+++ b/www/webcalendar-devel/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	WebCalendar
-# Date created:				08 Jan 2008
-# Whom:					glarkin
-#
 # $FreeBSD$
-#
 
 PORTNAME=	WebCalendar
 PORTVERSION=	1.2.5
@@ -48,7 +43,7 @@ OPTIONS=	APACHE "Configure for Apache-2.x" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_APACHE)
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 
 PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
diff --git a/www/yahoo-ui/Makefile b/www/yahoo-ui/Makefile
index 0fa446e90283..21c71634301b 100644
--- a/www/yahoo-ui/Makefile
+++ b/www/yahoo-ui/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	yahoo-ui
-# Date created:		2008-01-29
-# Whom:			Greg Larkin <glarkin@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	yahoo
 PORTVERSION=	2.8.2
@@ -33,7 +28,7 @@ NOPORTEXAMPLES=	yes
 .endif
 
 .if defined(WITH_APACHE)
-USE_APACHE=	22+
+USE_APACHE_RUN=	22+
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
 PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}