diff --git a/Mk/Uses/apache.mk b/Mk/Uses/apache.mk --- a/Mk/Uses/apache.mk +++ b/Mk/Uses/apache.mk @@ -1,6 +1,3 @@ -#-*- tab-width: 4; -*- -# ex:ts=4 -# # apache.mk - Apache related macros. # Author: Clement Laforet # Author: Olli Hauer @@ -15,9 +12,8 @@ # version If your port requires a specific Apache httpd version, you can # set this to [min]-[max] or min+ or -max or an explicit version # -# USES=apache:2.2 # Only use Apache 2.2 +# USES=apache:2.4 # Only use Apache 2.4 # USES=apache:2.4+ # Use Apache 2.4 or newer -# USES=apache:2.2-2.4 # Use Apache 2.2 or 2.4 # USES=apache:-2.4 # Use Apache 2.4 or earlier # USES=apache # Use the default apache version # @@ -51,13 +47,13 @@ # Variables, for internal use by the Apache ports framework only # The following values for USE_APACHE are reserved and only valid # in apache-server ports! -# USES= apache:server,2.2 +# USES= apache:server,2.4 # # # The following variables can be read by ports and must not be modified # # APACHE_VERSION The major-minor release version of the chosen -# Apache server, e.g. 2.2 or 2.4 +# Apache server, e.g. 2.4 # # APACHEETCDIR Location of the Apache configuration directory # Default: ${LOCALBASE}/etc/apache24 @@ -77,7 +73,7 @@ # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -_APACHE_SUPPORTED_VERSIONS= 2.4 2.2 2.5 # preferred version first +_APACHE_SUPPORTED_VERSIONS= 2.4 # preferred version first # Print warnings _ERROR_MSG= : Error from apache.mk. @@ -260,7 +256,7 @@ _APACHE_WANTED_VERSIONS:= ${_APACHE_WANTED_VERSIONS:N${_ver}} . endif . if !empty(_APACHE_VERSION_MAX) && ${_ver} > ${_APACHE_VERSION_MAX} -_APACHE_WANTED_VERSIONS:= ${_APACHE_WANTED_VERSIONS:N${_ver}} +_APACHE_WANTED_VERSIONS:= ${_APACHE_WANTED_VERSIONS:N${_ver}} . endif . endfor @@ -281,11 +277,7 @@ BROKEN= ${_ERROR_MSG} Apache ${_APACHE_VERSION} is installed and port requires ${_APACHE_WANTED_VERSION} . endif -. if ${APACHE_VERSION} >= 2.5 -APXS?= ${LOCALBASE}/bin/apxs -. else APXS?= ${LOCALBASE}/sbin/apxs -. endif . if exists(${APXS}) APXS_PREFIX!= ${APXS} -q prefix 2> /dev/null || echo NULL @@ -300,11 +292,7 @@ APACHEMODDIR= libexec/apache${APACHE_VERSION:S/.//} APACHEINCLUDEDIR= include/apache${APACHE_VERSION:S/.//} APACHEETCDIR= etc/apache${APACHE_VERSION:S/.//} -. if ${APACHE_VERSION} == 2.5 -_APACHE_PORT?= www/apache${APACHE_VERSION:S/.//}-devel -. else _APACHE_PORT?= www/apache${APACHE_VERSION:S/.//} -. endif PLIST_SUB+= APACHEMODDIR="${APACHEMODDIR}" \ APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \ diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -209,11 +209,10 @@ USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD \ XORG_CAT CARGO_USE_GITHUB CARGO_USE_GITLAB CARGO_GIT_SUBDIR \ USE_RUBY USE_RUBY_EXTCONF USE_RUBY_SETUP RUBY_NO_BUILD_DEPENDS \ - RUBY_NO_RUN_DEPENDS + RUBY_NO_RUN_DEPENDS USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN SANITY_DEPRECATED= MLINKS \ USE_MYSQL WANT_MYSQL_VER \ - PYDISTUTILS_INSTALLNOSINGLE \ - USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN + PYDISTUTILS_INSTALLNOSINGLE SANITY_NOTNEEDED= CMAKE_NINJA WX_UNICODE USE_KDEBASE_VER \ USE_KDELIBS_VER USE_QT_VER diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile --- a/databases/gnatsweb4/Makefile +++ b/databases/gnatsweb4/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= apache:run,2.2+ perl5 shebangfix +USES= apache:run perl5 shebangfix SHEBANG_FILES= gnatsweb.pl USE_PERL5= run NO_BUILD= yes diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile --- a/devel/bugzilla44/Makefile +++ b/devel/bugzilla44/Makefile @@ -45,7 +45,7 @@ .include "${.CURDIR}/Makefile.common" .include "${.CURDIR}/Makefile.options" -MODPERL_USE= APACHE_RUN=22+ +MODPERL_USES= apache:run MYSQL_USES= mysql MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql PGSQL_USES= pgsql diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile --- a/devel/bugzilla50/Makefile +++ b/devel/bugzilla50/Makefile @@ -46,7 +46,7 @@ .include "${.CURDIR}/Makefile.common" .include "${.CURDIR}/Makefile.options" -MODPERL_USE= APACHE_RUN=22+ +MODPERL_USES= apache:run MYSQL_USES= mysql MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql PGSQL_USES= pgsql:9.1+ diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile --- a/devel/p5-Log-Dispatch/Makefile +++ b/devel/p5-Log-Dispatch/Makefile @@ -37,7 +37,7 @@ MAILSENDMAIL_DESC= Mail::Sendmail support APACHELOG_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 -APACHELOG_USE= APACHE_RUN=22+ +APACHELOG_USES= apache:run MIMELITE_RUN_DEPENDS= p5-MIME-Lite>=0:mail/p5-MIME-Lite MAILSEND_RUN_DEPENDS= p5-Mail-Tools>=0:mail/p5-Mail-Tools MAILSENDER_RUN_DEPENDS= p5-Mail-Sender>=0:mail/p5-Mail-Sender diff --git a/devel/pushmi/Makefile b/devel/pushmi/Makefile --- a/devel/pushmi/Makefile +++ b/devel/pushmi/Makefile @@ -24,7 +24,7 @@ p5-YAML-Syck>=0:textproc/p5-YAML-Syck \ svk>=2.0.0:devel/svk -USES= apache:2.2+ perl5 +USES= apache perl5 USE_PERL5= configure .include diff --git a/devel/viewvc-devel/Makefile b/devel/viewvc-devel/Makefile --- a/devel/viewvc-devel/Makefile +++ b/devel/viewvc-devel/Makefile @@ -29,7 +29,7 @@ APMOD_DESC= depend on Apache module MODWSGI_DESC= Add mod_wsgi to the list of package dependencies -APACHE_USE= APACHE_RUN=24+ +APACHE_USES= apache:run LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd MODWSGI_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}mod_wsgi>=4.4.13:www/mod_wsgi4@${PY_FLAVOR} diff --git a/dns/dns-ui/Makefile b/dns/dns-ui/Makefile --- a/dns/dns-ui/Makefile +++ b/dns/dns-ui/Makefile @@ -23,7 +23,7 @@ APACHE_DESC= Use apache as webserver PGSQLSRV_DESC= Use local postgres instance -APACHE_USES= apache:run,2.2+ php:mod +APACHE_USES= apache:run php:mod APACHE_USES_OFF= php:web PGSQLSRV_VARS= WANT_PGSQL=server diff --git a/finance/frontaccounting/Makefile b/finance/frontaccounting/Makefile --- a/finance/frontaccounting/Makefile +++ b/finance/frontaccounting/Makefile @@ -25,7 +25,7 @@ MYSQL_SERVER_DESC= MySQL server support NGINX_DESC= NGINX web server -APACHE_USES= apache:run,2.2+ php:web +APACHE_USES= apache:run php:web LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd LIGHTTPD_USES= php:web NGINX_RUN_DEPENDS= nginx:www/nginx diff --git a/finance/frontaccounting24/Makefile b/finance/frontaccounting24/Makefile --- a/finance/frontaccounting24/Makefile +++ b/finance/frontaccounting24/Makefile @@ -35,7 +35,7 @@ MYSQL_SERVER_DESC= MySQL server support NGINX_DESC= NGINX web server -APACHE_USES= apache:run,2.2+ php:web +APACHE_USES= apache:run php:web LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd LIGHTTPD_USES= php:web NGINX_RUN_DEPENDS= nginx:www/nginx diff --git a/lang/neko/Makefile b/lang/neko/Makefile --- a/lang/neko/Makefile +++ b/lang/neko/Makefile @@ -35,7 +35,7 @@ UI_USE= gnome=atk,cairo,gdkpixbuf2,glib20,gtk20,pango UI_CMAKE_BOOL= WITH_UI -APACHE_USE= apache=22+ +APACHE_USES= apache APACHE_CMAKE_BOOL= WITH_APACHE .include diff --git a/lang/php80/Makefile b/lang/php80/Makefile --- a/lang/php80/Makefile +++ b/lang/php80/Makefile @@ -95,8 +95,7 @@ .endif .if defined(PKGNAMEPREFIX) -USES+= apache:2.2+ -.include "${PORTSDIR}/Mk/Uses/apache.mk" +USES+= apache .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} .else diff --git a/lang/php81/Makefile b/lang/php81/Makefile --- a/lang/php81/Makefile +++ b/lang/php81/Makefile @@ -96,8 +96,7 @@ .endif .if defined(PKGNAMEPREFIX) -USES+= apache:2.2+ -.include "${PORTSDIR}/Mk/Uses/apache.mk" +USES+= apache .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+= --with-apxs2filter=${APXS} .else diff --git a/lang/php82/Makefile b/lang/php82/Makefile --- a/lang/php82/Makefile +++ b/lang/php82/Makefile @@ -96,8 +96,7 @@ .endif .if defined(PKGNAMEPREFIX) -USES+= apache:2.2+ -.include "${PORTSDIR}/Mk/Uses/apache.mk" +USES+= apache .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+= --with-apxs2filter=${APXS} .else diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -397,7 +397,7 @@ . if ${PORT_OPTIONS:MLIGHTTPD} RUN_DEPENDS+= ${LOCALBASE}/sbin/lighttpd:www/lighttpd . else -USES+= apache:2.2+ +USES+= apache . endif LIB_DEPENDS+= libgd.so:graphics/gd RUN_DEPENDS+= p5-GD>=0:graphics/p5-GD diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile --- a/mail/p5-qpsmtpd/Makefile +++ b/mail/p5-qpsmtpd/Makefile @@ -25,7 +25,7 @@ .include .if ${PORT_OPTIONS:MMODPERL} -USES+= apache:run,2.2+ +USES+= apache:run RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 .endif diff --git a/net-mgmt/chillispot/Makefile b/net-mgmt/chillispot/Makefile --- a/net-mgmt/chillispot/Makefile +++ b/net-mgmt/chillispot/Makefile @@ -26,7 +26,7 @@ FREERADIUS_DESC=depend on FreeRADIUS OPENRADIUS_DESC=depend on OpenRADIUS -APACHE_USE= apache_run=22+ +APACHE_USES= apache:run FREERADIUS_RUN_DEPENDS= radiusd:net/freeradius OPENRADIUS_RUN_DEPENDS= radiusd:net/openradius diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile --- a/net-mgmt/observium/Makefile +++ b/net-mgmt/observium/Makefile @@ -43,7 +43,7 @@ OPTIONS_DEFINE= APACHEMOD DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER SUBVERSION WMIC OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SUBVERSION WMIC -APACHEMOD_DESC= Use PHP with Apache 2.2+ module +APACHEMOD_DESC= Use PHP with Apache 2.4+ module FPING_DESC= Enable fping support ping monitoring IPMITOOL_DESC= Enable support for monitoring hardware IPMI MYSQLD_DESC= Use local MySQL server @@ -76,7 +76,7 @@ PORTEXAMPLES= snmp.conf.example snmpd.conf.example .if ${PORT_OPTIONS:MAPACHEMOD} -USES+= apache:run,2.2+ +USES+= apache:run .endif .if !defined(PACKAGE_BUILDING) USES+= php:mod diff --git a/net-mgmt/ocsinventory-server/Makefile b/net-mgmt/ocsinventory-server/Makefile --- a/net-mgmt/ocsinventory-server/Makefile +++ b/net-mgmt/ocsinventory-server/Makefile @@ -23,7 +23,7 @@ p5-Switch>=0:lang/p5-Switch \ p5-Plack>=0:www/p5-Plack -USES= apache:run,2.2+ mysql perl5 +USES= apache:run mysql perl5 NO_ARCH= yes NO_BUILD= yes SUB_FILES= pkg-message diff --git a/net-mgmt/pandorafms_console/Makefile b/net-mgmt/pandorafms_console/Makefile --- a/net-mgmt/pandorafms_console/Makefile +++ b/net-mgmt/pandorafms_console/Makefile @@ -10,7 +10,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/twopi:graphics/graphviz -USES= apache:run,2.2+ php:web shebangfix +USES= apache:run php:web shebangfix SHEBANG_FILES= include/languages/extract_newlines.sh \ include/languages/util-all \ include/languages/util-bzr-update \ diff --git a/net/p5-Apache2-SOAP/Makefile b/net/p5-Apache2-SOAP/Makefile --- a/net/p5-Apache2-SOAP/Makefile +++ b/net/p5-Apache2-SOAP/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \ p5-SOAP-Lite>=0:net/p5-SOAP-Lite -USES= apache:2.2+ perl5 +USES= apache perl5 USE_PERL5= configure NO_ARCH= yes diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile --- a/net/prosearch/Makefile +++ b/net/prosearch/Makefile @@ -28,7 +28,6 @@ CRAWLER_DESC= With crawler (nmap, p5-libwww) SAMBA_DESC= crawler with SAMBA (file://) RSYNC_DESC= crawler with RSYNC -APACHE_DESC= With web server apache2.2+ MOD_PERL2_DESC= With MOD_PERL2 MOD_FASTCGI_DESC= With MOD_FASTCGI DB_DESC= With both database server and client @@ -59,7 +58,7 @@ .endif .if ${PORT_OPTIONS:MAPACHE} -USES+= apache:run,2.2+ +USES+= apache:run .endif .if ${PORT_OPTIONS:MNGINX} diff --git a/security/maia/Makefile b/security/maia/Makefile --- a/security/maia/Makefile +++ b/security/maia/Makefile @@ -49,7 +49,6 @@ OPTIONS_DEFAULT= MYSQL CLAMAV DOCS SPAMASSASSIN BDB IPCOUNTRY \ DOMAINKEYS SPF DKIM FILE UNRAR ARJ LHA ARC CAB RPM ZOO -APACHE_DESC= Use Apache web server LIGHTTPD_DESC= Use LighTTPD web server NGINX_DESC= Use Nginx web server WEBHOST_DESC= PHP, PEAR, etc... for Maia web interface @@ -98,7 +97,7 @@ # setting USE_ variables. C'est la vie. .if ${PORT_OPTIONS:MAPACHE} -USES+= apache:run,2.4+ +USES+= apache:run .endif .if ${PORT_OPTIONS:MWEBHOST} diff --git a/security/openscep/Makefile b/security/openscep/Makefile --- a/security/openscep/Makefile +++ b/security/openscep/Makefile @@ -14,7 +14,7 @@ DEPRECATED= Do not support recent RFC 8894 EXPIRATION_DATE= 2023-03-31 -USES= apache:2.2+ gmake libtool ssl +USES= apache gmake libtool ssl BROKEN_SSL= base BROKEN_SSL_REASON= unexpected type name 'issuer_and_subject_t': expected expression IGNORE_SSL= libressl libressl-devel diff --git a/security/shibboleth-sp/Makefile b/security/shibboleth-sp/Makefile --- a/security/shibboleth-sp/Makefile +++ b/security/shibboleth-sp/Makefile @@ -47,7 +47,7 @@ FASTCGI_DESC= FastCGI protocol support, e.g. for NGINX APACHE_DESC= Build Apache module -APACHE_USES= apache:2.4+ +APACHE_USES= apache ODBC_CONFIGURE_ENABLE= odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile --- a/textproc/htdig/Makefile +++ b/textproc/htdig/Makefile @@ -35,7 +35,7 @@ OPTIONS_DEFINE= APACHE DOCS OPTIONS_DEFAULT= APACHE -APACHE_USE= APACHE=22+ +APACHE_USES= apache APACHE_CONFIGURE_ON= --with-apache=${LOCALBASE}/sbin PORTDOCS= * diff --git a/www/dojo/Makefile b/www/dojo/Makefile --- a/www/dojo/Makefile +++ b/www/dojo/Makefile @@ -21,7 +21,7 @@ .include .if ${PORT_OPTIONS:MAPACHE} -USES= apache:run,2.2+ cpe +USES= apache:run cpe CPE_VENDOR= linuxfoundation CONFDIR= ${PREFIX}/${CONFDIR_REL} CONFDIR_REL= ${APACHEETCDIR}/Includes diff --git a/www/formication/Makefile b/www/formication/Makefile --- a/www/formication/Makefile +++ b/www/formication/Makefile @@ -9,7 +9,7 @@ COMMENT= Formular processing tool written in perl WWW= http://www.villainy.com/developers.html -USES= apache:run,2.2+ perl5 +USES= apache:run perl5 USE_PERL5= run NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/www/fpc-httpd24/Makefile b/www/fpc-httpd24/Makefile --- a/www/fpc-httpd24/Makefile +++ b/www/fpc-httpd24/Makefile @@ -13,6 +13,6 @@ OPTIONS_DEFINE= APACHE24 APACHE24_DESC= Install apache24 server -APACHE24_USE= APACHE=24 +APACHE24_USES= apache:2.4 .include "${MASTERDIR}/Makefile" diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile --- a/www/gnome-user-share/Makefile +++ b/www/gnome-user-share/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_dnssd>=0:www/mod_dnssd \ console-kit-daemon:sysutils/consolekit2 -USES= apache:2.2+ gettext gmake gnome libtool pkgconfig tar:xz xorg +USES= apache gettext gmake gnome libtool pkgconfig tar:xz xorg USE_XORG= sm USE_GNOME= gnomeprefix gtk30 intlhack nautilus3 GNU_CONFIGURE= yes diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile --- a/www/libapreq2/Makefile +++ b/www/libapreq2/Makefile @@ -13,7 +13,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-apache2-apxs=${APXS} --with-expat=${LOCALBASE} INSTALL_TARGET= install-strip -USES= apache:2.2+ cpe libtool +USES= apache cpe libtool CPE_VENDOR= apache USE_LDCONFIG= yes diff --git a/www/mod_amazon_proxy/Makefile b/www/mod_amazon_proxy/Makefile --- a/www/mod_amazon_proxy/Makefile +++ b/www/mod_amazon_proxy/Makefile @@ -10,7 +10,7 @@ LIB_DEPENDS= libapreq2.so:www/libapreq2 -USES= apache:2.2+ +USES= apache AP_FAST_BUILD= yes AP_LIB= ${LOCALBASE}/lib -lcrypto diff --git a/www/mod_asn/Makefile b/www/mod_asn/Makefile --- a/www/mod_asn/Makefile +++ b/www/mod_asn/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 -USES= apache:2.2+ +USES= apache AP_FAST_BUILD= yes MANUAL_PACKAGE_BUILD= devel/apr1 with pgsql option required diff --git a/www/mod_auth_cas/Makefile b/www/mod_auth_cas/Makefile --- a/www/mod_auth_cas/Makefile +++ b/www/mod_auth_cas/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre.so:devel/pcre -USES= apache:2.4 ssl +USES= apache ssl USE_GITHUB= yes GH_ACCOUNT= Jasig diff --git a/www/mod_auth_cookie_mysql2/Makefile b/www/mod_auth_cookie_mysql2/Makefile --- a/www/mod_auth_cookie_mysql2/Makefile +++ b/www/mod_auth_cookie_mysql2/Makefile @@ -10,7 +10,7 @@ COMMENT= Allows authentication against MySQL database via secure cookie WWW= http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/ -USES= apache:2.2+ mysql +USES= apache mysql AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_auth_gssapi/Makefile b/www/mod_auth_gssapi/Makefile --- a/www/mod_auth_gssapi/Makefile +++ b/www/mod_auth_gssapi/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf apache:2.4+ bison gssapi:mit,flags libtool ssl +USES= autoreconf apache bison gssapi:mit,flags libtool ssl USES+= pkgconfig USE_GITHUB= yes GH_ACCOUNT= gssapi diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile --- a/www/mod_auth_kerb2/Makefile +++ b/www/mod_auth_kerb2/Makefile @@ -17,7 +17,7 @@ PORTSCOUT= limit:^5.4 -USES= apache:2.2+ +USES= apache GNU_CONFIGURE= yes CONFIGURE_ARGS= -with-krb5=${GSSAPIBASEDIR} --without-krb4 diff --git a/www/mod_auth_mellon/Makefile b/www/mod_auth_mellon/Makefile --- a/www/mod_auth_mellon/Makefile +++ b/www/mod_auth_mellon/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ liblasso.so:security/lasso -USES= apache:2.2+ autoreconf cpe gettext-runtime gnome libtool \ +USES= apache autoreconf cpe gettext-runtime gnome libtool \ pkgconfig ssl USE_GNOME= glib20 USE_GITHUB= yes diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile --- a/www/mod_auth_mysql2/Makefile +++ b/www/mod_auth_mysql2/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -USES= apache:2.2+ mysql tar:tgz +USES= apache mysql tar:tgz WRKSRC= ${WRKDIR}/${PORTNAME} AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile --- a/www/mod_auth_mysql_another/Makefile +++ b/www/mod_auth_mysql_another/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE10 -USES= apache:2.2+ mysql +USES= apache mysql SHORTMODNAME= mysql_auth AP_FAST_BUILD= yes diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile --- a/www/mod_auth_openid/Makefile +++ b/www/mod_auth_openid/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libopkele.so:devel/libopkele \ libsqlite3.so:databases/sqlite3 -USES= apache:2.2+ autoreconf cpe gmake libtool pkgconfig +USES= apache autoreconf cpe gmake libtool pkgconfig USE_GITHUB= yes GH_ACCOUNT= bmuller diff --git a/www/mod_auth_openidc/Makefile b/www/mod_auth_openidc/Makefile --- a/www/mod_auth_openidc/Makefile +++ b/www/mod_auth_openidc/Makefile @@ -16,7 +16,7 @@ libjansson.so:devel/jansson \ libpcre.so:devel/pcre -USES= apache:2.2+ autoreconf cpe gmake libtool pkgconfig ssl +USES= apache autoreconf cpe gmake libtool pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= pingidentity CPE_VENDOR= ${GH_ACCOUNT} diff --git a/www/mod_auth_pam2/Makefile b/www/mod_auth_pam2/Makefile --- a/www/mod_auth_pam2/Makefile +++ b/www/mod_auth_pam2/Makefile @@ -11,7 +11,7 @@ COMMENT= Allows users to use PAM modules for user authentication WWW= http://pam.sourceforge.net/mod_auth_pam/ -USES= apache:2.2+ +USES= apache WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= *.html diff --git a/www/mod_auth_pgsql2/Makefile b/www/mod_auth_pgsql2/Makefile --- a/www/mod_auth_pgsql2/Makefile +++ b/www/mod_auth_pgsql2/Makefile @@ -9,7 +9,7 @@ COMMENT= Allows users to use PostgreSQL databases for user authentication WWW= http://www.giuseppetanzilli.it/mod_auth_pgsql2/ -USES= apache:2.2+ pgsql +USES= apache pgsql AP_INC?= ${LOCALBASE}/include AP_LIB?= ${LOCALBASE}/lib -lpq diff --git a/www/mod_auth_pubtkt/Makefile b/www/mod_auth_pubtkt/Makefile --- a/www/mod_auth_pubtkt/Makefile +++ b/www/mod_auth_pubtkt/Makefile @@ -9,17 +9,11 @@ COMMENT= Apache module to provide public key ticket based authentication WWW= https://neon1.net/mod_auth_pubtkt/ -USES= apache:2.2+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= src/mod_auth_pubtkt.c -.include - -.if ${APACHE_VERSION} > 2.2 AP_EXTRAS= -DAPACHE24 -.else -AP_EXTRAS= -DAPACHE22 -.endif -.include +.include diff --git a/www/mod_auth_tkt/Makefile b/www/mod_auth_tkt/Makefile --- a/www/mod_auth_tkt/Makefile +++ b/www/mod_auth_tkt/Makefile @@ -9,7 +9,7 @@ COMMENT= Lightweight single-sign-on authentication module for apache WWW= http://www.openfusion.com.au/labs/mod_auth_tkt/ -USES= apache:2.2+ shebangfix +USES= apache shebangfix SHEBANG_FILES= ../cgi/login.cgi \ ../cgi/logout.cgi WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src diff --git a/www/mod_auth_xradius/Makefile b/www/mod_auth_xradius/Makefile --- a/www/mod_auth_xradius/Makefile +++ b/www/mod_auth_xradius/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -USES= apache:2.2+ tar:bzip2 +USES= apache tar:bzip2 GNU_CONFIGURE= yes # Seems dead upstream. Don't expect a proper fix. CFLAGS+= -fcommon diff --git a/www/mod_authn_dovecot/Makefile b/www/mod_authn_dovecot/Makefile --- a/www/mod_authn_dovecot/Makefile +++ b/www/mod_authn_dovecot/Makefile @@ -9,7 +9,7 @@ LICENSE= APACHE20 -USES= apache:2.4 +USES= apache USE_GITHUB= yes GH_ACCOUNT= bmanojlovic diff --git a/www/mod_authnz_external24/Makefile b/www/mod_authnz_external24/Makefile --- a/www/mod_authnz_external24/Makefile +++ b/www/mod_authnz_external24/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -USES= apache:2.4 cpe +USES= apache cpe CPE_VENDOR= ${PORTNAME}_project AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_cfg_ldap/Makefile b/www/mod_cfg_ldap/Makefile --- a/www/mod_cfg_ldap/Makefile +++ b/www/mod_cfg_ldap/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE -USES= apache:2.2+ +USES= apache USE_OPENLDAP= yes AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_cloudflare/Makefile b/www/mod_cloudflare/Makefile --- a/www/mod_cloudflare/Makefile +++ b/www/mod_cloudflare/Makefile @@ -14,7 +14,7 @@ GH_ACCOUNT= cloudflare GH_TAGNAME= 98ab38a -USES= apache:2.4+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes SHORTMODNAME= cloudflare diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile --- a/www/mod_dav_svn/Makefile +++ b/www/mod_dav_svn/Makefile @@ -7,7 +7,7 @@ COMMENT= Apache module for subversion serving WWW= https://subversion.apache.org/ -USES= apache:2.2+ +USES= apache .include "${.CURDIR}/../../devel/subversion/Makefile.addons" diff --git a/www/mod_defensible/Makefile b/www/mod_defensible/Makefile --- a/www/mod_defensible/Makefile +++ b/www/mod_defensible/Makefile @@ -9,7 +9,7 @@ LICENSE= APACHE20 -USES= apache:2.4+ +USES= apache USE_GITHUB= yes GH_ACCOUNT= jd diff --git a/www/mod_dnssd/Makefile b/www/mod_dnssd/Makefile --- a/www/mod_dnssd/Makefile +++ b/www/mod_dnssd/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libavahi-client.so:net/avahi-app -USES= apache:2.2+ gmake pkgconfig +USES= apache gmake pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= APR_CFLAGS="`${LOCALBASE}/bin/apr-1-config --cflags --cppflags --includes`" \ APR_LIBS="`${LOCALBASE}/bin/apr-1-config --ldflags`" diff --git a/www/mod_evasive/Makefile b/www/mod_evasive/Makefile --- a/www/mod_evasive/Makefile +++ b/www/mod_evasive/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= apache:2.2+ +USES= apache USE_GITHUB= yes GH_ACCOUNT= jzdziarski diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile --- a/www/mod_fastcgi/Makefile +++ b/www/mod_fastcgi/Makefile @@ -7,7 +7,7 @@ COMMENT= Apache 2.4 fast-cgi module WWW= https://github.com/FastCGI-Archives/mod_fastcgi -USES= apache:2.4+ +USES= apache USE_GITHUB= yes GH_ACCOUNT= FastCGI-Archives diff --git a/www/mod_fcgid/Makefile b/www/mod_fcgid/Makefile --- a/www/mod_fcgid/Makefile +++ b/www/mod_fcgid/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -USES= apache:2.2+ cpe +USES= apache cpe CPE_VENDOR= apache HAS_CONFIGURE= yes diff --git a/www/mod_fileiri/Makefile b/www/mod_fileiri/Makefile --- a/www/mod_fileiri/Makefile +++ b/www/mod_fileiri/Makefile @@ -12,7 +12,7 @@ #LICENSE= AL11 -USES= apache:2.2+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile --- a/www/mod_gnutls/Makefile +++ b/www/mod_gnutls/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libgnutls.so:security/gnutls GNU_CONFIGURE= yes -USES= apache:2.4 compiler:c++11-lang cpe libtool pkgconfig python:3.7+ tar:bzip2 +USES= apache compiler:c++11-lang cpe libtool pkgconfig python:3.7+ tar:bzip2 CPE_VENDOR= ${PORTNAME}_project BINARY_ALIAS= python3=${PYTHON_CMD} python=${PYTHON_CMD} diff --git a/www/mod_h264_streaming/Makefile b/www/mod_h264_streaming/Makefile --- a/www/mod_h264_streaming/Makefile +++ b/www/mod_h264_streaming/Makefile @@ -18,7 +18,7 @@ LICENSE_TEXT= No commercial use LICENSE_PERMS= auto-accept -USES= apache:2.2+ +USES= apache GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs="${APXS}" diff --git a/www/mod_http2/Makefile b/www/mod_http2/Makefile --- a/www/mod_http2/Makefile +++ b/www/mod_http2/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libnghttp2.so:www/libnghttp2 -USES= apache:2.4+ libtool ssl pkgconfig +USES= apache libtool ssl pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-curl diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile --- a/www/mod_jk/Makefile +++ b/www/mod_jk/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -USES= apache:2.2+ gmake +USES= apache gmake APACHE_VER= 2.0 GNU_CONFIGURE= yes diff --git a/www/mod_limitipconn2/Makefile b/www/mod_limitipconn2/Makefile --- a/www/mod_limitipconn2/Makefile +++ b/www/mod_limitipconn2/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= apache:2.2+ tar:bzip2 +USES= apache tar:bzip2 AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_maxminddb/Makefile b/www/mod_maxminddb/Makefile --- a/www/mod_maxminddb/Makefile +++ b/www/mod_maxminddb/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb -USES= apache:2.4+ autoreconf compiler:c11 gmake localbase +USES= apache autoreconf compiler:c11 gmake localbase GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= maxmind diff --git a/www/mod_memcache/Makefile b/www/mod_memcache/Makefile --- a/www/mod_memcache/Makefile +++ b/www/mod_memcache/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= apache:2.2+ +USES= apache USE_GITHUB= yes GH_ACCOUNT= joshrotenberg GH_PROJECT= modmemcache diff --git a/www/mod_memcache_block/Makefile b/www/mod_memcache_block/Makefile --- a/www/mod_memcache_block/Makefile +++ b/www/mod_memcache_block/Makefile @@ -13,7 +13,7 @@ USE_GITHUB= yes GH_ACCOUNT= gaod -USES= apache:2.4+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes AP_INC= ${LOCALBASE}/include/libmemcached diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile --- a/www/mod_mono/Makefile +++ b/www/mod_mono/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= xsp:www/xsp RUN_DEPENDS= xsp:www/xsp -USES= apache:2.2+ libtool mono pkgconfig +USES= apache libtool mono pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static --man=${PREFIX}/man diff --git a/www/mod_mpm_itk/Makefile b/www/mod_mpm_itk/Makefile --- a/www/mod_mpm_itk/Makefile +++ b/www/mod_mpm_itk/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 -USES= apache:2.4 +USES= apache GNU_CONFIGURE= yes AP_FAST_BUILD= yes diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile --- a/www/mod_perl2/Makefile +++ b/www/mod_perl2/Makefile @@ -20,7 +20,7 @@ SUB_FILES= pkg-message ${APMOD_FILE} SUB_LIST= APACHEMODDIR=${APACHEMODDIR} -USES= apache:2.2+ cpe gmake perl5 +USES= apache cpe gmake perl5 USE_PERL5= configure USE_CSTD= gnu89 CPE_VENDOR= apache @@ -55,7 +55,7 @@ PLIST_SUB+= ITHREADS="" .else PLIST_SUB+= ITHREADS="@comment " -. if !${APACHE_VERSION:M22} +. if ${APACHE_VERSION:M24} IGNORE= requires PERL with "THREADS=on", please rebuild PERL and all depending ports . endif .endif diff --git a/www/mod_qos/Makefile b/www/mod_qos/Makefile --- a/www/mod_qos/Makefile +++ b/www/mod_qos/Makefile @@ -12,7 +12,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre -USES= apache:2.2+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_realdoc/Makefile b/www/mod_realdoc/Makefile --- a/www/mod_realdoc/Makefile +++ b/www/mod_realdoc/Makefile @@ -8,7 +8,7 @@ LICENSE= MIT -USES= apache:2.2+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes USE_GITHUB= yes diff --git a/www/mod_reproxy/Makefile b/www/mod_reproxy/Makefile --- a/www/mod_reproxy/Makefile +++ b/www/mod_reproxy/Makefile @@ -11,7 +11,7 @@ WRKSRC= ${WRKDIR}/lestrrat-mod_reproxy-0f945ff -USES= apache:2.2+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile --- a/www/mod_rivet/Makefile +++ b/www/mod_rivet/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libitcl.so:lang/itcl -USES+= apache:2.2-2.4 compiler:c11 gmake \ +USES= apache compiler:c11 gmake \ libtool tcl:86+,tea USE_LDCONFIG= ${PREFIX}/lib/rivet diff --git a/www/mod_rpaf2/Makefile b/www/mod_rpaf2/Makefile --- a/www/mod_rpaf2/Makefile +++ b/www/mod_rpaf2/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -USES= apache:2.4+ cpe +USES= apache cpe CPE_VENDOR= thomas_eibner diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile --- a/www/mod_scgi/Makefile +++ b/www/mod_scgi/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE.txt -USES= apache:2.4 +USES= apache SCGI_DIR= apache2 WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR} diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile --- a/www/mod_security/Makefile +++ b/www/mod_security/Makefile @@ -19,7 +19,7 @@ libgdbm.so:databases/gdbm \ libexpat.so:textproc/expat2 -USES= apache:2.4+ bdb gnome perl5 pkgconfig shebangfix +USES= apache bdb gnome perl5 pkgconfig shebangfix USE_GNOME= libxml2 GNU_CONFIGURE= yes SHEBANG_FILES= tools/rules-updater.pl.in mlogc/mlogc-batch-load.pl.in diff --git a/www/mod_setenvifplus/Makefile b/www/mod_setenvifplus/Makefile --- a/www/mod_setenvifplus/Makefile +++ b/www/mod_setenvifplus/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/doc/LICENSE.txt -USES= apache:2.4 +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= ${WRKSRC}/apache2/${MODULENAME}.c diff --git a/www/mod_tidy/Makefile b/www/mod_tidy/Makefile --- a/www/mod_tidy/Makefile +++ b/www/mod_tidy/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libtidy.so:www/tidy-lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USES= apache:2.2+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes AP_INC+= ${LOCALBASE}/include/tidy diff --git a/www/mod_umask/Makefile b/www/mod_umask/Makefile --- a/www/mod_umask/Makefile +++ b/www/mod_umask/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -USES= apache:2.2+ tar:bzip2 +USES= apache tar:bzip2 GNU_CONFIGURE= yes AP_FAST_BUILD= yes diff --git a/www/mod_webauth/Makefile b/www/mod_webauth/Makefile --- a/www/mod_webauth/Makefile +++ b/www/mod_webauth/Makefile @@ -12,7 +12,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libsasl2.so:security/cyrus-sasl2 -USES= apache:2.4 libtool pathfix pkgconfig ssl +USES= apache libtool pathfix pkgconfig ssl USE_OPENLDAP= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/www/mod_webkit/Makefile b/www/mod_webkit/Makefile --- a/www/mod_webkit/Makefile +++ b/www/mod_webkit/Makefile @@ -12,7 +12,7 @@ GH_ACCOUNT= Cito GH_PROJECT= w4py -USES= apache:2.4+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes AP_EXTRAS= marshal.c diff --git a/www/mod_wsgi4/Makefile b/www/mod_wsgi4/Makefile --- a/www/mod_wsgi4/Makefile +++ b/www/mod_wsgi4/Makefile @@ -10,7 +10,7 @@ LICENSE= APACHE20 -USES= apache:2.4+ cpe gettext python:3.6-3.11 +USES= apache cpe gettext python:3.6-3.11 USE_PYTHON= flavors CPE_VENDOR= modwsgi diff --git a/www/mod_xsendfile/Makefile b/www/mod_xsendfile/Makefile --- a/www/mod_xsendfile/Makefile +++ b/www/mod_xsendfile/Makefile @@ -10,7 +10,7 @@ LICENSE= APACHE20 -USES= apache:2.2+ +USES= apache AP_FAST_BUILD= yes AP_GENPLIST= yes USE_GITHUB= yes diff --git a/www/mythplugin-mythweb/Makefile b/www/mythplugin-mythweb/Makefile --- a/www/mythplugin-mythweb/Makefile +++ b/www/mythplugin-mythweb/Makefile @@ -30,7 +30,7 @@ OPTIONS_DEFINE= APACHE LIGHTTPD NGINX OPTIONS_DEFAULT= APACHE -APACHE_USES= apache:2.2+ +APACHE_USES= apache LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd NGINX_DESC= Nginx server support NGINX_RUN_DEPENDS= nginx:www/nginx diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile --- a/www/nibbleblog/Makefile +++ b/www/nibbleblog/Makefile @@ -23,7 +23,7 @@ OPTIONS_DEFINE= APACHE LIGHTTPD OPTIONS_DEFAULT= APACHE -APACHE_USE= APACHE_RUN=22+ +APACHE_USES= apache:run LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd do-install: diff --git a/www/otrs/Makefile b/www/otrs/Makefile --- a/www/otrs/Makefile +++ b/www/otrs/Makefile @@ -107,7 +107,7 @@ APACHE_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2 \ p5-Apache-DBI>0:www/p5-Apache-DBI -APACHE_USES= apache:run,2.2+ +APACHE_USES= apache:run REPORTS_RUN_DEPENDS= p5-GD>=0:graphics/p5-GD \ p5-GD-Graph>=0:graphics/p5-GD-Graph \ diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile --- a/www/p5-Apache-AuthCookie/Makefile +++ b/www/p5-Apache-AuthCookie/Makefile @@ -20,7 +20,7 @@ p5-URI>=1.36:net/p5-URI \ p5-WWW-Form-UrlEncoded>=0:www/p5-WWW-Form-UrlEncoded -USES= apache:2.2+ perl5 +USES= apache perl5 USE_PERL5= configure NO_ARCH= yes diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile --- a/www/p5-Apache-AuthTicket/Makefile +++ b/www/p5-Apache-AuthTicket/Makefile @@ -23,7 +23,7 @@ p5-SQL-Abstract>=0:databases/p5-SQL-Abstract NO_ARCH= yes -USES= apache:2.2+ perl5 +USES= apache perl5 USE_PERL5= configure # Remove README.apache-2.4.pod to avoid conflicts with p5-Apache-AuthCookie diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile --- a/www/p5-Apache-Clean2/Makefile +++ b/www/p5-Apache-Clean2/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \ p5-HTML-Clean>=0.8:www/p5-HTML-Clean -USES= apache:2.2+ perl5 +USES= apache perl5 USE_PERL5= configure DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile --- a/www/p5-Apache-DB/Makefile +++ b/www/p5-Apache-DB/Makefile @@ -14,7 +14,7 @@ RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 -USES= apache:run,2.2+ perl5 +USES= apache:run perl5 USE_PERL5= configure post-install: diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile --- a/www/p5-Apache-DBI/Makefile +++ b/www/p5-Apache-DBI/Makefile @@ -18,7 +18,7 @@ CONFLICTS= p5-Apache-DBI-mp[12]* -USES= apache:2.2+ perl5 +USES= apache perl5 USE_PERL5= configure .include diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile --- a/www/p5-Apache-MP3/Makefile +++ b/www/p5-Apache-MP3/Makefile @@ -16,7 +16,7 @@ p5-Ogg-Vorbis-Header>=0:audio/p5-Ogg-Vorbis-Header \ ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 -USES= apache:2.2+ perl5 +USES= apache perl5 USE_PERL5= configure NO_ARCH= yes diff --git a/www/p5-Apache-ParseFormData/Makefile b/www/p5-Apache-ParseFormData/Makefile --- a/www/p5-Apache-ParseFormData/Makefile +++ b/www/p5-Apache-ParseFormData/Makefile @@ -12,7 +12,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 -USES= apache:2.2+ perl5 +USES= apache perl5 USE_PERL5= configure post-patch: diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile --- a/www/p5-CGI-SpeedyCGI/Makefile +++ b/www/p5-CGI-SpeedyCGI/Makefile @@ -20,7 +20,7 @@ APACHE_DESC= Build mod_speedycgi OPTIONS_SUB= yes -APACHE_USE= APACHE=22+ +APACHE_USES= apache APACHE_CONFIGURE_ENV_OFF= WITHOUT_APACHE=yes post-patch: diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile --- a/www/p5-HTML-Mason/Makefile +++ b/www/p5-HTML-Mason/Makefile @@ -32,7 +32,7 @@ MODPERL_BUILD_DEPENDS= p5-libapreq2>=0:www/p5-libapreq2 MODPERL_RUN_DEPENDS= p5-libapreq2>=0:www/p5-libapreq2 -MODPERL_USE= APACHE_RUN=22+ +MODPERL_USES= apache:run post-patch: @${REINPLACE_CMD} -e '/bin\/convert/d' ${WRKSRC}/Makefile.PL diff --git a/www/p5-MasonX-WebApp/Makefile b/www/p5-MasonX-WebApp/Makefile --- a/www/p5-MasonX-WebApp/Makefile +++ b/www/p5-MasonX-WebApp/Makefile @@ -20,7 +20,7 @@ TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \ p5-Test-Output>=0:devel/p5-Test-Output -USES= apache:run,2.2+ perl5 +USES= apache:run perl5 USE_PERL5= modbuild .include diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile --- a/www/p5-Maypole/Makefile +++ b/www/p5-Maypole/Makefile @@ -60,7 +60,7 @@ PORTDOCS= * PORTEXAMPLES= * -MODPERL2_USE= APACHE_RUN=22+ +MODPERL2_USES= apache:run MODPERL2_BUILD_DEPENDS= p5-libapreq2>=0:www/p5-libapreq2 post-install: diff --git a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile --- a/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile +++ b/www/p5-Text-MultiMarkdown-ApacheHandler/Makefile @@ -14,7 +14,7 @@ p5-Text-Typography>=0:textproc/p5-Text-Typography \ ${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2 -USES= apache:run,2.2+ perl5 +USES= apache:run perl5 USE_PERL5= configure SUB_FILES= pkg-message diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile --- a/www/p5-libapreq2/Makefile +++ b/www/p5-libapreq2/Makefile @@ -15,7 +15,7 @@ CONFIGURE_ARGS= --with-apache2-apxs=${APXS} \ --with-expat=${LOCALBASE} \ --enable-perl-glue --with-perl=${PERL} -USES= apache:2.2+ cpe libtool perl5 +USES= apache cpe libtool perl5 CPE_VENDOR= apache USE_PERL5= run USE_LDCONFIG= yes diff --git a/www/rt44/Makefile b/www/rt44/Makefile --- a/www/rt44/Makefile +++ b/www/rt44/Makefile @@ -67,7 +67,7 @@ AP_MODPERL_RUN_DEPENDS= ${MODPERL2_DEPS} AP_MODFASTCGI_DESC= Deploy with apache and mod_fastcgi -AP_MODFASTCGI_USE= APACHE_RUN=22+ +AP_MODFASTCGI_USES= apache:run AP_MODFASTCGI_RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi \ ${FASTCGI_DEPS} diff --git a/www/rt50/Makefile b/www/rt50/Makefile --- a/www/rt50/Makefile +++ b/www/rt50/Makefile @@ -68,7 +68,7 @@ AP_MODPERL_RUN_DEPENDS= ${MODPERL2_DEPS} AP_MODFASTCGI_DESC= Deploy with apache and mod_fastcgi -AP_MODFASTCGI_USE= APACHE_RUN=22+ +AP_MODFASTCGI_USES= apache:run AP_MODFASTCGI_RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:www/mod_fastcgi \ ${FASTCGI_DEPS} diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile --- a/www/rubygem-passenger/Makefile +++ b/www/rubygem-passenger/Makefile @@ -30,7 +30,7 @@ SYMLINK_DESC= Create passenger symlink .if ${FLAVOR} == apache -USES+= apache:2.2+ +USES+= apache .endif RAKE_BIN= ${LOCALBASE}/bin/rake diff --git a/www/suphp/Makefile b/www/suphp/Makefile --- a/www/suphp/Makefile +++ b/www/suphp/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= apache:2.2+ autoreconf cpe libtool php:cgi,flavors +USES= apache autoreconf cpe libtool php:cgi,flavors SUB_FILES= pkg-message CFLAGS+= -I${LOCALBASE}/include diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile --- a/www/thundercache/Makefile +++ b/www/thundercache/Makefile @@ -41,7 +41,7 @@ WRKSRC= ${WRKDIR}/thunder .if ${PORT_OPTIONS:MAPACHE} -USES+= apache:run,2.2+ +USES+= apache:run .endif .if ${PORT_OPTIONS:MPGSQL} diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile --- a/www/thundersnarf/Makefile +++ b/www/thundersnarf/Makefile @@ -29,7 +29,7 @@ .include .if ${PORT_OPTIONS:MAPACHE} -USES+= apache:run,2.2+ +USES+= apache:run .endif .if ${PORT_OPTIONS:MPGSQL}