From a3cef47c8ff36b519e8a68eb033782daf7f90ec2 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Wed, 16 May 2012 04:09:48 +0000
Subject: - Update to 1.48 - Merged BUILD_DEPENDS and RUN_DEPENDS as it
 produces error while building - Removed APACHE13 based dependancy

PR:		166590
Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com>
---
 www/p5-HTML-Mason/Makefile | 18 ++++++------------
 www/p5-HTML-Mason/distinfo |  4 ++--
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'www/p5-HTML-Mason')

diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 00826bde7d13..448c3d434f4e 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	HTML-Mason
-PORTVERSION=	1.45
+PORTVERSION=	1.48
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,13 +15,11 @@ MAINTAINER=	dsh@vlink.ru
 COMMENT=	High-performance, dynamic web site authoring system
 
 BUILD_DEPENDS=	p5-Class-Container>=0.7:${PORTSDIR}/devel/p5-Class-Container \
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser
-RUN_DEPENDS=	p5-Cache-Cache>=1:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Class-Container>=0.7:${PORTSDIR}/devel/p5-Class-Container \
+		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
 		p5-Exception-Class>=1.15:${PORTSDIR}/devel/p5-Exception-Class \
 		p5-Log-Any>=0.08:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Params-Validate>=0.07:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser
+		p5-Cache-Cache>=1:${PORTSDIR}/devel/p5-Cache-Cache
 TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
 
 PERL_MODBUILD=	yes
@@ -58,8 +56,7 @@ MAN3=		Bundle::HTML::Mason.3 \
 		HTML::Mason::Tools.3 \
 		HTML::Mason::Utils.3
 
-OPTIONS=	MOD_PERL "with mod_perl dependency" off \
-		APACHE2 "with mod_perl for Apache 2" off
+OPTIONS=	MOD_PERL "with mod_perl dependency" off
 
 post-build:
 	${MV} -f ${WRKSRC}/bin ${WRKSRC}/bin.orig
@@ -71,11 +68,8 @@ post-install:
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MOD_PERL)
-.if defined(WITH_APACHE2)
+USE_APACHE=	2.0+
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2
-.else
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache/libapreq.pm:${PORTSDIR}/www/p5-libapreq
-.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-HTML-Mason/distinfo b/www/p5-HTML-Mason/distinfo
index 13612f0e8ff2..5477d39007c0 100644
--- a/www/p5-HTML-Mason/distinfo
+++ b/www/p5-HTML-Mason/distinfo
@@ -1,2 +1,2 @@
-SHA256 (HTML-Mason-1.45.tar.gz) = d2a727bacbffd382b56c14bde880b2d329f858561dce80d3cba9865f3082e5ab
-SIZE (HTML-Mason-1.45.tar.gz) = 488490
+SHA256 (HTML-Mason-1.48.tar.gz) = c249109c741aecf31800331775a762c5791af4f0065919189403af9aae3345b4
+SIZE (HTML-Mason-1.48.tar.gz) = 489970
-- 
cgit v1.2.3