diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2011-08-20 17:23:05 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2011-08-20 17:23:05 +0000 |
| commit | 7d7b475f69c4b194b2aa80166109b6a9274444d6 (patch) | |
| tree | f63cbc483fd7f88fb6077a54f01ff790f8c2506f /www | |
| parent | - Update to 4.36 (diff) | |
- unbreak build now where apache22 is the default the
port builds fine
Notes
Notes:
svn path=/head/; revision=280084
Diffstat (limited to 'www')
| -rw-r--r-- | www/foswiki-ModPerlEngineContrib/Makefile | 7 | ||||
| -rw-r--r-- | www/foswiki/Makefile | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/www/foswiki-ModPerlEngineContrib/Makefile b/www/foswiki-ModPerlEngineContrib/Makefile index 2dad2a4ef4a6..689fb3ae96d8 100644 --- a/www/foswiki-ModPerlEngineContrib/Makefile +++ b/www/foswiki-ModPerlEngineContrib/Makefile @@ -12,16 +12,13 @@ MASTER_SITES= http://protey.ru/freebsd/distfiles/ \ MAINTAINER= skv@FreeBSD.org COMMENT= Permits Foswiki to be executed under mod_perl -BUILD_DEPENDS= foswiki>=0:/usr/ports/www/foswiki -RUN_DEPENDS= ${BUILD_DEPENDS} \ +RUN_DEPENDS= foswiki>=0:${PORTSDIR}/www/foswiki \ ${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.0:${PORTSDIR}/www/mod_perl2 \ p5-libapreq2>=2.0:${PORTSDIR}/www/p5-libapreq2 SVNREV= 8600 -USE_APACHE= 2.2+ - -BROKEN= conflicting dependencies +USE_APACHE= 22+ .include "${.CURDIR}/../foswiki/bsd.foswiki.mk" .include <bsd.port.mk> diff --git a/www/foswiki/Makefile b/www/foswiki/Makefile index 07650d103261..a6609d0ecf68 100644 --- a/www/foswiki/Makefile +++ b/www/foswiki/Makefile @@ -50,7 +50,7 @@ RUN_DEPENDS+= p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \ .endif .if defined(WITH_APACHE) -USE_APACHE?= 1.3+ +USE_APACHE?= 13+ PLIST_SUB+= NOAPACHE="" PKGMESSAGE= pkg-message-apache SUB_FILES+= pkg-message-apache |