ports/58043: [Maintainer Update] www/p5-CGI-Kwiki

[Cheng-Lung Sung]

>Number:         58043
>Category:       ports
>Synopsis:       [Maintainer Update] www/p5-CGI-Kwiki
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 14 21:00:20 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Cheng-Lung Sung
>Release:        FreeBSD 4.8-RELEASE-p13 i386
>Organization:
FreeBSD @ Taiwan
>Environment:
System: FreeBSD sungsung.csie.nctu.edu.tw 4.8-RELEASE-p13 FreeBSD 4.8-RELEASE-p13 #3: Wed Oct 8 07:32:16 CST 2003 root at sungsung.csie.nctu.edu.tw:/usr/obj/usr/src/sys/SUNGSUNG i386

>Description:
-	add RUN_DEPENDS with p5-Locale-Maketext
-	add EXTRA_PATCHES with PERL_LEVEL < 5.00601
>How-To-Repeat:
>Fix:

diff -ruN /usr/ports/www/p5-CGI-Kwiki/Makefile ./p5-CGI-Kwiki/Makefile
--- /usr/ports/www/p5-CGI-Kwiki/Makefile	Tue Oct 14 23:41:59 2003
+++ ./p5-CGI-Kwiki/Makefile	Wed Oct 15 11:46:18 2003
@@ -7,6 +7,7 @@
 
 PORTNAME=	CGI-Kwiki
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
@@ -15,10 +16,11 @@
 MAINTAINER=	clsung at dragon2.net
 COMMENT=	A Quickie Wiki Package that's not too Tricky
 
-PERL_CONFIGURE=	yes
-
 BUILD_DEPENDS=	${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${BUILD_DEPENDS} \
+		${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext
+
+PERL_CONFIGURE=	yes
 
 MAN1=		kwiki-install.1
 MAN3=		CGI::Kwiki.3 \
@@ -49,6 +51,7 @@
 		     -e 'if (/\@\$$\(POD2MAN\)/) { $$_ .= "\tlib/CGI/Kwiki/Config.pm \\\n\t\$$(INST_MAN3DIR)/CGI::Kwiki::Config.\$$(MAN3EXT) \\\n\tlib/CGI/Kwiki/Config_yaml.pm \\\n\t\$$(INST_MAN3DIR)/CGI::Kwiki::Config_yaml.\$$(MAN3EXT) \\\n"};' \
 			${WRKSRC}/Makefile
 .if ${PERL_LEVEL} < 500601
+EXTRA_PATCHES=	${FILESDIR}/p5005-patch-CGI-Kwiki-Template.pm
 post-patch:
 	${PERL} -pi -e '$$_ = "" if /warnings/;' \
 	             -e 's/\$$\w+(->\w+)?->\$$\w+\b(?!\()/$$&()/g;' \
diff -ruN /usr/ports/www/p5-CGI-Kwiki/files/p5005-patch-CGI-Kwiki-Template.pm ./p5-CGI-Kwiki/files/p5005-patch-CGI-Kwiki-Template.pm
--- /usr/ports/www/p5-CGI-Kwiki/files/p5005-patch-CGI-Kwiki-Template.pm	Thu Jan  1 08:00:00 1970
+++ ./p5-CGI-Kwiki/files/p5005-patch-CGI-Kwiki-Template.pm	Wed Oct 15 11:38:27 2003
@@ -0,0 +1,12 @@
+--- lib/CGI/Kwiki/Template.pm.orig	Fri Aug 29 09:30:19 2003
++++ lib/CGI/Kwiki/Template.pm	Wed Oct 15 11:37:23 2003
+@@ -71,7 +71,8 @@
+     my ($self, $text, $v) = @_;
+     my $re;
+     $text = $self->loc($text);
+-    $re = qr/\[((?:(?>[^\[\]]+)|(??{$re}))*)\]/;
++    #$re = qr/\[((?:(?>[^\[\]]+)|(??{$re}))*)\]/;
++    $re = qr/\[((?:(?>[^\[\]]+)|\[[^\[\]]*\])*)\]/;
+     $text =~ s{$re}
+               {<a href="[% script %]?$1">$1</a>}g;
+     $text =~ s{\[%\s+(\w+)\s+%\]\n?}
>Release-Note:
>Audit-Trail:
>Unformatted: