From owner-svn-ports-all@FreeBSD.ORG Sat Aug 18 14:29:12 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE35B106566C; Sat, 18 Aug 2012 14:29:12 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8B8728FC14; Sat, 18 Aug 2012 14:29:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7IETCbB038589; Sat, 18 Aug 2012 14:29:12 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7IETB8B038505; Sat, 18 Aug 2012 14:29:11 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201208181429.q7IETB8B038505@svn.freebsd.org> From: Olli Hauer Date: Sat, 18 Aug 2012 14:29:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302724 - in head: . databases/gnatsweb4 databases/mysqlard databases/mysqldumper deskutils/myitcrm deskutils/phpcollab deskutils/simplegroupware deskutils/surrealtodo devel devel/apr0 ... X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2012 14:29:13 -0000 Author: ohauer Date: Sat Aug 18 14:29:08 2012 New Revision: 302724 URL: http://svn.freebsd.org/changeset/ports/302724 Log: - remove www/apache20 and devel/apr0 - s/USE_APACHE= 20+/USE_APACHE= 22+/ - unify s/YES/yes/ - cleanup APACHE_VERSION <= 22 usage - add entry to MOVED with hat apache@ Deleted: head/devel/apr0/ head/www/apache20/ head/www/mod_encoding/files/apache20_patch head/www/mod_encoding/files/queryfix-patch13 Modified: head/MOVED head/databases/gnatsweb4/Makefile head/databases/mysqlard/Makefile head/databases/mysqldumper/Makefile head/deskutils/myitcrm/Makefile head/deskutils/phpcollab/Makefile head/deskutils/simplegroupware/Makefile head/deskutils/surrealtodo/Makefile head/devel/Makefile head/devel/bugzilla/Makefile head/devel/bugzilla3/Makefile head/devel/bugzilla42/Makefile head/devel/otrs/Makefile head/devel/p5-Log-Dispatch/Makefile head/devel/pushmi/Makefile head/devel/subversion/Makefile.common head/devel/subversion16/Makefile.common head/devel/viewvc/Makefile head/french/facturier/Makefile head/games/hlstatsx/Makefile head/graphics/mapserver/Makefile head/lang/php5/Makefile head/lang/php52/Makefile head/lang/php53/Makefile head/mail/dracmail/Makefile head/mail/dspam-devel/Makefile head/mail/dspam/Makefile head/mail/p5-qpsmtpd/Makefile head/mail/sympa/Makefile head/mail/vqregister/Makefile head/misc/instant-server/Makefile head/net-mgmt/argus-monitor/Makefile head/net-mgmt/netdisco/Makefile head/net-mgmt/ocsinventory-ng/Makefile head/net-mgmt/ourmon/Makefile head/net-mgmt/pandorafms_console/Makefile head/net-p2p/rtgui/Makefile head/net/p5-Apache2-SOAP/Makefile head/net/prosearch/Makefile head/ports-mgmt/tinderbox-devel/Makefile head/ports-mgmt/tinderbox/Makefile head/print/openprinting/Makefile head/security/maia/Makefile head/security/openscep/Makefile head/security/phpdeadlock/Makefile head/security/shibboleth2-sp/Makefile head/sysutils/dtc/Makefile head/sysutils/froxlor/Makefile head/textproc/htdig/Makefile head/www/MT/Makefile head/www/Makefile head/www/blogsum/Makefile head/www/cakephp11/Makefile head/www/cakephp12/Makefile head/www/cakephp13/Makefile head/www/cakephp2/Makefile head/www/cas/Makefile head/www/codeigniter/Makefile head/www/codeigniter17/Makefile head/www/dansguardian-devel/Makefile head/www/dansguardian/Makefile head/www/dojo/Makefile head/www/dotproject/Makefile head/www/dpsearch/Makefile head/www/formication/Makefile head/www/foswiki/Makefile head/www/ftasv/Makefile head/www/libapreq2/Makefile head/www/mimetex/Makefile head/www/mod_antiloris/Makefile head/www/mod_asn/Makefile head/www/mod_auth_cas/Makefile head/www/mod_auth_cookie_mysql2/Makefile head/www/mod_auth_cookie_mysql2/distinfo head/www/mod_auth_external2/Makefile head/www/mod_auth_external2/distinfo head/www/mod_auth_form/Makefile head/www/mod_auth_imap2/Makefile head/www/mod_auth_imap2/distinfo head/www/mod_auth_kerb2/Makefile head/www/mod_auth_mysql2/Makefile head/www/mod_auth_mysql_another/Makefile head/www/mod_auth_openid/Makefile head/www/mod_auth_pam2/Makefile head/www/mod_auth_pgsql2/Makefile head/www/mod_auth_pubtkt/Makefile head/www/mod_auth_tkt/Makefile head/www/mod_auth_xradius/Makefile head/www/mod_authn_sasl/Makefile head/www/mod_authnz_external/Makefile head/www/mod_authnz_external/distinfo head/www/mod_authz_unixgroup/Makefile head/www/mod_backtrace/Makefile head/www/mod_bw/Makefile head/www/mod_cband/Makefile head/www/mod_cfg_ldap/Makefile head/www/mod_chroot/Makefile head/www/mod_cplusplus/Makefile head/www/mod_cvs2/Makefile head/www/mod_domaintree/Makefile head/www/mod_encoding/Makefile head/www/mod_evasive/Makefile head/www/mod_extract_forwarded/Makefile head/www/mod_fastcgi/Makefile head/www/mod_fcgid/Makefile head/www/mod_fileiri/Makefile head/www/mod_flickr/Makefile head/www/mod_ftp/Makefile head/www/mod_geoip2/Makefile head/www/mod_gnutls/Makefile head/www/mod_gzip2/Makefile head/www/mod_h264_streaming/Makefile head/www/mod_h264_streaming/distinfo head/www/mod_hosts_access/Makefile head/www/mod_jail/Makefile head/www/mod_jk-apache2/Makefile head/www/mod_jk/Makefile head/www/mod_limitipconn2/Makefile head/www/mod_lisp2/Makefile head/www/mod_log_config-st/Makefile head/www/mod_log_firstbyte/Makefile head/www/mod_log_mysql/Makefile head/www/mod_log_sql2/Makefile head/www/mod_macro22/Makefile head/www/mod_mono/Makefile head/www/mod_musicindex/Makefile head/www/mod_ntlm2/Makefile head/www/mod_perl2/Makefile head/www/mod_proctitle/Makefile head/www/mod_proxy_html/Makefile head/www/mod_proxy_xml/Makefile head/www/mod_remoteip/Makefile head/www/mod_reproxy/Makefile head/www/mod_rpaf2/Makefile head/www/mod_ruby/Makefile head/www/mod_scgi/Makefile head/www/mod_security/Makefile head/www/mod_security21/Makefile head/www/mod_setenvifplus/Makefile head/www/mod_smooth_streaming/Makefile head/www/mod_smooth_streaming/distinfo head/www/mod_tidy/Makefile head/www/mod_tsa/Makefile head/www/mod_vhost_ldap/Makefile head/www/mod_webkit/Makefile head/www/mod_whatkilledus/Makefile head/www/mod_wsgi/Makefile head/www/mod_wsgi3/Makefile head/www/mod_xml2enc/Makefile head/www/mod_xmlns/Makefile head/www/mod_xsendfile/Makefile head/www/mythplugin-mythweb/Makefile head/www/nibbleblog/Makefile head/www/ocaml-net/Makefile head/www/p5-Apache-AuthCookie/Makefile head/www/p5-Apache-AuthTicket/Makefile head/www/p5-Apache-Clean2/Makefile head/www/p5-Apache-DB/Makefile head/www/p5-Apache-DBI/Makefile head/www/p5-Apache-Gallery/Makefile head/www/p5-Apache-GopherHandler/Makefile head/www/p5-Apache-MP3/Makefile head/www/p5-Apache-ParseFormData/Makefile head/www/p5-Apache2-Scoreboard/Makefile head/www/p5-Bundle-Sledge/Makefile head/www/p5-CGI-SpeedyCGI/Makefile head/www/p5-HTML-Mason/Makefile head/www/p5-MasonX-WebApp/Makefile head/www/p5-Maypole/Makefile head/www/photo_gallery/Makefile head/www/phpscheduleit/Makefile head/www/prado/Makefile head/www/rt38/Makefile head/www/rt40/Makefile head/www/sams/Makefile head/www/siteframe/Makefile head/www/suphp/Makefile head/www/thundercache/Makefile head/www/thundersnarf/Makefile head/www/webcalendar-devel/Makefile head/www/webobjects/Makefile head/www/websh/Makefile head/www/wwwstat/Makefile head/www/yahoo-ui/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sat Aug 18 12:33:38 2012 (r302723) +++ head/MOVED Sat Aug 18 14:29:08 2012 (r302724) @@ -3639,3 +3639,5 @@ sysutils/cfengine|sysutils/cfengine22|20 sysutils/cfengine-legacy|sysutils/cfengine32|2012-08-14|Standardize port naming sysutils/cfengine3|sysutils/cfengine33|2012-08-14|Standardize port naming lang/erlang-lite|lang/erlang|2012-08-15|Redundant port removed +devel/apr0|devel/apr1|2012-08-18|Has expired +www/apache20|www/apache22|2012-08-18|Has expired Modified: head/databases/gnatsweb4/Makefile ============================================================================== --- head/databases/gnatsweb4/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/databases/gnatsweb4/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -18,7 +18,7 @@ RUN_DEPENDS= p5-MIME-Base64>=0:${PORTSDI MAKE_JOBS_SAFE= yes -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ USE_PERL5_RUN= yes NO_BUILD= yes Modified: head/databases/mysqlard/Makefile ============================================================================== --- head/databases/mysqlard/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/databases/mysqlard/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -17,7 +17,7 @@ COMMENT= A tool to collect and graph dat BUILD_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ USE_MYSQL= yes MYSQLARD_DIR?= ${PREFIX}/www/mysqlard Modified: head/databases/mysqldumper/Makefile ============================================================================== --- head/databases/mysqldumper/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/databases/mysqldumper/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -7,7 +7,7 @@ PORTNAME= mysqldumper PORTVERSION= 1.24.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= SF/${PORTNAME}/MySQLDumper/ DISTNAME= MySQLDumper${PORTVERSION} @@ -32,7 +32,7 @@ WWWGRP= ${WWWOWN} .include .if defined(WITH_APACHE) -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ .endif .if defined(WITH_LIGHTTPD) RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd Modified: head/deskutils/myitcrm/Makefile ============================================================================== --- head/deskutils/myitcrm/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/deskutils/myitcrm/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -43,7 +43,7 @@ WANT_PHP_CGI= yes .endif .if !defined(WITHOUT_APACHE) -USE_APACHE= 22+ +USE_APACHE_RUN= 22+ .endif .if defined(WITH_LIGHTTPD) RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd Modified: head/deskutils/phpcollab/Makefile ============================================================================== --- head/deskutils/phpcollab/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/deskutils/phpcollab/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -35,7 +35,7 @@ USE_PHP+= pgsql RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql .endif .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE= 22 +USE_APACHE_RUN= 22 .endif .if ${PORT_OPTIONS:MLIGHTTPD} RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd Modified: head/deskutils/simplegroupware/Makefile ============================================================================== --- head/deskutils/simplegroupware/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/deskutils/simplegroupware/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Simple Groupware is an open source enterprise application NO_BUILD= yes -USE_APACHE= 22 +USE_APACHE_RUN= 22 USE_MYSQL= yes USE_PHP= mysql Modified: head/deskutils/surrealtodo/Makefile ============================================================================== --- head/deskutils/surrealtodo/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/deskutils/surrealtodo/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -35,7 +35,7 @@ LIGHTTPD_DESC= Use Lighttpd webserver USE_PHP+= pgsql .endif .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE= 22 +USE_APACHE_RUN= 22 .endif .if ${PORT_OPTIONS:MLIGHTTPD} RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -46,7 +46,6 @@ SUBDIR += apache-ant SUBDIR += api-sanity-autotest SUBDIR += apiextractor - SUBDIR += apr0 SUBDIR += apr1 SUBDIR += apr2 SUBDIR += arduino Modified: head/devel/bugzilla/Makefile ============================================================================== --- head/devel/bugzilla/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/bugzilla/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -45,7 +45,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib .include .if ${PORT_OPTIONS:MMODPERL} -USE_APACHE_RUN= 20+ +USE_APACHE_RUN= 22+ .endif .include Modified: head/devel/bugzilla3/Makefile ============================================================================== --- head/devel/bugzilla3/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/bugzilla3/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -45,7 +45,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib .include .if ${PORT_OPTIONS:MMODPERL} -USE_APACHE_RUN= 20+ +USE_APACHE_RUN= 22+ .endif .include Modified: head/devel/bugzilla42/Makefile ============================================================================== --- head/devel/bugzilla42/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/bugzilla42/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -48,7 +48,7 @@ EMPTY_DIRS_LIST=data graphs contrib lib .include .if ${PORT_OPTIONS:MMODPERL} -USE_APACHE_RUN= 20+ +USE_APACHE_RUN= 22+ .endif .include Modified: head/devel/otrs/Makefile ============================================================================== --- head/devel/otrs/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/otrs/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -74,7 +74,7 @@ CLEAN_FILES= scripts/suse* scripts/redha var/httpd/htdocs/js/thirdparty/ckeditor-3.4.2/_source \ var/httpd/htdocs/skins/Agent/*/img/source -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ USE_PERL5= yes PLIST_SUB+= VER_CKEDITOR="3.6.3" Modified: head/devel/p5-Log-Dispatch/Makefile ============================================================================== --- head/devel/p5-Log-Dispatch/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/p5-Log-Dispatch/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -50,7 +50,7 @@ MAIL_SENDER_DESC= Mail::Sender support .include .if ${PORT_OPTIONS:MAPACHELOG} -USE_APACHE= 20+ +USE_APACHE= 22+ .endif .include Modified: head/devel/pushmi/Makefile ============================================================================== --- head/devel/pushmi/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/pushmi/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -30,7 +30,7 @@ BUILD_DEPENDS:= ${RUN_DEPENDS} \ ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 PERL_CONFIGURE= yes -USE_APACHE= 20+ +USE_APACHE= 22+ MAN3= Pushmi.3 \ Pushmi::Command::Mirror.3 \ Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/subversion/Makefile.common Sat Aug 18 14:29:08 2012 (r302724) @@ -94,16 +94,14 @@ SVNUSER?= svn .endif .if defined(WITH_APACHE) -USE_APACHE= 20+ +USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${APACHE_VERSION} > 20 LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 APR_CONFIG= ${LOCALBASE}/bin/apr-1-config APU_CONFIG= ${LOCALBASE}/bin/apu-1-config .else -LIB_DEPENDS+= apr-0:${PORTSDIR}/devel/apr0 -APR_CONFIG= ${LOCALBASE}/bin/apr-config -APU_CONFIG= ${LOCALBASE}/bin/apu-config +IGNORE= please update to apache22 .endif .else LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 Modified: head/devel/subversion16/Makefile.common ============================================================================== --- head/devel/subversion16/Makefile.common Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/subversion16/Makefile.common Sat Aug 18 14:29:08 2012 (r302724) @@ -91,16 +91,14 @@ SVNUSER?= svn .endif .if defined(WITH_APACHE) -USE_APACHE= 20+ +USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${APACHE_VERSION} > 20 LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 APR_CONFIG= ${LOCALBASE}/bin/apr-1-config APU_CONFIG= ${LOCALBASE}/bin/apu-1-config .else -LIB_DEPENDS+= apr-0:${PORTSDIR}/devel/apr0 -APR_CONFIG= ${LOCALBASE}/bin/apr-config -APU_CONFIG= ${LOCALBASE}/bin/apu-config +IGNORE= please update to apache22 .endif .else LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 Modified: head/devel/viewvc/Makefile ============================================================================== --- head/devel/viewvc/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/devel/viewvc/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -57,7 +57,7 @@ RUN_DEPENDS+= ${PYTHON_LIBDIR}/site-pack .endif .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE_RUN= 20+ +USE_APACHE_RUN= 22+ .endif .if ${PORT_OPTIONS:MLIGHTTPD} Modified: head/french/facturier/Makefile ============================================================================== --- head/french/facturier/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/french/facturier/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/htmldoc:${ WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ USE_PERL5_RUN= yes USE_MYSQL= yes Modified: head/games/hlstatsx/Makefile ============================================================================== --- head/games/hlstatsx/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/games/hlstatsx/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -16,7 +16,7 @@ MAINTAINER= sylvio@FreeBSD.org COMMENT= Real-time player and clan rankings and statistics for HL2 and mods NO_BUILD= yes -USE_APACHE= 20+ +USE_APACHE= 22+ USE_PHP= gd mysql USE_PERL5_RUN= yes USE_ZIP= yes Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/graphics/mapserver/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -77,13 +77,13 @@ CONFIGURE_ARGS+= --with-pdf=${LOCALBASE} .endif .if defined(WITH_WMS) -WITH_CURL= YES +WITH_CURL= yes CONFIGURE_ARGS+= --with-wms --with-wmsclient .endif .if defined(WITH_WFS) -WITH_CURL= YES -WITH_GDAL= YES +WITH_CURL= yes +WITH_GDAL= yes CONFIGURE_ARGS+= --with-wfs --with-wfsclient .endif @@ -99,13 +99,13 @@ CONFIGURE_ARGS+= --with-geos=${LOCALBASE .endif .if defined(WITH_MYGIS) -USE_MYSQL= YES +USE_MYSQL= yes CONFIGURE_ARGS+= --with-mygis=${LOCALBASE}/bin/mysql_config .endif .if defined(WITH_POSTGIS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libpgport.a:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server -USE_PGSQL= YES +USE_PGSQL= yes DEFAULT_PGSQL_VER= 83 CONFIGURE_ARGS+= --with-postgis=${LOCALBASE}/bin/pg_config .endif Modified: head/lang/php5/Makefile ============================================================================== --- head/lang/php5/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/lang/php5/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -117,7 +117,7 @@ IGNORE= cannot be built with multiple S .if ${PORT_OPTIONS:MAPACHE} PHP_SAPI+= mod -USE_APACHE= 20+ +USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} Modified: head/lang/php52/Makefile ============================================================================== --- head/lang/php52/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/lang/php52/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -143,7 +143,7 @@ CONFIGURE_ARGS+=--disable-cgi .if defined(WITH_APACHE) PHP_SAPI+= mod -USE_APACHE= 20+ +USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" CONFIGURE_ARGS+=--with-apxs2=${APXS} PKGMESSAGE= ${PKGDIR}/pkg-message.mod Modified: head/lang/php53/Makefile ============================================================================== --- head/lang/php53/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/lang/php53/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -109,7 +109,7 @@ PLIST_SUB+= FPM="@comment " .if ${PORT_OPTIONS:MAPACHE} PHP_SAPI+= mod -USE_APACHE= 20+ +USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} Modified: head/mail/dracmail/Makefile ============================================================================== --- head/mail/dracmail/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/mail/dracmail/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -36,7 +36,7 @@ OPTIONS= POSTGRE "Use PostgreSQL Databas USE_PHP+= pgsql .endif .if defined(WITH_APACHE) -USE_APACHE= 22 +USE_APACHE_RUN= 22 .endif .if defined(WITH_LIGHTTPD) RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd Modified: head/mail/dspam-devel/Makefile ============================================================================== --- head/mail/dspam-devel/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/mail/dspam-devel/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -414,7 +414,7 @@ CONFIGURE_ARGS+= --with-dspam-mode=${DSP . if defined(WITH_LIGHTTPD) RUN_DEPENDS+= ${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd . else -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ . endif LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd RUN_DEPENDS+= p5-GD>=0:${PORTSDIR}/graphics/p5-GD Modified: head/mail/dspam/Makefile ============================================================================== --- head/mail/dspam/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/mail/dspam/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -398,7 +398,7 @@ CONFIGURE_ARGS+= --with-dspam-mode=${DSP . if defined(WITH_LIGHTTPD) RUN_DEPENDS+= ${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd . else -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ . endif LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd RUN_DEPENDS+= p5-GD>=0:${PORTSDIR}/graphics/p5-GD Modified: head/mail/p5-qpsmtpd/Makefile ============================================================================== --- head/mail/p5-qpsmtpd/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/mail/p5-qpsmtpd/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -32,7 +32,7 @@ MOD_PERL_DESC= "Apache Support via mod_p .include .if ${PORT_OPTIONS:MMODPERL} -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 .endif Modified: head/mail/sympa/Makefile ============================================================================== --- head/mail/sympa/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/mail/sympa/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -91,7 +91,7 @@ USE_MYSQL= yes .if defined(WITH_FASTCGI) RUN_DEPENDS+= p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI . if !defined(WITHOUT_APACHE) -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi . endif .endif Modified: head/mail/vqregister/Makefile ============================================================================== --- head/mail/vqregister/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/mail/vqregister/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -17,7 +17,7 @@ COMMENT= An extremely admin-configurable BUILD_DEPENDS= ${VPOPMAIL_DIR}:${PORTSDIR}/mail/vpopmail RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_APACHE_RUN= 20+ +USE_APACHE_RUN= 22+ VPOPMAIL_DIR?= ${LOCALBASE}/vpopmail USE_MYSQL= yes Modified: head/misc/instant-server/Makefile ============================================================================== --- head/misc/instant-server/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/misc/instant-server/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -28,7 +28,7 @@ SAMBA_PORT?= net/samba34 # Don't let stupid programs ask for configuration. BATCH= YES -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ NO_BUILD= yes # comms/hylafax irc/ircd-hybrid Modified: head/net-mgmt/argus-monitor/Makefile ============================================================================== --- head/net-mgmt/argus-monitor/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/net-mgmt/argus-monitor/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_PERL5= yes USE_RC_SUBR= argusd HAS_CONFIGURE= yes -USE_APACHE= 20+ +USE_APACHE= 22+ CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= --bin_dir=${PREFIX}/bin --sbin_dir=${PREFIX}/sbin \ --lib_dir=${PREFIX}/lib/argus-monitor --data_dir=${PREFIX}/etc/argus-monitor \ Modified: head/net-mgmt/netdisco/Makefile ============================================================================== --- head/net-mgmt/netdisco/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/net-mgmt/netdisco/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -36,7 +36,7 @@ GROUPS= netdisco USE_PERL5= yes USE_PGSQL= yes -USE_APACHE= 20+ +USE_APACHE= 22+ USE_RC_SUBR= netdisco Modified: head/net-mgmt/ocsinventory-ng/Makefile ============================================================================== --- head/net-mgmt/ocsinventory-ng/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/net-mgmt/ocsinventory-ng/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -24,7 +24,7 @@ RUN_DEPENDS= p5-XML-Simple>=0:${PORTSDIR p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \ p5-XML-Entities>=0:${PORTSDIR}/textproc/p5-XML-Entities -USE_APACHE= 20+ +USE_APACHE= 22+ USE_MYSQL= 41+ USE_PERL5= 5.8.0+ WANT_PHP_WEB= yes Modified: head/net-mgmt/ourmon/Makefile ============================================================================== --- head/net-mgmt/ourmon/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/net-mgmt/ourmon/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libpcap. RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool WRKSRC= ${WRKDIR}/mrourmon -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ USE_PERL5= yes NO_BUILD= yes NO_INSTALL_MANPAGES= yes Modified: head/net-mgmt/pandorafms_console/Makefile ============================================================================== --- head/net-mgmt/pandorafms_console/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/net-mgmt/pandorafms_console/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/twopi:${PO OPTIONS= PGSQL "Use PostgreSQL backend (experimental)" off -USE_APACHE= 20+ +USE_APACHE= 22+ USE_PHP= curl gd gettext json ldap mbstring mysql snmp session \ xml zip zlib WANT_PHP_WEB= yes Modified: head/net-p2p/rtgui/Makefile ============================================================================== --- head/net-p2p/rtgui/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/net-p2p/rtgui/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -23,7 +23,7 @@ BUILD_DEPENDS+= xmlrpc-c-config:${PORTSD .include .if !defined(WITHOUT_APACHE) -USE_APACHE= 20+ +USE_APACHE= 22+ BUILD_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_scgi.so:${PORTSDIR}/www/mod_scgi .elif defined(WITH_LIGHTTPD) RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd Modified: head/net/p5-Apache2-SOAP/Makefile ============================================================================== --- head/net/p5-Apache2-SOAP/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/net/p5-Apache2-SOAP/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${APACHE_PKGNAMEPREFIX}mo RUN_DEPENDS:= ${BUILD_DEPENDS} PERL_CONFIGURE= yes -USE_APACHE= 20+ +USE_APACHE= 22+ MAN3= Apache2::SOAP.3 Modified: head/net/prosearch/Makefile ============================================================================== --- head/net/prosearch/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/net/prosearch/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -32,8 +32,7 @@ OPTIONS=\ CRAWLER "With crawler deps (nmap, p5-libwww)" on \ SAMBA "crawler with SAMBA (file://)" on \ RSYNC " crawler with RSYNC " off \ - APACH22 "With web server apache2.2+" on \ - APACH20 "With web server apache2.0+" off \ + APACHE "With web server apache2.2+" on \ MOD_PERL2 "With MOD_PERL2" off \ MOD_FASTCGI "With MOD_FASTCGI" off \ DB "With database server deps" on \ @@ -69,14 +68,10 @@ RUN_DEPENDS+= smbclient:${PORTSDIR}/net/ RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync .endif -.if defined(WITH_APACH22) +.if defined(WITH_APACHE) USE_APACHE= 22+ .endif -.if defined(WITH_APACH20) -USE_APACHE= 20+ -.endif - .if defined(WITH_NGINX) RUN_DEPENDS+=\ nginx:${PORTSDIR}/www/nginx Modified: head/ports-mgmt/tinderbox-devel/Makefile ============================================================================== --- head/ports-mgmt/tinderbox-devel/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/ports-mgmt/tinderbox-devel/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -75,7 +75,7 @@ RUN_DEPENDS+= p5-DBD-mysql${MYSQL_VER}>= .endif .if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI) -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ .elif defined(WITH_LIGHTTPD) && defined(WITH_WEBUI) RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd .elif defined(WITH_HIAWATHA) && defined(WITH_WEBUI) Modified: head/ports-mgmt/tinderbox/Makefile ============================================================================== --- head/ports-mgmt/tinderbox/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/ports-mgmt/tinderbox/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -74,7 +74,7 @@ RUN_DEPENDS+= cvsup:${PORTSDIR}/net/cvsu .endif .if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI) -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ .elif defined(WITH_LIGHTTPD) && defined(WITH_WEBUI) RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd .elif defined(WITH_HIAWATHA) && defined(WITH_WEBUI) Modified: head/print/openprinting/Makefile ============================================================================== --- head/print/openprinting/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/print/openprinting/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -59,8 +59,9 @@ CONFIGURE_ARGS+=\ # NOTE: This has only been tested with www/apache20, with integrated APR. .if defined(WITH_MOD_IPP) -USE_APACHE= 20 -CONFIGURE_ARGS+=--with-apache=${LOCALBASE} +IGNORE= no supported apache versions available +#USE_APACHE= 20 +#CONFIGURE_ARGS+=--with-apache=${LOCALBASE} .else CONFIGURE_ARGS+=--without-apache .endif Modified: head/security/maia/Makefile ============================================================================== --- head/security/maia/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/security/maia/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -94,7 +94,7 @@ USE_RC_SUBR+= maiad # setting USE_ variables. C'est la vie. .if defined(WITH_APACHE) -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ .endif .if defined(WITH_WEBHOST) Modified: head/security/openscep/Makefile ============================================================================== --- head/security/openscep/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/security/openscep/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -19,7 +19,7 @@ MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= libtool USE_OPENSSL= yes USE_OPENLDAP= yes -USE_APACHE= 20+ +USE_APACHE= 22+ GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes Modified: head/security/phpdeadlock/Makefile ============================================================================== --- head/security/phpdeadlock/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/security/phpdeadlock/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -21,7 +21,7 @@ DLDIR= www/${DLURL} PORTDOCS= CHANGES.txt COPYING.txt UPGRADE.txt USE_DOS2UNIX= yes -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ USE_PHP= mysql session ctype pcre NO_BUILD= yes Modified: head/security/shibboleth2-sp/Makefile ============================================================================== --- head/security/shibboleth2-sp/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/security/shibboleth2-sp/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -36,8 +36,9 @@ CONFIGURE_ARGS= --enable-apache-22 --wit PLIST_SUB+= WITH_APACHE_22="" PLIST_SUB+= WITH_APACHE_20="@comment " .else -USE_APACHE= 20 -CONFIGURE_ARGS= --enable-apache-20 --with-apxs2=${APXS} --with-apr=${PREFIX}/lib/apache2/apr-config --with-apu=${PREFIX}/lib/apache2/apu-config +IGNORE= apache20 is no longer available +#USE_APACHE= 20 +#CONFIGURE_ARGS= --enable-apache-20 --with-apxs2=${APXS} --with-apr=${PREFIX}/lib/apache2/apr-config --with-apu=${PREFIX}/lib/apache2/apu-config PLIST_SUB+= WITH_APACHE_22="@comment " PLIST_SUB+= WITH_APACHE_20="" .endif Modified: head/sysutils/dtc/Makefile ============================================================================== --- head/sysutils/dtc/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/sysutils/dtc/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -53,7 +53,7 @@ NO_BUILD= yes USE_PHP= mysql pcre session MAN8= dtc-chroot-shell.8 dtc-chroot-wrapper.8 MANCOMPRESSED= no -USE_APACHE= 22+ +USE_APACHE_RUN= 22+ .if defined(WITH_PHP5) DEFAULT_PHP_VER=5 Modified: head/sysutils/froxlor/Makefile ============================================================================== --- head/sysutils/froxlor/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/sysutils/froxlor/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -38,7 +38,7 @@ OPTIONS= APACHE "Use Apache (2.2) as htt .include .if !defined(WITHOUT_APACHE) -USE_APACHE= 22 +USE_APACHE_RUN= 22 .endif .if !defined(WITHOUT_MYSQL) Modified: head/textproc/htdig/Makefile ============================================================================== --- head/textproc/htdig/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/textproc/htdig/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -39,7 +39,7 @@ OPTIONS= APACHE "Include ${APACHE_PORT} .include .if !defined(WITHOUT_APACHE) -USE_APACHE= 20+ +USE_APACHE= 22+ CONFIGURE_ARGS+= --with-apache=${LOCALBASE}/sbin .include "${PORTSDIR}/Mk/bsd.apache.mk" PLIST_DIRSTRY+= www/cgi-bin www/data www/icons Modified: head/www/MT/Makefile ============================================================================== --- head/www/MT/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/MT/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -56,7 +56,7 @@ USE_PERL5_RUN= yes NO_BUILD= yes .if defined(WITH_APACHE) -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ SUB_FILES+= MT.conf SUB_LIST+= DATADIR=${PREFIX}/${DATADIR} CGIDIR=${PREFIX}/${CGIDIR} \ APACHEETCDIR=${PREFIX}/${APACHEETCDIR} \ Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -19,7 +19,6 @@ SUBDIR += aolserver-xotcl SUBDIR += apache-forrest SUBDIR += apache-mode.el - SUBDIR += apache20 SUBDIR += apache22 SUBDIR += apache22-event-mpm SUBDIR += apache22-itk-mpm Modified: head/www/blogsum/Makefile ============================================================================== --- head/www/blogsum/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/blogsum/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -25,7 +25,7 @@ RUN_DEPENDS= p5-DBI>=0:${PORTSDIR}/datab NO_BUILD= yes USE_PERL5_RUN= yes -USE_APACHE_RUN= 20+ +USE_APACHE_RUN= 22+ .include Modified: head/www/cakephp11/Makefile ============================================================================== --- head/www/cakephp11/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/cakephp11/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -20,7 +20,7 @@ LATEST_LINK= cakephp11 USE_BZIP2= yes -USE_APACHE= 22+ +USE_APACHE_RUN= 22+ SLAVE_PORT_MODULES= rewrite CONFLICTS= cakephp-1.[23].* Modified: head/www/cakephp12/Makefile ============================================================================== --- head/www/cakephp12/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/cakephp12/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -68,7 +68,7 @@ SUB_LIST+= PHPCGI=${WITH_PHP_CGI} .if defined(WITH_AP) SUB_FILES= pkg-message -USE_APACHE= 22+ +USE_APACHE_RUN= 22+ PKGMESSAGE= pkg-message APDEP= .else Modified: head/www/cakephp13/Makefile ============================================================================== --- head/www/cakephp13/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/cakephp13/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -69,7 +69,7 @@ SUB_LIST+= PHPCGI=${WITH_PHP_CGI} .if defined(WITH_AP) SUB_FILES= pkg-message -USE_APACHE= 22+ +USE_APACHE_RUN= 22+ PKGMESSAGE= pkg-message APDEP= .else Modified: head/www/cakephp2/Makefile ============================================================================== --- head/www/cakephp2/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/cakephp2/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -68,7 +68,7 @@ SUB_LIST+= PHPCGI=${WITH_PHP_CGI} .if defined(WITH_AP) SUB_FILES= pkg-message -USE_APACHE= 22+ +USE_APACHE_RUN= 22+ PKGMESSAGE= pkg-message APDEP= .else Modified: head/www/cas/Makefile ============================================================================== --- head/www/cas/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/cas/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -62,7 +62,7 @@ PLIST_SUB+= APACHE13_MODULE="@comment " ##.endif .if defined(WITH_BUILD_APACHE2X_MODULE) -USE_APACHE= 20+ +USE_APACHE= 22+ CMAKE_ARGS+= -DBUILD_APACHE2X_MODULE=ON PLIST_SUB+= APACHE2X_MODULE="" .else Modified: head/www/codeigniter/Makefile ============================================================================== --- head/www/codeigniter/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/codeigniter/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -80,7 +80,7 @@ SQLITE_DESC= Install SQLite support for .include .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ PLIST_SUB+= NOAPACHE="" CONFDIR=${CONFDIR_REL} CONFDIR= ${PREFIX}/${CONFDIR_REL} Modified: head/www/codeigniter17/Makefile ============================================================================== --- head/www/codeigniter17/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/codeigniter17/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -70,7 +70,7 @@ OPTIONS= APACHE "Configure for Apache-2. .include .if defined(WITH_APACHE) -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ PLIST_SUB+= NOAPACHE="" CONFDIR=${CONFDIR_REL} CONFDIR= ${PREFIX}/${CONFDIR_REL} Modified: head/www/dansguardian-devel/Makefile ============================================================================== --- head/www/dansguardian-devel/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/dansguardian-devel/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -53,7 +53,7 @@ RESTRICTED= Redistribution and commercia .include .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE= 20+ +USE_APACHE= 22+ .endif .if ${PORT_OPTIONS:MTRICKLE} Modified: head/www/dansguardian/Makefile ============================================================================== --- head/www/dansguardian/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/dansguardian/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -53,7 +53,7 @@ RESTRICTED= Redistribution and commercia .include .if ${PORT_OPTIONS:MAPACHE} -USE_APACHE= 20+ +USE_APACHE= 22+ .endif .if ${PORT_OPTIONS:MTRICKLE} Modified: head/www/dojo/Makefile ============================================================================== --- head/www/dojo/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/dojo/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -22,7 +22,7 @@ OPTIONS= APACHE "Configure for Apache- .include .if defined(WITH_APACHE) -USE_APACHE= 20+ +USE_APACHE= 22+ CONFDIR= ${PREFIX}/${CONFDIR_REL} CONFDIR_REL= ${APACHEETCDIR}/Includes PLIST_SUB+= NOAPACHE="" CONFDIR=${CONFDIR_REL} Modified: head/www/dotproject/Makefile ============================================================================== --- head/www/dotproject/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/dotproject/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes USE_PHP= gd mysql session zlib WANT_PHP_WEB= yes -USE_APACHE= 20+ +USE_APACHE= 22+ SUB_FILES= pkg-message Modified: head/www/dpsearch/Makefile ============================================================================== --- head/www/dpsearch/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/dpsearch/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -100,7 +100,7 @@ CONFIGURE_ARGS+=--enable-idn .endif .if defined(WITH_DPSEARCH_APACHE) -USE_APACHE= 20+ +USE_APACHE= 22+ PLIST_SUB+= APACHE="" CONFIGURE_ARGS+=--enable-apache-module .else Modified: head/www/formication/Makefile ============================================================================== --- head/www/formication/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/formication/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -15,7 +15,7 @@ MASTER_SITES= http://www.ranner.eu/stuff MAINTAINER= michael@ranner.eu COMMENT= Formular processing tool written in perl -USE_APACHE= 20+ +USE_APACHE_RUN= 22+ USE_PERL5_RUN= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} Modified: head/www/foswiki/Makefile ============================================================================== --- head/www/foswiki/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/foswiki/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -50,7 +50,7 @@ RUN_DEPENDS+= p5-Apache-Htpasswd>=0:${PO .endif .if defined(WITH_APACHE) -USE_APACHE?= 20+ +USE_APACHE?= 22+ PLIST_SUB+= NOAPACHE="" PKGMESSAGE= pkg-message-apache SUB_FILES+= pkg-message-apache Modified: head/www/ftasv/Makefile ============================================================================== --- head/www/ftasv/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/ftasv/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -15,7 +15,7 @@ MAINTAINER= sylvio@FreeBSD.org COMMENT= Is a commandline scoreboard viewer for the Apache server GNU_CONFIGURE= yes -USE_APACHE= 20+ +USE_APACHE= 22+ PLIST_FILES= sbin/ftasv SUB_FILES= pkg-message Modified: head/www/libapreq2/Makefile ============================================================================== --- head/www/libapreq2/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/libapreq2/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=libapreq MAINTAINER= apache@FreeBSD.org COMMENT= Generic Apache2 Request Library -USE_APACHE= 20+ +USE_APACHE= 22+ USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf libtool @@ -23,6 +23,7 @@ CONFIGURE_ARGS+= --with-apache2-apxs=${A MAKE_ENV+= MAKE=${GMAKE} ## MakeMaker blows it without this +SHLIB_MAJOR= 11 PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" .if defined (WITH_MODPERL2) @@ -59,12 +60,4 @@ post-patch: PLIST_SUB+= WITH_MODPERL2="@comment " .endif -.include - -.if ${APACHE_VERSION} == 20 -SHLIB_MAJOR= 10 -.else -SHLIB_MAJOR= 11 -.endif - -.include +.include Modified: head/www/mimetex/Makefile ============================================================================== --- head/www/mimetex/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mimetex/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -18,7 +18,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= A CGI script that lets you embed LaTeX math in your HTML pages NO_WRKSUBDIR= yes -USE_APACHE= 20+ +USE_APACHE= 22+ USE_ZIP= yes .include Modified: head/www/mod_antiloris/Makefile ============================================================================== --- head/www/mod_antiloris/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_antiloris/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -17,7 +17,7 @@ COMMENT= Protect Apache 2.x against the MAKE_JOBS_SAFE= yes USE_BZIP2= yes -USE_APACHE= 20+ +USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes AP_EXTRAS+= -a Modified: head/www/mod_asn/Makefile ============================================================================== --- head/www/mod_asn/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_asn/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -18,7 +18,7 @@ COMMENT= Look up the AS and network pref LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1 USE_APACHE= 22+ -AP_FAST_BUILD= YES +AP_FAST_BUILD= yes MANUAL_PACKAGE_BUILD= devel/apr1 with pgsql option required .include Modified: head/www/mod_auth_cas/Makefile ============================================================================== --- head/www/mod_auth_cas/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_auth_cas/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= yes NO_WRKSUBDIR= yes -USE_APACHE= 20+ +USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes Modified: head/www/mod_auth_cookie_mysql2/Makefile ============================================================================== --- head/www/mod_auth_cookie_mysql2/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_auth_cookie_mysql2/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -10,18 +10,18 @@ PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/ DISTNAME= ${PORTNAME}_1.0 -DIST_SUBDIR= apache22 +DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Allows authentication against a MySQL database via a secure cookie MAKE_JOBS_SAFE= yes -USE_MYSQL= YES -USE_APACHE= 20+ +USE_MYSQL= yes +USE_APACHE= 22+ -AP_FAST_BUILD= YES -AP_GENPLIST= YES +AP_FAST_BUILD= yes +AP_GENPLIST= yes AP_EXTRAS= -DMODULE_NAME=${SHORTMODNAME} -DMODULE_NAME_module=${SHORTMODNAME}_module AP_INC= ${LOCALBASE}/include/mysql AP_LIB= ${LOCALBASE}/lib/mysql -lmysqlclient Modified: head/www/mod_auth_cookie_mysql2/distinfo ============================================================================== --- head/www/mod_auth_cookie_mysql2/distinfo Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_auth_cookie_mysql2/distinfo Sat Aug 18 14:29:08 2012 (r302724) @@ -1,2 +1,2 @@ -SHA256 (apache22/mod_auth_cookie_mysql2_1.0.tar.gz) = 85601beea7a6de0ba8ef466027e6783cebef05c4687dc50460d2fdb06f5babe4 -SIZE (apache22/mod_auth_cookie_mysql2_1.0.tar.gz) = 7406 +SHA256 (apache2/mod_auth_cookie_mysql2_1.0.tar.gz) = 85601beea7a6de0ba8ef466027e6783cebef05c4687dc50460d2fdb06f5babe4 +SIZE (apache2/mod_auth_cookie_mysql2_1.0.tar.gz) = 7406 Modified: head/www/mod_auth_external2/Makefile ============================================================================== --- head/www/mod_auth_external2/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_auth_external2/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -9,16 +9,16 @@ PORTVERSION= 2.2.11 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.unixpapa.com/software/ -DIST_SUBDIR= apache20 +DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Allows users authentication based on external mechanisms MAKE_JOBS_SAFE= yes -USE_APACHE= 20+ -AP_FAST_BUILD= YES -AP_GENPLIST= YES +USE_APACHE= 22+ +AP_FAST_BUILD= yes +AP_GENPLIST= yes LATEST_LINK= mod_auth_external2 SHORTMODNAME= auth_external Modified: head/www/mod_auth_external2/distinfo ============================================================================== --- head/www/mod_auth_external2/distinfo Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_auth_external2/distinfo Sat Aug 18 14:29:08 2012 (r302724) @@ -1,2 +1,2 @@ -SHA256 (apache20/mod_auth_external-2.2.11.tar.gz) = 8068130444e9a93193062494c43e6a2d2d8e03e8ebdc9d378ab9c17c12a9e0c5 -SIZE (apache20/mod_auth_external-2.2.11.tar.gz) = 52542 +SHA256 (apache2/mod_auth_external-2.2.11.tar.gz) = 8068130444e9a93193062494c43e6a2d2d8e03e8ebdc9d378ab9c17c12a9e0c5 +SIZE (apache2/mod_auth_external-2.2.11.tar.gz) = 52542 Modified: head/www/mod_auth_form/Makefile ============================================================================== --- head/www/mod_auth_form/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_auth_form/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -20,8 +20,8 @@ MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_MYSQL= YES -USE_APACHE= 20+ +USE_MYSQL= yes +USE_APACHE= 22+ GNU_CONFIGURE= yes CONFIGURE_ENV= MYSQL_PREFIX="${LOCALBASE}" APACHE2_PREFIX="${LOCALBASE}" \ Modified: head/www/mod_auth_imap2/Makefile ============================================================================== --- head/www/mod_auth_imap2/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_auth_imap2/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -11,7 +11,7 @@ PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://ben.brillat.net/files/projects/mod_auth_imap2/ DISTNAME= mod_auth_imap2-${PORTVERSION} -DIST_SUBDIR= apache20 +DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= An Apache 2 module to provide authentication via an IMAP mail server @@ -19,10 +19,10 @@ COMMENT= An Apache 2 module to provide a MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME}2-${PORTVERSION} -USE_APACHE= 20+ +USE_APACHE= 22+ LATEST_LINK= mod_auth_imap2 -AP_FAST_BUILD= YES -AP_GENPLIST= YES +AP_FAST_BUILD= yes +AP_GENPLIST= yes PORTDOCS= htaccess-example httpd.conf-append-example Modified: head/www/mod_auth_imap2/distinfo ============================================================================== --- head/www/mod_auth_imap2/distinfo Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_auth_imap2/distinfo Sat Aug 18 14:29:08 2012 (r302724) @@ -1,2 +1,2 @@ -SHA256 (apache20/mod_auth_imap2-2.2.0.tar.gz) = 9642a13932010b9587d7b2263f21bed29602253bac18cb6c8847385d13d3cce0 -SIZE (apache20/mod_auth_imap2-2.2.0.tar.gz) = 12787 +SHA256 (apache2/mod_auth_imap2-2.2.0.tar.gz) = 9642a13932010b9587d7b2263f21bed29602253bac18cb6c8847385d13d3cce0 +SIZE (apache2/mod_auth_imap2-2.2.0.tar.gz) = 12787 Modified: head/www/mod_auth_kerb2/Makefile ============================================================================== --- head/www/mod_auth_kerb2/Makefile Sat Aug 18 12:33:38 2012 (r302723) +++ head/www/mod_auth_kerb2/Makefile Sat Aug 18 14:29:08 2012 (r302724) @@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= yes LATEST_LINK= mod_auth_kerb2 -USE_APACHE= 20+ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***