View | Details | Raw Unified | Return to bug 58043
Collapse All | Expand All

(-)./p5-CGI-Kwiki/Makefile (-3 / +6 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	CGI-Kwiki
8
PORTNAME=	CGI-Kwiki
9
PORTVERSION=	0.18
9
PORTVERSION=	0.18
10
PORTREVISION=	1
10
CATEGORIES=	www perl5
11
CATEGORIES=	www perl5
11
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
12
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
12
MASTER_SITE_SUBDIR=	CGI
13
MASTER_SITE_SUBDIR=	CGI
Lines 15-24 Link Here
15
MAINTAINER=	clsung@dragon2.net
16
MAINTAINER=	clsung@dragon2.net
16
COMMENT=	A Quickie Wiki Package that's not too Tricky
17
COMMENT=	A Quickie Wiki Package that's not too Tricky
17
18
18
PERL_CONFIGURE=	yes
19
20
BUILD_DEPENDS=	${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
19
BUILD_DEPENDS=	${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm
21
RUN_DEPENDS=	${BUILD_DEPENDS}
20
RUN_DEPENDS=	${BUILD_DEPENDS} \
21
		${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext
22
23
PERL_CONFIGURE=	yes
22
24
23
MAN1=		kwiki-install.1
25
MAN1=		kwiki-install.1
24
MAN3=		CGI::Kwiki.3 \
26
MAN3=		CGI::Kwiki.3 \
Lines 49-54 Link Here
49
		     -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"};' \
51
		     -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"};' \
50
			${WRKSRC}/Makefile
52
			${WRKSRC}/Makefile
51
.if ${PERL_LEVEL} < 500601
53
.if ${PERL_LEVEL} < 500601
54
EXTRA_PATCHES=	${FILESDIR}/p5005-patch-CGI-Kwiki-Template.pm
52
post-patch:
55
post-patch:
53
	${PERL} -pi -e '$$_ = "" if /warnings/;' \
56
	${PERL} -pi -e '$$_ = "" if /warnings/;' \
54
	             -e 's/\$$\w+(->\w+)?->\$$\w+\b(?!\()/$$&()/g;' \
57
	             -e 's/\$$\w+(->\w+)?->\$$\w+\b(?!\()/$$&()/g;' \
(-)./p5-CGI-Kwiki/files/p5005-patch-CGI-Kwiki-Template.pm (+12 lines)
Line 0 Link Here
1
--- lib/CGI/Kwiki/Template.pm.orig	Fri Aug 29 09:30:19 2003
2
+++ lib/CGI/Kwiki/Template.pm	Wed Oct 15 11:37:23 2003
3
@@ -71,7 +71,8 @@
4
     my ($self, $text, $v) = @_;
5
     my $re;
6
     $text = $self->loc($text);
7
-    $re = qr/\[((?:(?>[^\[\]]+)|(??{$re}))*)\]/;
8
+    #$re = qr/\[((?:(?>[^\[\]]+)|(??{$re}))*)\]/;
9
+    $re = qr/\[((?:(?>[^\[\]]+)|\[[^\[\]]*\])*)\]/;
10
     $text =~ s{$re}
11
               {<a href="[% script %]?$1">$1</a>}g;
12
     $text =~ s{\[%\s+(\w+)\s+%\]\n?}

Return to bug 58043