diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2005-12-28 20:36:05 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2005-12-28 20:36:05 +0000 |
| commit | a099c692f054a9abc5ba990d576ee6958ecd9667 (patch) | |
| tree | d8a0fa78395db1c21d9ade81aa4e41f3bb4e58af /www/WebMagick | |
| parent | 9ee698e49edb099151c4a098717ab7340d483a03 (diff) | |
| download | ports-a099c692f054a9abc5ba990d576ee6958ecd9667.tar.gz ports-a099c692f054a9abc5ba990d576ee6958ecd9667.zip | |
Notes
Diffstat (limited to 'www/WebMagick')
| -rw-r--r-- | www/WebMagick/Makefile | 2 | ||||
| -rw-r--r-- | www/WebMagick/files/patch-aa | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile index 28edab1dd950..17018aff094b 100644 --- a/www/WebMagick/Makefile +++ b/www/WebMagick/Makefile @@ -7,7 +7,7 @@ PORTNAME= WebMagick PORTVERSION= 2.03p3 -PORTREVISION= 19 +PORTREVISION= 20 PORTEPOCH= 1 CATEGORIES= www graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa index e1dc356c1fcc..560c49a3976f 100644 --- a/www/WebMagick/files/patch-aa +++ b/www/WebMagick/files/patch-aa @@ -2,15 +2,15 @@ Index: webmagick.in =================================================================== RCS file: /cvsroot/webmagick/WebMagick/webmagick.in,v retrieving revision 1.117 -retrieving revision 1.150 -diff -u -r1.117 -r1.150 +retrieving revision 1.151 +diff -u -r1.117 -r1.151 --- webmagick.in 23 Oct 2002 16:14:47 -0000 1.117 -+++ webmagick.in 20 Nov 2004 05:22:55 -0000 1.150 ++++ webmagick.in 28 Dec 2005 20:25:54 -0000 1.151 @@ -1,6 +1,6 @@ #! @PERL@ # -# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $ -+# $Id: webmagick.in,v 1.150 2004/11/20 05:22:55 ache Exp $ ++# $Id: webmagick.in,v 1.151 2005/12/28 20:25:54 ache Exp $ # # You are looking at the main PERL script for WebMagick, a package to # intelligently create HTML and JavaScript index files and imagemaps @@ -1360,7 +1360,7 @@ diff -u -r1.117 -r1.150 return( $_ ); } -@@ -4324,22 +4559,10 @@ +@@ -4324,23 +4559,10 @@ # Escape unsafe characters in URLs # sub escapeurl { @@ -1381,12 +1381,13 @@ diff -u -r1.117 -r1.150 - s/\}/%7D/g; # } - s/\~/%7E/g; # ~ - s/ /%20/g; # " " -+ # ' is here because some bots (Google) goes crazy on "xxx'xxx" -+ s/([][\x00-\x20"#%'<>^`{|}~\x7F-\xFF])/sprintf("%%%02x", ord($1))/eg; - s:\\:/:g; # replace \ with / for better URLs +- s:\\:/:g; # replace \ with / for better URLs ++ # RFC 2396 ++ s/([^0-9a-zA-Z_.!~*'()-])/sprintf("%%%02x", ord($1))/eg; return( $_ ); } -@@ -4387,7 +4610,6 @@ + +@@ -4387,7 +4609,6 @@ my $rc; foreach $rc (@_) { next if ( ! -r $rc || ! -f $rc ); @@ -1394,7 +1395,7 @@ diff -u -r1.117 -r1.150 eval ( get_rc($rc) ); if( $@ ) { print( STDERR "Bad Eval for file \"${rc}\"...\n$@\n" ); -@@ -4468,7 +4690,7 @@ +@@ -4468,7 +4689,7 @@ my $path=$top; $direlem=''; do { |