diff options
| author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-09-03 17:32:31 +0000 |
|---|---|---|
| committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-09-03 17:32:31 +0000 |
| commit | 6687e67fcb99c8dc64158f13f93f194df16087be (patch) | |
| tree | 65fd8d71330957164b5dbb38738b8074ae0dda8e /www | |
| parent | 822fae61239de9eae29ad23c4350bc69f897018d (diff) | |
| download | ports-6687e67fcb99c8dc64158f13f93f194df16087be.tar.gz ports-6687e67fcb99c8dc64158f13f93f194df16087be.zip | |
- Allow this package to be built in a Tinderbox without resorting to
per port OPTION files. You can not set WITHOUT_MODPERL=yes in GLOBAL
b/c some ports have conerted over to the soon to be connical form
of MODPERL already. This resolves the conflict of MODPERL vs MODPERL2
flags until it can properly be conditionalized on APACHE_PORT.
- This does not affect the default package.
With Hat: apache@
Reported by: RideCharge Inc. / Taximagic Tinderbox
Notes
Notes:
svn path=/head/; revision=260498
Diffstat (limited to 'www')
| -rw-r--r-- | www/rt38/Makefile | 2 | ||||
| -rw-r--r-- | www/rt40/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/www/rt38/Makefile b/www/rt38/Makefile index e1134bd89d1b..1abe4e9db24f 100644 --- a/www/rt38/Makefile +++ b/www/rt38/Makefile @@ -89,7 +89,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-li ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2 .endif -.if defined(WITH_MODPERL) +.if defined(WITH_MODPERL) && !defined(WITH_MODPERL2) 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 \ diff --git a/www/rt40/Makefile b/www/rt40/Makefile index e1134bd89d1b..1abe4e9db24f 100644 --- a/www/rt40/Makefile +++ b/www/rt40/Makefile @@ -89,7 +89,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-li ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2 .endif -.if defined(WITH_MODPERL) +.if defined(WITH_MODPERL) && !defined(WITH_MODPERL2) 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 \ |