From 79a2932c0f4e2e4ad1953df2b1b49c2231d16728 Mon Sep 17 00:00:00 2001 From: matthew Date: Mon, 4 Jun 2012 19:11:13 +0000 Subject: - Fix USE_APACHE syntax - Set RUN_DEPENDS from BUILD_DEPENDS - update to new OPTIONS framework Approved by: shaun (mentor) PR: ports/168143 Submitted by: me --- www/p5-HTML-Mason/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile index 448c3d434f4e..bc13b2e2383a 100644 --- a/www/p5-HTML-Mason/Makefile +++ b/www/p5-HTML-Mason/Makefile @@ -20,6 +20,7 @@ BUILD_DEPENDS= p5-Class-Container>=0.7:${PORTSDIR}/devel/p5-Class-Container \ p5-Exception-Class>=1.15:${PORTSDIR}/devel/p5-Exception-Class \ p5-Log-Any>=0.08:${PORTSDIR}/devel/p5-Log-Any \ p5-Cache-Cache>=1:${PORTSDIR}/devel/p5-Cache-Cache +RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep PERL_MODBUILD= yes @@ -56,7 +57,8 @@ MAN3= Bundle::HTML::Mason.3 \ HTML::Mason::Tools.3 \ HTML::Mason::Utils.3 -OPTIONS= MOD_PERL "with mod_perl dependency" off +OPTIONS_DEFINE= MOD_PERL +MOD_PERL_DESC= with mod_perl dependency post-build: ${MV} -f ${WRKSRC}/bin ${WRKSRC}/bin.orig @@ -65,11 +67,11 @@ post-build: post-install: ${INSTALL_SCRIPT} ${WRKSRC}/blib/script.orig/mason.pl ${PREFIX}/bin -.include +.include -.if defined(WITH_MOD_PERL) -USE_APACHE= 2.0+ +.if ${PORT_OPTIONS:MMOD_PERL} +USE_APACHE= 20+ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 .endif -.include +.include -- cgit