kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- unbreak build now where apache22 is the default the

Browse source 
port builds fine
This commit is contained in:
Olli Hauer 2011-08-20 17:23:05 +00:00
parent 14feac0fba
commit 7d7b475f69
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=280084
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
www/foswiki-ModPerlEngineContrib/Makefile
View file

@ -12,16 +12,13 @@ MASTER_SITES= http://protey.ru/freebsd/distfiles/ \
MAINTAINER= skv@FreeBSD.org MAINTAINER= skv@FreeBSD.org
COMMENT= Permits Foswiki to be executed under mod_perl COMMENT= Permits Foswiki to be executed under mod_perl
BUILD_DEPENDS= foswiki>=0:/usr/ports/www/foswiki RUN_DEPENDS= foswiki>=0:${PORTSDIR}/www/foswiki \
RUN_DEPENDS= ${BUILD_DEPENDS} \
${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.0:${PORTSDIR}/www/mod_perl2 \ ${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.0:${PORTSDIR}/www/mod_perl2 \
p5-libapreq2>=2.0:${PORTSDIR}/www/p5-libapreq2 p5-libapreq2>=2.0:${PORTSDIR}/www/p5-libapreq2
SVNREV= 8600 SVNREV= 8600
USE_APACHE= 2.2+ USE_APACHE= 22+
BROKEN= conflicting dependencies
.include "${.CURDIR}/../foswiki/bsd.foswiki.mk" .include "${.CURDIR}/../foswiki/bsd.foswiki.mk"
.include <bsd.port.mk> .include <bsd.port.mk>

2
www/foswiki/Makefile
View file

@ -50,7 +50,7 @@ RUN_DEPENDS+= p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
.endif .endif
.if defined(WITH_APACHE) .if defined(WITH_APACHE)
USE_APACHE?= 1.3+ USE_APACHE?= 13+
PLIST_SUB+= NOAPACHE="" PLIST_SUB+= NOAPACHE=""
PKGMESSAGE= pkg-message-apache PKGMESSAGE= pkg-message-apache
SUB_FILES+= pkg-message-apache SUB_FILES+= pkg-message-apache