aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Hauer <ohauer@FreeBSD.org>2012-09-22 21:15:50 +0000
committerOlli Hauer <ohauer@FreeBSD.org>2012-09-22 21:15:50 +0000
commitb7fc7ba65576d5ce387563c60b88276ba1418bc8 (patch)
tree884d351fee646b4e7b1b5c851bf898976e69b28e
parent221e0a651fd2a964309073001ac7cc62e1b96ea0 (diff)
downloadports-b7fc7ba65576d5ce387563c60b88276ba1418bc8.tar.gz
ports-b7fc7ba65576d5ce387563c60b88276ba1418bc8.zip
- USE_APACHE= s/22+/22/
- adopt new Makefile header Port build fails on local exp-run with apache24 with error: 'conn_rec' has no member named 'remote_ip' or various other apache22 specific functions/parameters with hat apache@
Notes
Notes: svn path=/head/; revision=304723
-rw-r--r--www/cas/Makefile76
-rw-r--r--www/gnome-user-share/Makefile9
-rw-r--r--www/mod_antiloris/Makefile8
-rw-r--r--www/mod_auth_cookie_mysql2/Makefile7
-rw-r--r--www/mod_auth_external2/Makefile7
-rw-r--r--www/mod_auth_form/Makefile8
-rw-r--r--www/mod_auth_kerb2/Makefile11
-rw-r--r--www/mod_auth_mellon/Makefile8
-rw-r--r--www/mod_auth_mysql_another/Makefile7
-rw-r--r--www/mod_auth_openid/Makefile8
-rw-r--r--www/mod_auth_pgsql2/Makefile7
-rw-r--r--www/mod_auth_tkt/Makefile8
-rw-r--r--www/mod_auth_xradius/Makefile7
-rw-r--r--www/mod_authn_otp/Makefile7
-rw-r--r--www/mod_authz_unixgroup/Makefile8
-rw-r--r--www/mod_bw/Makefile8
-rw-r--r--www/mod_cband/Makefile8
-rw-r--r--www/mod_cplusplus/Makefile8
-rw-r--r--www/mod_evasive/Makefile8
-rw-r--r--www/mod_extract_forwarded/Makefile8
-rw-r--r--www/mod_fastcgi/Makefile8
-rw-r--r--www/mod_ftp/Makefile8
-rw-r--r--www/mod_geoip2/Makefile8
-rw-r--r--www/mod_gnutls/Makefile8
-rw-r--r--www/mod_hosts_access/Makefile8
-rw-r--r--www/mod_jk-apache2/Makefile8
-rw-r--r--www/mod_limitipconn2/Makefile8
-rw-r--r--www/mod_lisp2/Makefile8
-rw-r--r--www/mod_log_config-st/Makefile8
-rw-r--r--www/mod_log_dbd/Makefile7
-rw-r--r--www/mod_log_sql2-dtc/Makefile7
-rw-r--r--www/mod_log_sql2/Makefile7
-rw-r--r--www/mod_memcache_block/Makefile8
-rw-r--r--www/mod_mono/Makefile9
-rw-r--r--www/mod_musicindex/Makefile8
-rw-r--r--www/mod_ntlm2/Makefile8
-rw-r--r--www/mod_perl2/Makefile11
-rw-r--r--www/mod_python3/Makefile8
-rw-r--r--www/mod_remoteip/Makefile8
-rw-r--r--www/mod_rpaf2/Makefile8
-rw-r--r--www/mod_ruby/Makefile8
-rw-r--r--www/mod_scgi/Makefile8
-rw-r--r--www/mod_security21/Makefile8
-rw-r--r--www/mod_wsgi/Makefile8
-rw-r--r--www/suphp/Makefile8
45 files changed, 139 insertions, 288 deletions
diff --git a/www/cas/Makefile b/www/cas/Makefile
index 80e909270ab7..33185bdb9ee2 100644
--- a/www/cas/Makefile
+++ b/www/cas/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: cas
-# Date created: 24 Nov 2011
-# Whom: Alexander Lunkov <lunkov@gmail.com>
-#
+# Created by: Alexander Lunkov <lunkov@gmail.com>
# $FreeBSD$
-#
PORTNAME= cas
PORTVERSION= 3.5.5
@@ -22,29 +18,51 @@ USE_LDCONFIG= yes
USE_ICONV= yes
WITHOUT_NLS= yes
-OPTIONS= DEBUG_MODE "Enable debug output" off \
- ENABLE_OPTIMIZATION "Enable optimization" on \
- BUILD_APACHE2X_MODULE "Build Apache 2.x module" on \
- BUILD_CURL_XMLRPC_CLIENT "Build cURL-based XMLRPC client" on \
- INSTALL_EXAMPLE_MODULES "Install example modules" off \
- INSTALL_CAS_LIBRARY "Install CAS library (libcas)" on \
- INSTALL_CAS_MODULES "Install CAS modules" on \
- INSTALL_CAS_HEADERS "Install CAS headers" on \
- INSTALL_CAS_CONFIGS "Install CAS configuration files" on \
- INSTALL_CAS_BINARIES "Install CAS binaries" on \
- INSTALL_CAS_DATA "Install CAS data files" on
+OPTIONS_DEFINE= DEBUG_MODE \
+ ENABLE_OPTIMIZATION \
+ BUILD_APACHE2X_MODULE \
+ BUILD_CURL_XMLRPC_CLIENT \
+ INSTALL_EXAMPLE_MODULES \
+ INSTALL_CAS_LIBRARY \
+ INSTALL_CAS_MODULES \
+ INSTALL_CAS_HEADERS \
+ INSTALL_CAS_CONFIGS \
+ INSTALL_CAS_BINARIES \
+ INSTALL_CAS_DATA
+
+OPTIONS_DEFAULT=ENABLE_OPTIMIZATION \
+ BUILD_APACHE2X_MODULE \
+ BUILD_CURL_XMLRPC_CLIENT \
+ INSTALL_CAS_LIBRARY \
+ INSTALL_CAS_MODULES \
+ INSTALL_CAS_HEADERS \
+ INSTALL_CAS_CONFIGS \
+ INSTALL_CAS_BINARIES \
+ INSTALL_CAS_DATA
+
+DEBUG_MODE_DESC= Enable debug output
+ENABLE_OPTIMIZATION_DESC= Enable optimization
+BUILD_APACHE2X_MODULE_DESC= Build Apache 2.x module
+BUILD_CURL_XMLRPC_CLIENT_DESC= Build cURL-based XMLRPC client
+INSTALL_EXAMPLE_MODULES_DESC= Install example modules
+INSTALL_CAS_LIBRARY_DESC= Install CAS library (libcas)
+INSTALL_CAS_MODULES_DESC= Install CAS modules
+INSTALL_CAS_HEADERS_DESC= Install CAS headers
+INSTALL_CAS_CONFIGS_DESC= Install CAS configuration files
+INSTALL_CAS_BINARIES_DESC= Install CAS binaries
+INSTALL_CAS_DATA_DESC= Install CAS data files
PLIST_SUB+= PORTVERSION=${PORTVERSION}
.include <bsd.port.options.mk>
-.if defined(WITH_DEBUG_MODE)
+.if ${PORT_OPTIONS:MDEBUG_MODE}
CMAKE_ARGS+= -DDEBUG_MODE=ON
.else
CMAKE_ARGS+= -DDEBUG_MODE=OFF
.endif
-.if defined(WITH_ENABLE_OPTIMIZATION)
+.if ${PORT_OPTIONS:MENABLE_OPTIMIZATION}
CMAKE_ARGS+= -DENABLE_OPTIMIZATION=ON
.else
CMAKE_ARGS+= -DENABLE_OPTIMIZATION=OFF
@@ -52,7 +70,7 @@ CMAKE_ARGS+= -DENABLE_OPTIMIZATION=OFF
# XXX apache13 was removed from portstree
# XXX
-##.if defined(WITH_BUILD_APACHE13_MODULE)
+##.if ${PORT_OPTIONS:MBUILD_APACHE13_MODULE}
##CMAKE_ARGS+= -DBUILD_APACHE13_MODULE=ON
##USE_APACHE= 13
##PLIST_SUB+= APACHE13_MODULE=""
@@ -61,8 +79,8 @@ CMAKE_ARGS+= -DBUILD_APACHE13_MODULE=OFF
PLIST_SUB+= APACHE13_MODULE="@comment "
##.endif
-.if defined(WITH_BUILD_APACHE2X_MODULE)
-USE_APACHE= 22+
+.if ${PORT_OPTIONS:MBUILD_APACHE2X_MODULE}
+USE_APACHE= 22
CMAKE_ARGS+= -DBUILD_APACHE2X_MODULE=ON
PLIST_SUB+= APACHE2X_MODULE=""
.else
@@ -70,7 +88,7 @@ CMAKE_ARGS+= -DBUILD_APACHE2X_MODULE=OFF
PLIST_SUB+= APACHE2X_MODULE="@comment "
.endif
-.if defined(WITH_BUILD_CURL_XMLRPC_CLIENT)
+.if ${PORT_OPTIONS:MBUILD_CURL_XMLRPC_CLIENT}
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
CMAKE_ARGS+= -DBUILD_CURL_XMLRPC_CLIENT=ON
PLIST_SUB+= CURL_XMLRPC_CLIENT=""
@@ -79,7 +97,7 @@ CMAKE_ARGS+= -DBUILD_CURL_XMLRPC_CLIENT=OFF
PLIST_SUB+= CURL_XMLRPC_CLIENT="@comment "
.endif
-.if defined(WITH_INSTALL_EXAMPLE_MODULES)
+.if ${PORT_OPTIONS:MINSTALL_EXAMPLE_MODULES}
CMAKE_ARGS+= -DINSTALL_EXAMPLE_MODULES=ON
PLIST_SUB+= EXAMPLE_MODULES=""
.else
@@ -87,7 +105,7 @@ CMAKE_ARGS+= -DINSTALL_EXAMPLE_MODULES=OFF
PLIST_SUB+= EXAMPLE_MODULES="@comment "
.endif
-.if defined(WITH_INSTALL_CAS_LIBRARY)
+.if ${PORT_OPTIONS:MINSTALL_CAS_LIBRARY}
CMAKE_ARGS+= -DINSTALL_CAS_LIBRARY=ON
PLIST_SUB+= CAS_LIBRARY=""
.else
@@ -95,7 +113,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_LIBRARY=OFF
PLIST_SUB+= CAS_LIBRARY="@comment "
.endif
-.if defined(WITH_INSTALL_CAS_MODULES)
+.if ${PORT_OPTIONS:MINSTALL_CAS_MODULES}
CMAKE_ARGS+= -DINSTALL_CAS_MODULES=ON
PLIST_SUB+= CAS_MODULES=""
.else
@@ -103,7 +121,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_MODULES=OFF
PLIST_SUB+= CAS_MODULES="@comment "
.endif
-.if defined(WITH_INSTALL_CAS_HEADERS)
+.if ${PORT_OPTIONS:MINSTALL_CAS_HEADERS}
CMAKE_ARGS+= -DINSTALL_CAS_HEADERS=ON
PLIST_SUB+= CAS_HEADERS=""
.else
@@ -111,7 +129,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_HEADERS=OFF
PLIST_SUB+= CAS_HEADERS="@comment "
.endif
-.if defined(WITH_INSTALL_CAS_CONFIGS)
+.if ${PORT_OPTIONS:MINSTALL_CAS_CONFIGS}
CMAKE_ARGS+= -DINSTALL_CAS_CONFIGS=ON
PLIST_SUB+= CAS_CONFIGS=""
.else
@@ -119,7 +137,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_CONFIGS=OFF
PLIST_SUB+= CAS_CONFIGS="@comment "
.endif
-.if defined(WITH_INSTALL_CAS_BINARIES)
+.if ${PORT_OPTIONS:MINSTALL_CAS_BINARIES}
CMAKE_ARGS+= -DINSTALL_CAS_BINARIES=ON
PLIST_SUB+= CAS_BINARIES=""
.else
@@ -127,7 +145,7 @@ CMAKE_ARGS+= -DINSTALL_CAS_BINARIES=OFF
PLIST_SUB+= CAS_BINARIES="@comment "
.endif
-.if defined(WITH_INSTALL_CAS_DATA)
+.if ${PORT_OPTIONS:MINSTALL_CAS_DATA}
CMAKE_ARGS+= -DINSTALL_CAS_DATA=ON
PLIST_SUB+= CAS_DATA=""
.else
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 1e80cb89b6a8..034e1b88a1ff 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for: gnome-user-share
-# Date created: 26 November 2004
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/www/gnome-user-share/Makefile,v 1.26 2011/04/30 20:43:27 mezz Exp $
-#
PORTNAME= gnome-user-share
PORTVERSION= 2.30.1
@@ -26,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_APACHE= 22+
+USE_APACHE= 22
USE_XORG= sm
USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2
GNU_CONFIGURE= yes
diff --git a/www/mod_antiloris/Makefile b/www/mod_antiloris/Makefile
index dc28012aae82..3faea97d846f 100644
--- a/www/mod_antiloris/Makefile
+++ b/www/mod_antiloris/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_antiloris
-# Date created: 20 August 2009
-# Whom: Aleksandar Pejic <alex@vts.su.ac.rs>
-#
+# Created by: Aleksandar Pejic <alex@vts.su.ac.rs>
# $FreeBSD$
-#
PORTNAME= mod_antiloris
PORTVERSION= 0.4
@@ -17,7 +13,7 @@ COMMENT= Protect Apache 2.x against the Slowloris HTTP DoS attack
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
AP_EXTRAS+= -a
diff --git a/www/mod_auth_cookie_mysql2/Makefile b/www/mod_auth_cookie_mysql2/Makefile
index fc0e4e371f5b..68e8ed53916a 100644
--- a/www/mod_auth_cookie_mysql2/Makefile
+++ b/www/mod_auth_cookie_mysql2/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: mod_auth_cookie_mysql2
-# Date created: Sun Aug 8 2004
-# Whom: clement
-#
+# Created by: clement
# $FreeBSD$
PORTNAME= mod_auth_cookie_mysql2
@@ -18,7 +15,7 @@ COMMENT= Allows authentication against a MySQL database via a secure cookie
MAKE_JOBS_SAFE= yes
USE_MYSQL= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
diff --git a/www/mod_auth_external2/Makefile b/www/mod_auth_external2/Makefile
index 97a838395ac6..4815bda3789e 100644
--- a/www/mod_auth_external2/Makefile
+++ b/www/mod_auth_external2/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: mod_auth_external2
-# Date created: Fri Oct 10
-# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
+# Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
# $FreeBSD$
PORTNAME= mod_auth_external
@@ -16,7 +13,7 @@ COMMENT= Allows users authentication based on external mechanisms
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
LATEST_LINK= mod_auth_external2
diff --git a/www/mod_auth_form/Makefile b/www/mod_auth_form/Makefile
index fc1679555277..c4d9712002ce 100644
--- a/www/mod_auth_form/Makefile
+++ b/www/mod_auth_form/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_auth_form
-# Date created: Feb 10 2008
-# Whom: Tommy Scheunemann <net@arrishq.net>
-#
+# Created by: Tommy Scheunemann <net@arrishq.net>
# $FreeBSD$
-#
PORTNAME= mod_auth_form
PORTVERSION= 2.05
@@ -21,7 +17,7 @@ MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_MYSQL= yes
-USE_APACHE= 22+
+USE_APACHE= 22
GNU_CONFIGURE= yes
CONFIGURE_ENV= MYSQL_PREFIX="${LOCALBASE}" APACHE2_PREFIX="${LOCALBASE}" \
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
index 1f3d81f9bbde..1d626b405870 100644
--- a/www/mod_auth_kerb2/Makefile
+++ b/www/mod_auth_kerb2/Makefile
@@ -1,12 +1,5 @@
-# New ports collection makefile for: mod_auth_kerb
-# Date created: 19 October 2001
-# Whom: wollman
-#
+# Created by: wollman
# $FreeBSD$
-#
-
-
-# Shamelessly stolen from will's mod_auth_any port.
PORTNAME= mod_auth_kerb
PORTVERSION= 5.4
@@ -22,7 +15,7 @@ MAKE_JOBS_SAFE= yes
LATEST_LINK= mod_auth_kerb2
-USE_APACHE= 22+
+USE_APACHE= 22
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/www/mod_auth_mellon/Makefile b/www/mod_auth_mellon/Makefile
index b568cde97dad..09254bb90cd9 100644
--- a/www/mod_auth_mellon/Makefile
+++ b/www/mod_auth_mellon/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_auth_mellon
-# Date created: 2010-20-8
-# Whom: Tom Judge <tom@tomjudge.com>
-#
+# Created by: Tom Judge <tom@tomjudge.com>
# $FreeBSD$
-#
PORTNAME= mod_auth_mellon
PORTVERSION= 0.3.0
@@ -21,7 +17,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs2=${APXS}
CONFIGURE_ENV+= OPENSSL_CFLAGS="-Wall" OPENSSL_LIBS="-lssl"
-USE_APACHE= 22+
+USE_APACHE= 22
PLIST_FILES= ${APACHEMODDIR}/mod_auth_mellon.so
diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile
index 4a2be52627bc..2f8e01bdc73f 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: apache mod_auth_mysql_another
-# Date created: 2002/04/20
-# Whom: mbr@freebsd.org
-#
+# Created by: mbr@freebsd.org
# $FreeBSD$
PORTNAME= mod_auth_mysql
@@ -17,7 +14,7 @@ COMMENT= Allows users to use MySQL databases for user authentication
MAKE_JOBS_SAFE= yes
USE_MYSQL= yes
-USE_APACHE= 22+
+USE_APACHE= 22
SHORTMODNAME= mysql_auth
AP_FAST_BUILD= yes
diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile
index 6ff4cec5e668..4013499e4a74 100644
--- a/www/mod_auth_openid/Makefile
+++ b/www/mod_auth_openid/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_auth_openid
-# Date created: 3 August 2008
-# Whom: Sutra Zhou <zhoushuqun@gmail.com>
-#
+# Created by: Sutra Zhou <zhoushuqun@gmail.com>
# $FreeBSD$
-#
PORTNAME= mod_auth_openid
PORTVERSION= 0.6
@@ -22,7 +18,7 @@ MAKE_JOBS_SAFE= yes
PLIST_FILES= ${APACHEMODDIR}/mod_auth_openid.so
-USE_APACHE= 22+
+USE_APACHE= 22
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pcre=${LOCALBASE}
diff --git a/www/mod_auth_pgsql2/Makefile b/www/mod_auth_pgsql2/Makefile
index 0ecc5b132a2f..f5d1b829a6d4 100644
--- a/www/mod_auth_pgsql2/Makefile
+++ b/www/mod_auth_pgsql2/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: mod_auth_pgsql2
-# Date created: Mon Oct 6
-# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
+# Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
# $FreeBSD$
PORTNAME= mod_auth_pgsql
@@ -16,7 +13,7 @@ COMMENT= Allows users to use PostgreSQL databases for user authentication
MAKE_JOBS_SAFE= yes
USE_PGSQL= yes
-USE_APACHE= 22+
+USE_APACHE= 22
LATEST_LINK= mod_auth_pgsql2
diff --git a/www/mod_auth_tkt/Makefile b/www/mod_auth_tkt/Makefile
index 2181c9d48826..5f3f9c6a9e62 100644
--- a/www/mod_auth_tkt/Makefile
+++ b/www/mod_auth_tkt/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_auth_tkt
-# Date created: 2 Feb 2011
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= mod_auth_tkt
PORTVERSION= 2.1.0
@@ -15,7 +11,7 @@ MASTER_SITE_SUBDIR= kuriyama
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Lightweight single-sign-on authentication module for apache
-USE_APACHE= 22+
+USE_APACHE= 22
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
AP_FAST_BUILD= yes
SRC_FILE= ${PORTNAME}.c sha2.c
diff --git a/www/mod_auth_xradius/Makefile b/www/mod_auth_xradius/Makefile
index 6af0e45d0793..d24662ab53e3 100644
--- a/www/mod_auth_xradius/Makefile
+++ b/www/mod_auth_xradius/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: mod_auth_xradius
-# Date created: 1 Jul 2007
-# Whom: mwlucas
-#
+# Created by: mwlucas
# $FreeBSD$
PORTNAME= mod_auth_xradius
@@ -16,7 +13,7 @@ COMMENT= Enables RADIUS authentication
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/www/mod_authn_otp/Makefile b/www/mod_authn_otp/Makefile
index 2c2bcb6d6eb6..0752a5c542b9 100644
--- a/www/mod_authn_otp/Makefile
+++ b/www/mod_authn_otp/Makefile
@@ -1,8 +1,5 @@
-# New ports collection makefile for: ifdepd
-# Date created: 03 05 2012
-# Whom: Alexander Hausner <alex@hugo.bmg.gv.at>
+# Created by: Alexander Hausner <alex@hugo.bmg.gv.at>
# $FreeBSD$
-#
PORTNAME= mod_authn_otp
PORTVERSION= 1.1.4
@@ -19,7 +16,7 @@ COMMENT= Apache module for one-time password authentication
MAKE_JOBS_SAFE= yes
HAS_CONFIGURE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
MAN1= otptool.1
diff --git a/www/mod_authz_unixgroup/Makefile b/www/mod_authz_unixgroup/Makefile
index 132c4f2e8df4..87922b08e367 100644
--- a/www/mod_authz_unixgroup/Makefile
+++ b/www/mod_authz_unixgroup/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_authz_unixgroup
-# Date created: July 18, 2007
-# Whom: Will Stacey <will@at.org>
-#
+# Created by: Will Stacey <will@at.org>
# $FreeBSD$
-#
PORTNAME= mod_authz_unixgroup
PORTVERSION= 1.0.1
@@ -16,7 +12,7 @@ COMMENT= A unix group access control module for Apache 2.1 and later
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
SHORTMODNAME= authz_unixgroup
diff --git a/www/mod_bw/Makefile b/www/mod_bw/Makefile
index e2a536f21474..dfc36b53bc2c 100644
--- a/www/mod_bw/Makefile
+++ b/www/mod_bw/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_bw
-# Date created: Sep 11 2005
-# Whom: Clement Laforet <clement@FreeBSD.org>
-#
+# Created by: Clement Laforet <clement@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= mod_bw
PORTVERSION= 0.8
@@ -19,7 +15,7 @@ COMMENT= Bandwidth and Connection control per Virtual Host or Directory
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/mod_bw
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
diff --git a/www/mod_cband/Makefile b/www/mod_cband/Makefile
index 268a9bb4cec1..52a0d3c53d31 100644
--- a/www/mod_cband/Makefile
+++ b/www/mod_cband/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_cband
-# Date created: Sep 7 2005
-# Whom: Clement Laforet <clement@FreeBSD.org>
-#
+# Created by: Clement Laforet <clement@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= mod_cband
PORTVERSION= 0.9.7.5
@@ -20,7 +16,7 @@ COMMENT= A per-virtualhost bandwidth limiter module for Apache 2
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-apxs=${APXS}
ALL_TARGET= #
diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile
index c929bd69f31a..0b1b553d323b 100644
--- a/www/mod_cplusplus/Makefile
+++ b/www/mod_cplusplus/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for: mod_cplusplus for Apache 2.x
-# Date created: Dec 29, 2006
-# Whom: Michael Durian <durian@shadetreesoftware.com>
-#
+# Created by: Michael Durian <durian@shadetreesoftware.com>
# $FreeBSD$
-#
PORTNAME= mod_cplusplus
PORTVERSION= 1.5.4
@@ -17,7 +13,7 @@ COMMENT= Apache module for loading C++ objects as handlers
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
USE_AUTOTOOLS= autoconf autoheader libtool automake aclocal
CFLAGS+= -I${LOCALBASE}/include
diff --git a/www/mod_evasive/Makefile b/www/mod_evasive/Makefile
index 90e2e21557bc..7edee7feb374 100644
--- a/www/mod_evasive/Makefile
+++ b/www/mod_evasive/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_dosevasive20
-# Date created: 26 Jul 2004
-# Whom: Xavier Beaudouin <kiwi@oav.net>
-#
+# Created by: Xavier Beaudouin <kiwi@oav.net>
# $FreeBSD$
-#
PORTNAME= mod_evasive
PORTVERSION= 1.10.1
@@ -20,7 +16,7 @@ MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
diff --git a/www/mod_extract_forwarded/Makefile b/www/mod_extract_forwarded/Makefile
index 1ff00f8c2d63..f003d813011e 100644
--- a/www/mod_extract_forwarded/Makefile
+++ b/www/mod_extract_forwarded/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_extract_forwarded
-# Date created: 9 June 2001
-# Whom: Anders Nordby <anders@fix.no>
-#
+# Created by: Anders Nordby <anders@fix.no>
# $FreeBSD$
-#
PORTNAME= mod_extract_forwarded
PORTVERSION= 2.0.2
@@ -15,7 +11,7 @@ DISTNAME= extract_forwarded-${DISTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= An Apache module that can make proxied requests appear with client IP
-USE_APACHE= 22+
+USE_APACHE= 22
WRKSRC= ${WRKDIR}/extract_forwarded
PORTDOCS= INSTALL README
MAKE_JOBS_SAFE= yes
diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile
index d7f3240a67de..003620bd671e 100644
--- a/www/mod_fastcgi/Makefile
+++ b/www/mod_fastcgi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_fastcgi ( in apache )
-# Date created: 14 Jul 2000
-# Whom: JunSeon Oh <hollywar@mail.holywar.net>
-#
+# Created by: JunSeon Oh <hollywar@mail.holywar.net>
# $FreeBSD$
-#
PORTNAME= mod_fastcgi
PORTVERSION= 2.4.6
@@ -17,7 +13,7 @@ COMMENT= A fast-cgi module for Apache
MAKE_JOBS_SAFE= yes
CONFLICTS= apache-contrib-1.*
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
SRC_FILE= *.c
diff --git a/www/mod_ftp/Makefile b/www/mod_ftp/Makefile
index a2fb0537a6b5..233e54cc7f07 100644
--- a/www/mod_ftp/Makefile
+++ b/www/mod_ftp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_ftp
-# Date created: June 21, 2011 Oct 5
-# Whom: Mikhail Teterin <mi@aldan.algebra.com>
-#
+# Created by: Mikhail Teterin <mi@aldan.algebra.com>
# $FreeBSD$
-#
PORTNAME= mod_ftp
DISTVERSION= 0.9.6-beta
@@ -18,7 +14,7 @@ MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-USE_APACHE= 22+
+USE_APACHE= 22
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT=configure.apxs
CONFIGURE_ENV+= APXS="${APXS}"
diff --git a/www/mod_geoip2/Makefile b/www/mod_geoip2/Makefile
index dfe60faca399..47723b2b6acb 100644
--- a/www/mod_geoip2/Makefile
+++ b/www/mod_geoip2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_geoip2
-# Date created: 26 Aug 2005
-# Whom: Jukka A. Ukkonen <jau@iki.fi>
-#
+# Created by: Jukka A. Ukkonen <jau@iki.fi>
# $FreeBSD$
-#
PORTNAME= mod_geoip2
PORTVERSION= 1.2.7
@@ -25,7 +21,7 @@ CONFLICTS= mod_geoip-[0-9]*
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
-USE_APACHE= 22+
+USE_APACHE= 22
MODULENAME= mod_geoip
AP_FAST_BUILD= yes
AP_GENPLIST= yes
diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile
index 201553b3c030..71c5b9679edd 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_gnutls
-# Date created: 2011-01-19
-# Whom: Fumiyuki Shimizu <fumifumi@abacustech.jp>
-#
+# Created by: Fumiyuki Shimizu <fumifumi@abacustech.jp>
# $FreeBSD$
-#
PORTNAME= mod_gnutls
PORTVERSION= 0.5.10
@@ -24,7 +20,7 @@ LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_PKGCONFIG= build
-USE_APACHE= 22+
+USE_APACHE= 22
GNU_CONFIGURE= yes
DOCS= LICENSE NEWS README README.ENV
diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile
index 08d7c56f00c2..ff38cd70c271 100644
--- a/www/mod_hosts_access/Makefile
+++ b/www/mod_hosts_access/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_hosts_access
-# Date created: 10 April 2001
-# Whom: will
-#
+# Created by: will
# $FreeBSD$
-#
PORTNAME= mod_hosts_access
PORTVERSION= 1.1.0
@@ -16,7 +12,7 @@ COMMENT= Apache module that makes Apache respect hosts.allow and hosts.deny
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
diff --git a/www/mod_jk-apache2/Makefile b/www/mod_jk-apache2/Makefile
index 2c7a8ae3a58b..2d1925262bd8 100644
--- a/www/mod_jk-apache2/Makefile
+++ b/www/mod_jk-apache2/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: mod_jk
-# Date created: Thu Apr 10 15:14:37 EDT 2003
-# Whom: Larry Lansing <lansil@fuzzynerd.com>
-#
+# Created by: Larry Lansing <lansil@fuzzynerd.com>
# $FreeBSD$
-#
MASTERDIR= ${.CURDIR}/../mod_jk
-USE_APACHE= 22+
+USE_APACHE= 22
PORTREVISION= 2
PORTEPOCH= 0
LATEST_LINK= mod_jk-ap2
diff --git a/www/mod_limitipconn2/Makefile b/www/mod_limitipconn2/Makefile
index fa1e95ce074d..a13f7e132e2a 100644
--- a/www/mod_limitipconn2/Makefile
+++ b/www/mod_limitipconn2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_limitipconn2
-# Date created: 18 November 2003
-# Whom: Gea-Suan Lin <gslin@ccca.nctu.edu.tw>
-#
+# Created by: Gea-Suan Lin <gslin@ccca.nctu.edu.tw>
# $FreeBSD$
-#
PORTNAME= mod_limitipconn
PORTVERSION= 0.23
@@ -20,7 +16,7 @@ MAKE_JOBS_SAFE= yes
LATEST_LINK= mod_limitipconn2
-USE_APACHE= 22+
+USE_APACHE= 22
USE_BZIP2= yes
AP_FAST_BUILD= yes
diff --git a/www/mod_lisp2/Makefile b/www/mod_lisp2/Makefile
index 26b4b7b9fe08..1b8f352d3a76 100644
--- a/www/mod_lisp2/Makefile
+++ b/www/mod_lisp2/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for: mod_lisp2
-# Date created: Tue Jul 17 2007
-# Whom: vl
-#
+# Created by: vl
# $FreeBSD$
-#
PORTNAME= mod_lisp2
PORTVERSION= 1.3.1
@@ -16,7 +12,7 @@ COMMENT= Apache2 module for use with Common Lisp
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
diff --git a/www/mod_log_config-st/Makefile b/www/mod_log_config-st/Makefile
index 91e51afa4e69..bff82645a674 100644
--- a/www/mod_log_config-st/Makefile
+++ b/www/mod_log_config-st/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_log_config-st
-# Date created: Sun May 2 2004
-# Whom: Clement Laforet <clement@FreeBSD.org>
-#
+# Created by: Clement Laforet <clement@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= mod_log_config-st
PORTVERSION= 1.0
@@ -18,7 +14,7 @@ COMMENT= A modified version of mod_log_config for apache2
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
SRC_FILE= mod_log_config.c
diff --git a/www/mod_log_dbd/Makefile b/www/mod_log_dbd/Makefile
index 342acceccd12..04dce00e1985 100644
--- a/www/mod_log_dbd/Makefile
+++ b/www/mod_log_dbd/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: mod_log_dbd
-# Date created: 2006/01/19
-# Whom: Brandon Fosdick <bfoz@bfoz.net>
-#
+# Created by: Brandon Fosdick <bfoz@bfoz.net>
# $FreeBSD$
PORTNAME= mod_log_dbd
@@ -16,7 +13,7 @@ COMMENT= Uses APR DBD to store Apache access logs in a database
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-apache=${PREFIX}
diff --git a/www/mod_log_sql2-dtc/Makefile b/www/mod_log_sql2-dtc/Makefile
index 4a945c496286..be73eb952f64 100644
--- a/www/mod_log_sql2-dtc/Makefile
+++ b/www/mod_log_sql2-dtc/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: mod_log_sql2-dtc
-# Date created: 2006/11/20
-# Whom: Marc G. Fournier <scrappy@freebsd.org>
-#
+# Created by: Marc G. Fournier <scrappy@freebsd.org>
# $FreeBSD$
PORTNAME= mod_log_sql
@@ -21,7 +18,7 @@ LATEST_LINK= mod_log_sql2-dtc
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
CONFIGURE_ARGS+= --with-apxs=${APXS}
SSL_PLIST= ""
PLIST_SUB+= SSL=${SSL_PLIST}
diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index 4c4c425685f7..febd7e4ce10b 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: mod_log_sql2
-# Date created: 2001/11/22
-# Whom: Clement Laforet <clement@FreeBSD.org>
-#
+# Created by: Clement Laforet <clement@FreeBSD.org>
# $FreeBSD$
PORTNAME= mod_log_sql
@@ -26,7 +23,7 @@ APACHE2X= ""
PLIST_SUB+= SSL=${SSL_PLIST} APACHE2X=${APACHE2X}
USE_MYSQL= yes
-USE_APACHE= 22+
+USE_APACHE= 22
CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
.include <bsd.port.pre.mk>
diff --git a/www/mod_memcache_block/Makefile b/www/mod_memcache_block/Makefile
index aee90d51ae1b..238c9b7df4d8 100644
--- a/www/mod_memcache_block/Makefile
+++ b/www/mod_memcache_block/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_memcache_block
-# Date created: 2012-08-21
-# Whom: Hung-Yi Chen <gaod@hychen.org>
-#
+# Created by: Hung-Yi Chen <gaod@hychen.org>
# $FreeBSD$
-#
PORTNAME= mod_memcache_block
PORTVERSION= 20120821
@@ -22,7 +18,7 @@ GITVERSION= 7b1fcec
WRKSRC= ${WRKDIR}/netik-${DISTNAME}
LATEST_LINK= mod_memcache_block
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
AP_INC= ${LOCALBASE}/include/libmemcached
diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile
index 3e1c2eb67755..678ae676dded 100644
--- a/www/mod_mono/Makefile
+++ b/www/mod_mono/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for: mod_mono
-# Date created: 20040828
-# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
+# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
# $FreeBSD$
-# $Id: Makefile,v 1.39 2007/12/13 19:35:47 killfill Exp $
-#
PORTNAME= mod_mono
PORTVERSION= 2.10
@@ -21,7 +16,7 @@ BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono \
RUN_DEPENDS= mono:${PORTSDIR}/lang/mono \
xsp:${PORTSDIR}/www/xsp
-USE_APACHE= 22+
+USE_APACHE= 22
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --man=${PREFIX}/man
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index 2682bd97462a..7080feb7b78e 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_musicindex
-# Date created: Nov 1 2003
-# Whom: clsung
-#
+# Created by: clsung
# $FreeBSD$
-#
PORTNAME= mod_musicindex
PORTVERSION= 1.3.7
@@ -16,7 +12,7 @@ COMMENT= Apache module that allows downloading and streaming of audio
LICENSE= LGPL21
-USE_APACHE= 22+
+USE_APACHE= 22
.include <bsd.port.pre.mk>
diff --git a/www/mod_ntlm2/Makefile b/www/mod_ntlm2/Makefile
index c95f89b828b8..07ca5f476b27 100644
--- a/www/mod_ntlm2/Makefile
+++ b/www/mod_ntlm2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_ntlm2
-# Date created: 26 September 2007
-# Whom: Alex "lissyara" Keda <admin@lissyara.su>
-#
+# Created by: Alex "lissyara" Keda <admin@lissyara.su>
# $FreeBSD$
-#
PORTNAME= mod_ntlm2
PORTVERSION= 0.1
@@ -22,7 +18,7 @@ SAMBA_PORT?= net/samba34
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
MAKE_ENV= APXS=${APXS}
.include <bsd.port.mk>
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 3dc557629392..12a04014bbd1 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -29,11 +29,6 @@ PERL_CONFIGURE= yes
GMAKE= yes
USE_CSTD= gnu89
-# Using apxs in this way is problematic if apache2 is installed under a
-# different PREFIX than mod_perl2, because the mod_perl2 installation will
-# use paths returned by apxs to install some components. Fixes welcome.
-CONFIGURE_ARGS= MP_APXS=${LOCALBASE}/sbin/apxs PREFIX=${PREFIX}
-
MAN3= APR.3 APR::Base64.3 APR::Brigade.3 APR::Bucket.3 \
APR::BucketAlloc.3 APR::BucketType.3 APR::Const.3 \
APR::Date.3 APR::Error.3 APR::Finfo.3 APR::IpSubnet.3 \
@@ -70,6 +65,12 @@ MAN3= APR.3 APR::Base64.3 APR::Brigade.3 APR::Bucket.3 \
.include <bsd.port.pre.mk>
+# Using apxs in this way is problematic if apache2 is installed under a
+# different PREFIX than mod_perl2, because the mod_perl2 installation will
+# use paths returned by apxs to install some components. Fixes welcome.
+#CONFIGURE_ARGS= MP_APXS=${LOCALBASE}/sbin/apxs PREFIX=${PREFIX}
+CONFIGURE_ARGS= PREFIX=${PREFIX} MP_APXS=${APXS} MP_APR_CONFIG=${LOCALBASE}/bin/apr-1-config
+
.if exists(${LOCALBASE}/include/apr-1/apr.h)
APR_H= ${LOCALBASE}/include/apr-1/apr.h
APR_MAJ_V!= ${ECHO_CMD} `${LOCALBASE}/bin/apr-1-config --version | ${SED} -e 's,\..*,,'`
diff --git a/www/mod_python3/Makefile b/www/mod_python3/Makefile
index d84fd0dff69d..08d94af6101b 100644
--- a/www/mod_python3/Makefile
+++ b/www/mod_python3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_python
-# Date created: 28 August 2000
-# Whom: Hye-Shik Chang
-#
+# Created by: Hye-Shik Chang
# $FreeBSD$
-#
PORTNAME= mod_python
PORTVERSION= 3.3.1
@@ -19,7 +15,7 @@ COMMENT= Apache module that embeds the Python interpreter within the server
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
USE_PYTHON= yes
MAKE_ARGS+= APXS=${APXS}
diff --git a/www/mod_remoteip/Makefile b/www/mod_remoteip/Makefile
index 71ef306e775c..30ab28c27937 100644
--- a/www/mod_remoteip/Makefile
+++ b/www/mod_remoteip/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_remoteip
-# Date created: 2010-05-11
-# Whom: Jim Riggs <ports@christianserving.org>
-#
+# Created by: Jim Riggs <ports@christianserving.org>
# $FreeBSD$
-#
PORTNAME= mod_remoteip
PORTVERSION= 2.3.5.a
@@ -16,7 +12,7 @@ COMMENT= Replaces the client IP address/hostname with that given by a proxy
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
diff --git a/www/mod_rpaf2/Makefile b/www/mod_rpaf2/Makefile
index 02a6c964f2da..db3e798b76f7 100644
--- a/www/mod_rpaf2/Makefile
+++ b/www/mod_rpaf2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_rpaf2
-# Date created: Mar 17, 2003
-# Whom: Clement Laforet <clement@FreeBSD.org>
-#
+# Created by: Clement Laforet <clement@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= mod_rpaf2
PORTVERSION= 0.6
@@ -17,7 +13,7 @@ COMMENT= Make proxied requests appear with client IP
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
SHORTMODNAME= rpaf
diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index d77bbac4c807..364f15b5934e 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_ruby
-# Date created: 12 Aug 2000
-# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
# $FreeBSD$
-#
PORTNAME= mod_ruby
PORTVERSION= 1.3.0
@@ -19,7 +15,7 @@ COMMENT= An Apache module that embeds Ruby interpreter within
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
USE_RUBY= yes
USE_PERL5_BUILD= yes
diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile
index 7167f20b77cc..902497e19e6d 100644
--- a/www/mod_scgi/Makefile
+++ b/www/mod_scgi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: scgi
-# Date created: 19 Aug 2002
-# Whom: Neil Blakey-Milner <nbm@FreeBSD.org>
-#
+# Created by: Neil Blakey-Milner <nbm@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= mod_scgi
PORTVERSION= 1.12
@@ -20,7 +16,7 @@ MAKE_JOBS_SAFE= yes
SCGI_DIR= apache2
WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
diff --git a/www/mod_security21/Makefile b/www/mod_security21/Makefile
index b9fa5c9f24ac..9961104cb7f2 100644
--- a/www/mod_security21/Makefile
+++ b/www/mod_security21/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_security2
-# Date created: 9 November 2006
-# Whom: Dominic Mitchell <dom@happygiraffe.net>
-#
+# Created by: Dominic Mitchell <dom@happygiraffe.net>
# $FreeBSD$
-#
PORTNAME= mod_security21
PORTVERSION= 2.1.7
@@ -17,7 +13,7 @@ COMMENT= An intrusion detection and prevention engine
MAKE_JOBS_SAFE= yes
-USE_APACHE= 22+
+USE_APACHE= 22
AP_FAST_BUILD= yes
AP_GENPLIST= yes
AP_EXTRAS+= -DWITH_LIBXML2
diff --git a/www/mod_wsgi/Makefile b/www/mod_wsgi/Makefile
index e850472f1d48..3d07f26c9cd3 100644
--- a/www/mod_wsgi/Makefile
+++ b/www/mod_wsgi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mod_wsgi
-# Date created: 07 April 2008
-# Whom: Douglas Thrift
-#
+# Created by: Douglas Thrift
# $FreeBSD$
-#
PORTNAME= mod_wsgi
PORTVERSION= 2.8
@@ -26,7 +22,7 @@ CONFLICTS= ${PKGNAMEPREFIX}mod_wsgi-3.* mod_wsgi-3.*
PROJECTHOST= modwsgi
-USE_APACHE= 22+
+USE_APACHE= 22
USE_PYTHON= 2.5-2.7
GNU_CONFIGURE= yes
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 37acdf4a8d30..714330321d9f 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: suphp
-# Date created: 15 September 2002
-# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
+# Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
# $FreeBSD$
-#
PORTNAME= suphp
PORTVERSION= 0.7.1
@@ -19,7 +15,7 @@ GNU_CONFIGURE= yes
USE_AUTOTOOLS= aclocal:env automake:env autoconf:env libtool:env
# Maintainer has not tested suPHP 0.6.x on Apache 1.3.
-USE_APACHE= 22+
+USE_APACHE= 22
CFLAGS+= -I${LOCALBASE}/include
USE_CSTD= gnu89
USE_PHP= yes