From 334c320374c1239f6a491bb736715e6039cfd1a6 Mon Sep 17 00:00:00 2001
From: matusita <matusita@FreeBSD.org>
Date: Tue, 4 May 2004 13:27:57 +0000
Subject: Add a patch to fix warning about character-class string. Bump
 PORTREVISION.

Why patch needed?  According ruby 1.8 language definition, even if
the first character-class string is square branket, warn if not
escaped with backslash.  See also ruby/regex.c rev 1.81(*1).  Since
[\]] is properly processed by ruby 1.6, patch this unconditionally.

Adviced about ruby language by: knu, hrs

*1) http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/ruby/regex.c#rev1.81
---
 www/aswiki/Makefile               |  3 ++-
 www/aswiki/files/patch-scanner.rb | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 www/aswiki/files/patch-scanner.rb

(limited to 'www')

diff --git a/www/aswiki/Makefile b/www/aswiki/Makefile
index 3ea63a0487ec..5ac01ea6fef9 100644
--- a/www/aswiki/Makefile
+++ b/www/aswiki/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		aswiki
 PORTVERSION=		1.0.2
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		www ruby
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,6 +37,7 @@ post-patch:
 						>> ${WRKSRC}/aswiki.conf
 	${REINPLACE_CMD} -e "s|^# \\$$|\\$$|" -e "s|__DATADIR__|${DATADIR}|" \
 		-e "s|\\A(\?:|\\A(|" ${WRKSRC}/aswiki.conf
+	${FIND} ${PATCH_WRKSRC} -name '*.orig' -delete
 
 do-install:
 	# Ruby libraries
diff --git a/www/aswiki/files/patch-scanner.rb b/www/aswiki/files/patch-scanner.rb
new file mode 100644
index 000000000000..3f21ea325135
--- /dev/null
+++ b/www/aswiki/files/patch-scanner.rb
@@ -0,0 +1,16 @@
+--- aswiki/scanner.rb.dist	Fri Jan 17 22:56:47 2003
++++ aswiki/scanner.rb	Tue May  4 22:17:21 2004
+@@ -97,11 +97,11 @@
+ 	  q.push [:TABLE_END, tmp]
+ 	elsif tmp = sc.scan(/\A\|\|/)
+ 	  q.push [:TABLE, tmp]
+-	elsif tmp = sc.scan(/\A\[img:#{URI::REGEXP::PATTERN::X_ABS_URI}\s+[^]]+?\]/xn)
++	elsif tmp = sc.scan(/\A\[img:#{URI::REGEXP::PATTERN::X_ABS_URI}\s+[^\]]+?\]/xn)
+ 	  q.push [:MOINHREFIMG, tmp]
+ 	# elsif tmp = sc.scan(/\A\[\S+ +\S+?\]/)
+ 	# elsif tmp = sc.scan(/\A\[\S+ +[^]]+?\]/)
+-	elsif tmp = sc.scan(/\A\[#{URI::REGEXP::PATTERN::X_ABS_URI}\s+[^]]+?\]/xn)
++	elsif tmp = sc.scan(/\A\[#{URI::REGEXP::PATTERN::X_ABS_URI}\s+[^\]]+?\]/xn)
+ 	  q.push [:MOINHREF, tmp]
+ 	elsif tmp = sc.scan(/\A\{\{/)
+ 	  q.push [:ESCAPE_BEGIN, tmp]
-- 
cgit