summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkuriyama <kuriyama@FreeBSD.org>2002-05-20 22:59:54 +0000
committerkuriyama <kuriyama@FreeBSD.org>2002-05-20 22:59:54 +0000
commita917827eba76f93510e2465fa867d89295d64b5e (patch)
tree66454734a556d57900145fdf35c6cf3f57a78a97
parent202e4cfc4f1e7a0638f159693816696f7262fa5b (diff)
downloadFreeBSD-ports-a917827eba76f93510e2465fa867d89295d64b5e.zip
FreeBSD-ports-a917827eba76f93510e2465fa867d89295d64b5e.tar.gz
Add a patch to fix debug message indent bug (cosmetic).
Depends on File::Spec only if required. For latest -current, perl5 port is installed on $PREFIX and this conflicts with p5-File-Spec port's manpages. I use "5.6.1" literally in .if exists() check because bsd.port.pre.mk does not define $PREL_VERSION.
-rw-r--r--www/p5-HTML-Template/Makefile7
-rw-r--r--www/p5-HTML-Template/files/patch-Template.pm13
2 files changed, 17 insertions, 3 deletions
diff --git a/www/p5-HTML-Template/Makefile b/www/p5-HTML-Template/Makefile
index d268043..a06a347 100644
--- a/www/p5-HTML-Template/Makefile
+++ b/www/p5-HTML-Template/Makefile
@@ -7,6 +7,7 @@
PORTNAME= HTML-Template
PORTVERSION= 2.5
+PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
@@ -14,8 +15,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
+.include <bsd.port.pre.mk>
+
+.if !exists(${PREFIX}/lib/perl5/5.6.1/File/Spec.pm)
BUILD_DEPENDS= ${PERL_INC}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
RUN_DEPENDS= ${PERL_INC}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+.endif
PERL_CONFIGURE= yes
@@ -26,4 +31,4 @@ PERL_INC= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
post-patch:
${PERL} -i -pe 's@%%PERL_INC%%@${PERL_INC}@' ${WRKSRC}/Template.pm
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/p5-HTML-Template/files/patch-Template.pm b/www/p5-HTML-Template/files/patch-Template.pm
index 684a48b..4e71f9d 100644
--- a/www/p5-HTML-Template/files/patch-Template.pm
+++ b/www/p5-HTML-Template/files/patch-Template.pm
@@ -1,5 +1,5 @@
---- Template.pm.orig Tue Feb 19 22:15:56 2002
-+++ Template.pm Tue Feb 19 22:18:31 2002
+--- Template.pm.orig Sat Feb 2 08:01:37 2002
++++ Template.pm Tue Mar 12 11:24:20 2002
@@ -863,7 +863,9 @@
use strict; # and no funny business, either.
@@ -10,3 +10,12 @@
# define accessor constants used to improve readability of array
# accesses into "objects". I used to use 'use constant' but that
+@@ -2011,7 +2013,7 @@
+ push(@ifstack, $cond);
+
+ } elsif ($which eq '/TMPL_IF' or $which eq '/TMPL_UNLESS') {
+- $options->{debug} and print STDERR "### HTML::Template Debug ###$fname : line $fcounter : $which end\n";
++ $options->{debug} and print STDERR "### HTML::Template Debug ### $fname : line $fcounter : $which end\n";
+
+ my $cond = pop(@ifstack);
+ die "HTML::Template->new() : found </${which}> with no matching <TMPL_IF> at $fname : line $fcounter." unless defined $cond;
OpenPOWER on IntegriCloud