diff options
author | Olli Hauer <ohauer@FreeBSD.org> | 2012-01-01 16:47:41 +0000 |
---|---|---|
committer | Olli Hauer <ohauer@FreeBSD.org> | 2012-01-01 16:47:41 +0000 |
commit | 19fe40753d31ba0d91325ae15897602b2531875a (patch) | |
tree | 756dc92902e540775c00a7af9b20473c9ab8e7a9 /www | |
parent | Deprecate with 2 months timeout, I haven't developed/used it for years. (diff) |
- change required APACHE version from 13+ to 20+
(prepare to remove www/apache13)
- no PORTREVISION bump since apache22 is the default
with hat apache@
Notes
Notes:
svn path=/head/; revision=288372
Diffstat (limited to 'www')
39 files changed, 94 insertions, 209 deletions
diff --git a/www/blogsum/Makefile b/www/blogsum/Makefile index 61a6bdd77160..0dd9a410e20c 100644 --- a/www/blogsum/Makefile +++ b/www/blogsum/Makefile @@ -14,8 +14,9 @@ MASTER_SITES= http://www.dixongroup.net/ MAINTAINER= jhuldtgren@gmail.com COMMENT= Simple weblog -PERL_MODULES= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ ${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \ + ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 \ ${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS \ ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \ ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ @@ -24,18 +25,10 @@ PERL_MODULES= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ NO_BUILD= yes USE_PERL5_RUN= yes -USE_APACHE_RUN= 13+ +USE_APACHE_RUN= 20+ .include <bsd.port.pre.mk> -.if ${APACHE_VERSION} != 13 -PERL_MODULES+= ${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2 -.else -PERL_MODULES+= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq -.endif - -RUN_DEPENDS= ${PERL_MODULES} - SUB_FILES= pkg-message SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR} WWWOWN=${WWWOWN} diff --git a/www/cas/Makefile b/www/cas/Makefile index 2363efb2d7f1..11e9b0601d9f 100644 --- a/www/cas/Makefile +++ b/www/cas/Makefile @@ -24,7 +24,6 @@ WITHOUT_NLS= yes OPTIONS= DEBUG_MODE "Enable debug output" off \ ENABLE_OPTIMIZATION "Enable optimization" on \ - BUILD_APACHE13_MODULE "Build Apache 1.3 module" off \ 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 \ @@ -51,14 +50,16 @@ CMAKE_ARGS+= -DENABLE_OPTIMIZATION=ON CMAKE_ARGS+= -DENABLE_OPTIMIZATION=OFF .endif -.if defined(WITH_BUILD_APACHE13_MODULE) -CMAKE_ARGS+= -DBUILD_APACHE13_MODULE=ON -USE_APACHE= 13 -PLIST_SUB+= APACHE13_MODULE="" -.else +# XXX apache13 was removed from portstree +# XXX +##.if defined(WITH_BUILD_APACHE13_MODULE) +##CMAKE_ARGS+= -DBUILD_APACHE13_MODULE=ON +##USE_APACHE= 13 +##PLIST_SUB+= APACHE13_MODULE="" +##.else CMAKE_ARGS+= -DBUILD_APACHE13_MODULE=OFF PLIST_SUB+= APACHE13_MODULE="@comment " -.endif +##.endif .if defined(WITH_BUILD_APACHE2X_MODULE) USE_APACHE= 20+ diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile index 8db11c254daa..aad5952e16d6 100644 --- a/www/dansguardian/Makefile +++ b/www/dansguardian/Makefile @@ -50,7 +50,7 @@ RESTRICTED= Redistribution and commercial download is restricted. Check ${DG_UR .include <bsd.port.pre.mk> .if !defined(WITHOUT_APACHE) -USE_APACHE= 13+ +USE_APACHE= 20+ .endif .if !defined(WITHOUT_TRICKLE) diff --git a/www/dotproject/Makefile b/www/dotproject/Makefile index 23a90f06ff98..8a16eb111377 100644 --- a/www/dotproject/Makefile +++ b/www/dotproject/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes USE_PHP= gd mysql session zlib WANT_PHP_WEB= yes -USE_APACHE= 13+ +USE_APACHE= 20+ SUB_FILES= pkg-message diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile index c1c8d53329de..c5a292169f29 100644 --- a/www/dpsearch/Makefile +++ b/www/dpsearch/Makefile @@ -100,7 +100,7 @@ CONFIGURE_ARGS+=--enable-idn .endif .if defined(WITH_DPSEARCH_APACHE) -USE_APACHE= 13+ +USE_APACHE= 20+ PLIST_SUB+= APACHE="" CONFIGURE_ARGS+=--enable-apache-module .else diff --git a/www/formication/Makefile b/www/formication/Makefile index 3803e9827aff..36beac0e4310 100644 --- a/www/formication/Makefile +++ b/www/formication/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://www.ranner.eu/stuff/ \ MAINTAINER= michael@ranner.eu COMMENT= Formular processing tool written in perl -USE_APACHE= 13+ +USE_APACHE= 20+ USE_PERL5_RUN= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} @@ -26,9 +26,7 @@ SUB_FILES+= pkg-message .include <bsd.port.pre.mk> -.if ${APACHE_VERSION} > 13 PLIST_DIRSTRY= www/cgi-bin -.endif post-patch: @${REINPLACE_CMD} -e "s,^#!/usr/local/bin/perl,#!${PERL},g" \ diff --git a/www/foswiki/Makefile b/www/foswiki/Makefile index a6609d0ecf68..d2c8c52f0c6c 100644 --- a/www/foswiki/Makefile +++ b/www/foswiki/Makefile @@ -50,19 +50,15 @@ RUN_DEPENDS+= p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \ .endif .if defined(WITH_APACHE) -USE_APACHE?= 13+ +USE_APACHE?= 20+ PLIST_SUB+= NOAPACHE="" PKGMESSAGE= pkg-message-apache SUB_FILES+= pkg-message-apache .include <bsd.port.pre.mk> -CONFDIR= ${PREFIX}/${CONFDIR_REL} -.if ${APACHE_VERSION} == "13" -CONFDIR_REL= ${APACHEETCDIR} -.else CONFDIR_REL= ${APACHEETCDIR}/Includes -.endif +CONFDIR= ${PREFIX}/${CONFDIR_REL} PLIST_SUB+= CONFDIR=${CONFDIR_REL} .else diff --git a/www/mimetex/Makefile b/www/mimetex/Makefile index 72efb7a94176..228f8341355f 100644 --- a/www/mimetex/Makefile +++ b/www/mimetex/Makefile @@ -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= 13+ +USE_APACHE= 20+ USE_ZIP= yes .include <bsd.port.pre.mk> @@ -30,9 +30,7 @@ CGI_BIN= ${WWWDIR}/cgi-bin CGI_PRG= ${PORTNAME}.cgi WWW_DIR= ${WWWDIR}/data -.if ${APACHE_VERSION} > 13 PLIST_DIRSTRY+= www/cgi-bin www/data -.endif PLIST_SUB= CGI_BIN="${CGI_BIN:S,^${PREFIX}/,,}" \ WWW_DIR="${WWW_DIR:S,^${PREFIX}/,,}" diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile index fa138cbdda6c..53ba0ce15a73 100644 --- a/www/mod_auth_mysql_another/Makefile +++ b/www/mod_auth_mysql_another/Makefile @@ -17,7 +17,7 @@ COMMENT= Allows users to use MySQL databases for user authentication MAKE_JOBS_SAFE= yes USE_MYSQL= YES -USE_APACHE= 13+ +USE_APACHE= 20+ SHORTMODNAME= mysql_auth AP_FAST_BUILD= YES @@ -25,23 +25,13 @@ AP_GENPLIST= YES AP_INC= ${LOCALBASE}/include/mysql AP_LIB= ${LOCALBASE}/lib/mysql AP_EXTRAS= -lmysqlclient -lz -lm +AP_EXTRAS+= -DAPACHE2 .include <bsd.port.pre.mk> -.if ${APACHE_VERSION} > 20 -AP_EXTRAS+= -DAPACHE2 -.endif - -.if ${APACHE_VERSION} > 20 post-patch: ${REINPLACE_CMD} -e "s|APR_XtOffsetOf|APR_OFFSETOF|g" \ -e "s|APR_XtOffset|APR_OFFSET|g" ${WRKSRC}/mod_auth_mysql.c -.else -pre-build: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e "s|%%APXS%%|${APXS}|g" \ - -e "s|%%AP_INC%%|${AP_INC}|g" -e "s|%%AP_LIB%%|${AP_LIB}|g" ${WRKSRC}/Makefile -.endif .if !defined(NOPORTDOCS) post-build: diff --git a/www/mod_auth_pubtkt/Makefile b/www/mod_auth_pubtkt/Makefile index f51bc6b89736..f24f72c19d54 100644 --- a/www/mod_auth_pubtkt/Makefile +++ b/www/mod_auth_pubtkt/Makefile @@ -18,7 +18,7 @@ COMMENT= An Apache module to provide public key ticket based authentication MAKE_JOBS_SAFE= yes -USE_APACHE= 13+ +USE_APACHE= 20+ HAS_CONFIGURE= yes CONFIGURE_ARGS= --apxs=${APXS} diff --git a/www/mod_chroot/Makefile b/www/mod_chroot/Makefile index 8f151751e0cf..d14da95cac58 100644 --- a/www/mod_chroot/Makefile +++ b/www/mod_chroot/Makefile @@ -19,7 +19,7 @@ MAKE_JOBS_SAFE= yes PORTDOCS= INSTALL CAVEATS README.Apache20 README AP_FAST_BUILD= YES AP_GENPLIST= YES -USE_APACHE= 13+ +USE_APACHE= 20+ post-install: diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile index 3b2f84555ddb..19f1e5799113 100644 --- a/www/mod_encoding/Makefile +++ b/www/mod_encoding/Makefile @@ -21,7 +21,7 @@ MAKE_JOBS_SAFE= yes # Mostly because of the dependency of mod_dav. #APACHE_VERSION= 1.3.6 -USE_APACHE= 13+ +USE_APACHE= 20+ USE_ICONV= yes HAS_CONFIGURE= yes USE_GMAKE= yes diff --git a/www/mod_evasive/Makefile b/www/mod_evasive/Makefile index c20b0a61b91c..5cee90e08b80 100644 --- a/www/mod_evasive/Makefile +++ b/www/mod_evasive/Makefile @@ -20,7 +20,7 @@ MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME} -USE_APACHE= 13+ +USE_APACHE= 20+ AP_FAST_BUILD= YES AP_GENPLIST= YES @@ -28,9 +28,7 @@ PORTDOCS= LICENSE README test.pl .include <bsd.port.pre.mk> -.if ${APACHE_VERSION} != "13" MODULENAME= ${PORTNAME}20 -.endif post-patch: @${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \ diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile index 18646164904d..3bf7e740aa93 100644 --- a/www/mod_fastcgi/Makefile +++ b/www/mod_fastcgi/Makefile @@ -17,7 +17,7 @@ COMMENT= A fast-cgi module for Apache MAKE_JOBS_SAFE= yes CONFLICTS= apache-contrib-1.* -USE_APACHE= 13+ +USE_APACHE= 20+ AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= *.c diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile index afa80bb34518..5c3059c638d8 100644 --- a/www/mod_hosts_access/Makefile +++ b/www/mod_hosts_access/Makefile @@ -16,7 +16,7 @@ COMMENT= Apache module that makes Apache respect hosts.allow and hosts.deny MAKE_JOBS_SAFE= yes -USE_APACHE= 13+ +USE_APACHE= 20+ AP_FAST_BUILD= yes AP_GENPLIST= yes diff --git a/www/mod_jail/Makefile b/www/mod_jail/Makefile index a51ac88c9232..17593030b235 100644 --- a/www/mod_jail/Makefile +++ b/www/mod_jail/Makefile @@ -17,7 +17,7 @@ COMMENT= Apache 1.3.x/2.0.xx module to enable an easy alternative to mod_chroot MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/mod_jail-0.5.1 -USE_APACHE= 13+ +USE_APACHE= 20+ AP_FAST_BUILD= YES AP_GENPLIST= YES diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile index 261f2a2eb168..7135b024cdb8 100644 --- a/www/mod_jk/Makefile +++ b/www/mod_jk/Makefile @@ -20,7 +20,7 @@ COMMENT?= Apache JK module for connecting to Tomcat using AJP1X MAKE_JOBS_SAFE= yes -USE_APACHE?= 13+ +USE_APACHE?= 20+ .include <bsd.port.pre.mk> diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile index 4f4c9f215dab..64c72e11ee89 100644 --- a/www/mod_log_sql2/Makefile +++ b/www/mod_log_sql2/Makefile @@ -26,7 +26,7 @@ APACHE2X= "" PLIST_SUB+= SSL=${SSL_PLIST} APACHE2X=${APACHE2X} USE_MYSQL= yes -USE_APACHE= 13+ +USE_APACHE= 20+ CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql" .include <bsd.port.pre.mk> @@ -36,11 +36,6 @@ CONFIGURE_ARGS+= --with-dbi=${LOCALBASE} LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi .endif -.if ${APACHE_VERSION} == 13 -WITHOUT_SSL= YES -APACHE2X= "@comment " -.endif - .if defined(WITHOUT_SSL) CONFIGURE_ARGS+= --disable-ssl SSL_PLIST= "@comment " diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile index d75b796d2b9c..232358d94f22 100644 --- a/www/mod_ruby/Makefile +++ b/www/mod_ruby/Makefile @@ -18,7 +18,7 @@ COMMENT= An Apache module that embeds Ruby interpreter within MAKE_JOBS_SAFE= yes -USE_APACHE= 13+ +USE_APACHE= 20+ USE_RUBY= yes USE_PERL5_BUILD= yes diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile index 64cc439ca02f..3672e073553d 100644 --- a/www/mod_scgi/Makefile +++ b/www/mod_scgi/Makefile @@ -18,21 +18,16 @@ COMMENT= Apache module that implements the client side of the SCGI protocol MAKE_JOBS_SAFE= yes +SCGI_DIR= apache2 WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR} -USE_APACHE= 13+ +USE_APACHE= 20+ AP_FAST_BUILD= yes AP_GENPLIST= yes .include <bsd.port.pre.mk> -.if ${APACHE_VERSION} >= 20 -SCGI_DIR= apache2 -.else -SCGI_DIR= apache1 -.endif - post-install: @${CAT} ${PKGMESSAGE} diff --git a/www/mod_webkit/Makefile b/www/mod_webkit/Makefile index 724e766bc68a..24c5e81567e2 100644 --- a/www/mod_webkit/Makefile +++ b/www/mod_webkit/Makefile @@ -17,21 +17,13 @@ COMMENT= A apache module for WebWare WebKit AppServer MAKE_JOBS_SAFE= yes -USE_APACHE= 13+ +USE_APACHE= 20+ AP_FAST_BUILD= yes AP_GENPLIST= yes -.include <bsd.port.pre.mk> - -.if ${APACHE_VERSION} >= 20 -APACHE_VER= 2 -.else -APACHE_VER= 1 -.endif - -WRKSRC= ${WRKDIR}/Webware-${PORTVERSION}/WebKit/Adapters/${PORTNAME}${APACHE_VER} +WRKSRC= ${WRKDIR}/Webware-${PORTVERSION}/WebKit/Adapters/${PORTNAME}2 post-patch: @${REINPLACE_CMD} -e 's|/usr/sbin/apxs|${APXS}|' ${WRKSRC}/Makefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/mod_wsgi/Makefile b/www/mod_wsgi/Makefile index 5758032a121e..55301f1edf5d 100644 --- a/www/mod_wsgi/Makefile +++ b/www/mod_wsgi/Makefile @@ -26,7 +26,7 @@ CONFLICTS= ${PKGNAMEPREFIX}mod_wsgi-3.* mod_wsgi-3.* PROJECTHOST= modwsgi -USE_APACHE= 13+ +USE_APACHE= 20+ USE_PYTHON= 2.5-2.7 GNU_CONFIGURE= yes diff --git a/www/mod_wsgi3/Makefile b/www/mod_wsgi3/Makefile index a1293ee70bc9..f1ca9e2a3058 100644 --- a/www/mod_wsgi3/Makefile +++ b/www/mod_wsgi3/Makefile @@ -26,7 +26,7 @@ CONFLICTS= ${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.* PROJECTHOST= modwsgi -USE_APACHE= 13+ +USE_APACHE= 20+ USE_PYTHON= 2.5+ GNU_CONFIGURE= yes diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile index dd1e54a39a1f..05505e863535 100644 --- a/www/nibbleblog/Makefile +++ b/www/nibbleblog/Makefile @@ -29,7 +29,7 @@ SUB_FILES= pkg-message .include <bsd.port.options.mk> .if defined(WITH_APACHE) -USE_APACHE= 13+ +USE_APACHE= 20+ .endif .if defined(WITH_LIGHTTPD) RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd diff --git a/www/ocaml-net/Makefile b/www/ocaml-net/Makefile index b70f13d02fdf..a998731d3136 100644 --- a/www/ocaml-net/Makefile +++ b/www/ocaml-net/Makefile @@ -102,7 +102,7 @@ CONFIGURE_ARGS+= -disable-gtk2 .endif .if defined(WITH_APACHE) -USE_APACHE= 13+ +USE_APACHE= 20+ CONFIGURE_ARGS+= -enable-apache -apxs ${APXS} -apache ${HTTPD} OCAML_PKGDIRS+= netcgi_apache .else diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile index 3f9e9c234761..2f84e1aa0991 100644 --- a/www/p5-Apache-AuthCookie/Makefile +++ b/www/p5-Apache-AuthCookie/Makefile @@ -15,18 +15,12 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= A perl module to provide custom forms for reauthentication -USE_APACHE= 13+ +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 +RUN_DEPENDS:= ${BUILD_DEPENDS} -.include <bsd.port.pre.mk> +USE_APACHE= 20+ -.if defined(WITH_MODPERL2) || ${APACHE_VERSION} > 13 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 -.else -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \ - p5-Apache-Test>=1.35:${PORTSDIR}/www/p5-Apache-Test -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl -.endif +.include <bsd.port.pre.mk> CURUSER?= `whoami` CURGRP?= `groups | ${AWK} '{print $$1}'` diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile index a2fd53f922ec..e908daceaa9f 100644 --- a/www/p5-Apache-AuthTicket/Makefile +++ b/www/p5-Apache-AuthTicket/Makefile @@ -15,31 +15,20 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Perl modules that implement a cookie-based authentication system -RUN_DEPENDS= p5-CGI.pm>=3.12:${PORTSDIR}/www/p5-CGI.pm \ +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 \ + p5-CGI.pm>=3.12:${PORTSDIR}/www/p5-CGI.pm \ p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \ p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \ p5-ModPerl-VersionUtil>=0:${PORTSDIR}/www/p5-ModPerl-VersionUtil \ p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract +USE_APACHE= 20+ PERL_CONFIGURE= yes MAN3= Apache::AuthTicket.3 \ Apache::AuthTicket::Base.3 \ Apache2::AuthTicket.3 -USE_APACHE= 13+ - -.include <bsd.port.pre.mk> - -.if ${APACHE_VERSION} > 13 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 -.else -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \ - p5-Apache-Test>=1.35:${PORTSDIR}/www/p5-Apache-Test -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \ - p5-Apache-Test>=1.35:${PORTSDIR}/www/p5-Apache-Test -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Apache-DB/Makefile b/www/p5-Apache-DB/Makefile index 1cdb1962affe..f3c56b42fa9f 100644 --- a/www/p5-Apache-DB/Makefile +++ b/www/p5-Apache-DB/Makefile @@ -15,20 +15,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Debugging and profiling tools for mod_perl +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 + MAKE_JOBS_SAFE= yes PERL_CONFIGURE= yes -USE_APACHE_RUN= 13+ +USE_APACHE_RUN= 20+ MAN3= Apache::DB.3 Apache::DProf.3 Apache::perl5db.3 \ Apache::SmallProf.3 -.include <bsd.port.pre.mk> - -.if defined(WITH_MODPERL2) || ${APACHE_VERSION} > 13 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 -.else -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile index e3e6bc304233..4ffb5eb5e79d 100644 --- a/www/p5-Apache-Gallery/Makefile +++ b/www/p5-Apache-Gallery/Makefile @@ -16,25 +16,21 @@ PKGNAMEPREFIX= p5- MAINTAINER= brix@FreeBSD.org COMMENT= Apache::Gallery - mod_perl handler to create an image gallery +LICENSE= ART10 + BUILD_DEPENDS= ${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \ ${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \ ${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info \ ${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \ ${SITE_PERL}/${PERL_ARCH}/Image/Imlib2.pm:${PORTSDIR}/graphics/p5-Image-Imlib2 \ + ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm -RUN_DEPENDS= ${BUILD_DEPENDS} +RUN_DEPENDS:= ${BUILD_DEPENDS} -LICENSE= ART10 PERL_CONFIGURE= yes -USE_APACHE= 13+ +USE_APACHE= 20+ -.include <bsd.port.pre.mk> -.if ${APACHE_VERSION} == 13 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq -.else -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 PLIST_DIRSTRY+= www/icons -.endif MAN3= Apache::Gallery.3 DOC_FILES= INSTALL LICENSE README TODO UPGRADE @@ -70,4 +66,4 @@ post-install: @${CAT} ${PKGMESSAGE} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Bundle-Sledge/Makefile b/www/p5-Bundle-Sledge/Makefile index 1631998e7db2..37cca340ebac 100644 --- a/www/p5-Bundle-Sledge/Makefile +++ b/www/p5-Bundle-Sledge/Makefile @@ -15,41 +15,32 @@ PKGNAMEPREFIX= p5- MAINTAINER= ports@FreeBSD.org COMMENT= A bundle to install all modules used for Sledge -BUILD_DEPENDS= ${PM_DEPENDS} -RUN_DEPENDS= ${PM_DEPENDS} - -USE_APACHE= 13+ -.include <bsd.port.pre.mk> - -.if ${APACHE_VERSION} == 13 -PM_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq -PM_DEPENDS+= ${SITE_PERL}/Apache/Reload.pm:${PORTSDIR}/www/p5-Apache-Reload -.else -PM_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 -.endif -PM_DEPENDS+= ${SITE_PERL}/Test/Inline.pm:${PORTSDIR}/devel/p5-Test-Inline -PM_DEPENDS+= ${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert -PM_DEPENDS+= ${SITE_PERL}/Class/Fields.pm:${PORTSDIR}/devel/p5-Class-Fields -PM_DEPENDS+= ${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor -PM_DEPENDS+= ${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable -PM_DEPENDS+= ${SITE_PERL}/Class/Singleton.pm:${PORTSDIR}/devel/p5-Class-Singleton -PM_DEPENDS+= ${SITE_PERL}/Class/Trigger.pm:${PORTSDIR}/devel/p5-Class-Trigger -PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 -PM_DEPENDS+= ${SITE_PERL}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm -PM_DEPENDS+= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template -PM_DEPENDS+= ${SITE_PERL}/HTML/StickyQuery.pm:${PORTSDIR}/www/p5-HTML-StickyQuery -PM_DEPENDS+= ${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy -PM_DEPENDS+= ${JCODE}:${PORTSDIR}/japanese/p5-Jcode -PM_DEPENDS+= ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI -PM_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit -PM_DEPENDS+= ${SITE_PERL}/Data/Properties.pm:${PORTSDIR}/devel/p5-Data-Properties -PM_DEPENDS+= ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error -PM_DEPENDS+= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww - +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \ + ${SITE_PERL}/Test/Inline.pm:${PORTSDIR}/devel/p5-Test-Inline \ + ${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert \ + ${SITE_PERL}/Class/Fields.pm:${PORTSDIR}/devel/p5-Class-Fields \ + ${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \ + ${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \ + ${SITE_PERL}/Class/Singleton.pm:${PORTSDIR}/devel/p5-Class-Singleton \ + ${SITE_PERL}/Class/Trigger.pm:${PORTSDIR}/devel/p5-Class-Trigger \ + ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \ + ${SITE_PERL}/HTML/FillInForm.pm:${PORTSDIR}/www/p5-HTML-FillInForm \ + ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ + ${SITE_PERL}/HTML/StickyQuery.pm:${PORTSDIR}/www/p5-HTML-StickyQuery \ + ${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \ + ${JCODE}:${PORTSDIR}/japanese/p5-Jcode \ + ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \ + ${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \ + ${SITE_PERL}/Data/Properties.pm:${PORTSDIR}/devel/p5-Data-Properties \ + ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \ + ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww +RUN_DEPENDS:= ${BUILD_DEPENDS} + +USE_APACHE= 20+ PERL_CONFIGURE= yes MAN3= Bundle::Sledge.3 JCODE= ${SITE_PERL}/Jcode.pm -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile index a55a558f498d..36bdd59824c2 100644 --- a/www/p5-CGI-SpeedyCGI/Makefile +++ b/www/p5-CGI-SpeedyCGI/Makefile @@ -23,7 +23,7 @@ OPTIONS= APACHE "Enable mod_speedycgi" On .include <bsd.port.pre.mk> .if !defined(WITHOUT_APACHE) -USE_APACHE= 13+ +USE_APACHE= 20+ PLIST_SUB+= APACHE="" .else PLIST_SUB+= APACHE="@comment " diff --git a/www/p5-MasonX-WebApp/Makefile b/www/p5-MasonX-WebApp/Makefile index 65ee3fd0e434..b1809471e0dc 100644 --- a/www/p5-MasonX-WebApp/Makefile +++ b/www/p5-MasonX-WebApp/Makefile @@ -15,27 +15,18 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Works with HTML::Mason to do processing before Mason is invoked +BUILD_DEPENDS:= ${RUN_DEPENDS} RUN_DEPENDS= ${SITE_PERL}/HTML/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \ ${SITE_PERL}/Apache/Session/Wrapper.pm:${PORTSDIR}/www/p5-Apache-Session-Wrapper \ ${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \ ${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \ ${SITE_PERL}/Class/Factory/Util.pm:${PORTSDIR}/devel/p5-Class-Factory-Util -BUILD_DEPENDS:= ${RUN_DEPENDS} - -USE_APACHE_RUN= 13+ -.include <bsd.port.pre.mk> - -.if defined(WITH_MODPERL2) || ${APACHE_VERSION} > 13 BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 -.else -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl - -MAKE_JOBS_SAFE= yes -.endif +USE_APACHE_RUN= 20+ PERL_MODBUILD= yes MAN3= MasonX::WebApp.3 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/p5-Maypole/Makefile b/www/p5-Maypole/Makefile index 957cb23ea75b..6483e4b07082 100644 --- a/www/p5-Maypole/Makefile +++ b/www/p5-Maypole/Makefile @@ -42,34 +42,15 @@ PORTSCOUT= skipv:2.121 MAKE_JOBS_SAFE= yes -OPTIONS= MODPERL "mod_perl support" off \ - MODPERL2 "mod_perl2 support" on +OPTIONS= MODPERL2 "mod_perl2 support" on PERL_CONFIGURE= yes .include <bsd.port.options.mk> -.if defined(WITH_MODPERL) || defined(WITH_MODPERL2) -USE_APACHE_RUN= 13+ -.endif - -.include <bsd.port.pre.mk> - -.if defined(WITH_MODPERL) && ${APACHE_VERSION} > 13 -IGNORE= mod_perl require apache13 but ${APACHE_PORT} is installed -.elif defined(WITH_MODPERL2) && ${APACHE_VERSION} < 20 -IGNORE= mod_perl2 require at last apache20 but ${APACHE_PORT} is installed -.endif - -.if defined(WITH_MODPERL) && defined(WITH_MODPERL2) -IGNORE= only 1 mod_perl at a time -.endif - .if defined(WITH_MODPERL2) +USE_APACHE_RUN= 20+ BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 .endif -.if defined(WITH_MODPERL) -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq -.endif PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES+= pkg-message @@ -132,4 +113,4 @@ post-install: .endif @ ${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/photo_gallery/Makefile b/www/photo_gallery/Makefile index 386e4aa7ffd0..805a4e0ab9bc 100644 --- a/www/photo_gallery/Makefile +++ b/www/photo_gallery/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= anytopnm:${PORTSDIR}/graphics/netpbm\ ${SITE_PERL}/Image/Info.pm:${PORTSDIR}/graphics/p5-Image-Info\ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI -USE_APACHE= 13+ +USE_APACHE= 20+ USE_PERL5= yes NO_BUILD= yes diff --git a/www/rt38/Makefile b/www/rt38/Makefile index 27b3978a2d30..0f655f24ca7d 100644 --- a/www/rt38/Makefile +++ b/www/rt38/Makefile @@ -68,7 +68,7 @@ RUN_DEPENDS+= ${STANDALONE_DEPS} .endif .if defined(WITH_APACHE) || defined(WITH_FASTCGI) || defined(WITH_MODPERL) -USE_APACHE= 13+ +USE_APACHE= 20+ .endif .if defined(WITH_FASTCGI) @@ -87,17 +87,10 @@ WITH_APACHE= yes .include "${.CURDIR}/../../Mk/bsd.apache.mk" -. if ${APACHE_VERSION} == 13 -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \ - ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp1 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \ - ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp1 -. else BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \ ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2 RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \ ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2 -. endif .endif .if !defined(WITHOUT_MYSQL) diff --git a/www/sams/Makefile b/www/sams/Makefile index d8a6f12f016b..d097321682d4 100644 --- a/www/sams/Makefile +++ b/www/sams/Makefile @@ -48,7 +48,7 @@ USE_PHP+= ldap .endif .if defined(WITH_APACHE) -USE_APACHE= 13+ +USE_APACHE= 20+ .endif .if defined(WITH_INSTALLGD) diff --git a/www/webobjects/Makefile b/www/webobjects/Makefile index 8ec84e5efd7d..08f07f4711b0 100644 --- a/www/webobjects/Makefile +++ b/www/webobjects/Makefile @@ -48,7 +48,7 @@ SUB_LIST+= NEXT_ROOT=${NEXT_BASE} USER=${NEXT_USER} GROUP=${NEXT_GROUP} \ SUB_FILES+= pkg-message pkg-install pkg-deinstall .if defined(WITH_APACHE) -USE_APACHE?= 13+ +USE_APACHE?= 20+ BUILD_DEPENDS+= ${APACHEMODDIR}/mod_WebObjects.so:${PORTSDIR}/www/mod_webobjects .endif diff --git a/www/websh/Makefile b/www/websh/Makefile index 39463416bd0f..11b8adcdd4ba 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -32,7 +32,7 @@ SUB_LIST+= TCL_DVER=${TCL_DVER} WS_VER=${PORTVERSION} SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR} PLIST_SUB+= TCL_DVER=${TCL_DVER} -USE_APACHE= 13+ +USE_APACHE= 20+ CONFIGURE_ARGS+=--with-httpdinclude=`apxs -q includedir` CPPFLAGS+= -I ${LOCALBASE}/include/apr-1 diff --git a/www/wwwstat/Makefile b/www/wwwstat/Makefile index f5da2295530a..80b089378bdc 100644 --- a/www/wwwstat/Makefile +++ b/www/wwwstat/Makefile @@ -21,7 +21,7 @@ COMMENT= Webserver logfile analysis package MAKE_JOBS_SAFE= yes -USE_APACHE= 13+ +USE_APACHE= 20+ USE_PERL5= yes MAKE_ENV+= PERL5=${PERL5} |