diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2010-09-08 01:56:08 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2010-09-08 01:56:08 +0800 |
| commit | 5438d5f1862d05b2201793b576c029cde6203f66 (patch) | |
| tree | 0ecbec1ed95936e77eef1ba0c3d89cfaf03a5226 /www | |
| parent | 01ee5ee827155f74645819779a6c665375bcc5a0 (diff) | |
| download | freebsd-ports-gnome-5438d5f1862d05b2201793b576c029cde6203f66.tar.gz freebsd-ports-gnome-5438d5f1862d05b2201793b576c029cde6203f66.tar.zst freebsd-ports-gnome-5438d5f1862d05b2201793b576c029cde6203f66.zip | |
- Brings port into apache@ guidelines for multiple www/apache* version use
- Removes soon to be obsolete MODPERL2 option
- Does not affect default package
PR: ports/150357
Submitted by: myself (pgollucci)
Approved by: flo@kasimir.com (maintainer)
Sponsored by: RideCharge Inc. / Taximagic
Diffstat (limited to 'www')
| -rw-r--r-- | www/rt38/Makefile | 22 | ||||
| -rw-r--r-- | www/rt40/Makefile | 22 |
2 files changed, 24 insertions, 20 deletions
diff --git a/www/rt38/Makefile b/www/rt38/Makefile index 1abe4e9db24f..bf2974ea4425 100644 --- a/www/rt38/Makefile +++ b/www/rt38/Makefile @@ -35,7 +35,6 @@ OPTIONS= MYSQL "Enable MySQL backend" on \ SQLITE "Enable SQLite backend" off \ DEV "Configure for Developers" off \ STANDALONE "Enable standalone server" off \ - MODPERL2 "Enable mod_perl2 support" off \ FASTCGI "Enable FastCGI support" off \ GRAPHVIZ "Enable GraphViz charts" on @@ -57,7 +56,6 @@ USE_PERL5= 5.8.3+ USE_AUTOTOOLS= autoconf:262 .include <bsd.port.pre.mk> - .if defined(WITH_DEV) BUILD_DEPENDS+= ${DEV_DEPS} RUN_DEPENDS+= ${DEV_DEPS} @@ -68,7 +66,7 @@ BUILD_DEPENDS+= ${STANDALONE_DEPS} RUN_DEPENDS+= ${STANDALONE_DEPS} .endif -.if defined(WITH_APACHE) || defined(WITH_FASTCGI) +.if defined(WITH_APACHE) || defined(WITH_FASTCGI) || defined(WITH_MODPERL) USE_APACHE= 1.3+ .endif @@ -82,18 +80,22 @@ BUILD_DEPENDS+= ${GRAPVIZ_DEPS} RUN_DEPENDS+= ${GRAPVIZ_DEPS} .endif -.if defined(WITH_MODPERL2) -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 +.if defined(WITH_MODPERL) +WITH_APACHE= yes -.if defined(WITH_MODPERL) && !defined(WITH_MODPERL2) +.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/rt40/Makefile b/www/rt40/Makefile index 1abe4e9db24f..bf2974ea4425 100644 --- a/www/rt40/Makefile +++ b/www/rt40/Makefile @@ -35,7 +35,6 @@ OPTIONS= MYSQL "Enable MySQL backend" on \ SQLITE "Enable SQLite backend" off \ DEV "Configure for Developers" off \ STANDALONE "Enable standalone server" off \ - MODPERL2 "Enable mod_perl2 support" off \ FASTCGI "Enable FastCGI support" off \ GRAPHVIZ "Enable GraphViz charts" on @@ -57,7 +56,6 @@ USE_PERL5= 5.8.3+ USE_AUTOTOOLS= autoconf:262 .include <bsd.port.pre.mk> - .if defined(WITH_DEV) BUILD_DEPENDS+= ${DEV_DEPS} RUN_DEPENDS+= ${DEV_DEPS} @@ -68,7 +66,7 @@ BUILD_DEPENDS+= ${STANDALONE_DEPS} RUN_DEPENDS+= ${STANDALONE_DEPS} .endif -.if defined(WITH_APACHE) || defined(WITH_FASTCGI) +.if defined(WITH_APACHE) || defined(WITH_FASTCGI) || defined(WITH_MODPERL) USE_APACHE= 1.3+ .endif @@ -82,18 +80,22 @@ BUILD_DEPENDS+= ${GRAPVIZ_DEPS} RUN_DEPENDS+= ${GRAPVIZ_DEPS} .endif -.if defined(WITH_MODPERL2) -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 +.if defined(WITH_MODPERL) +WITH_APACHE= yes -.if defined(WITH_MODPERL) && !defined(WITH_MODPERL2) +.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) |