pkgsrc changes:

  - Updating package for p5 module Text::WikiCreole from 0.05nb2 to 0.07
  - Setting gnu-gpl-v2 as license
  - removing patch to add creole_link creole_barelink (applied upstream)

Upstream changes:
0.07    10/5/2008
   Bug fix: Italics around links rendered incorrectly

0.06    10/5/2008
   Bug fix: & not converted to & where appropriate
   Feature addition: creole_barelink() and creole_custombarelinks()
      functions for customized handling of http://google.com style links
      courtesy of Bernd Zeimetz

3 files changed, 7 insertions, 89 deletions

diff --git a/textproc/p5-Text-WikiCreole/Makefile b/textproc/p5-Text-WikiCreole/Makefile
index 644f04dc19a..43a57703fb9 100644
--- a/textproc/p5-Text-WikiCreole/Makefile
+++ b/textproc/p5-Text-WikiCreole/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2008/10/19 19:18:57 he Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/21 13:42:30 sno Exp $
 #
 
-DISTNAME=		Text-WikiCreole-0.05
-PKGREVISION=		2
+DISTNAME=		Text-WikiCreole-0.07
 PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		textproc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Text/}
@@ -10,6 +9,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Text/}
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Text-WikiCreole/
 COMMENT=		Translate Wiki Creole markup into XHTML
+LICENSE=		gnu-gpl-v2 # OR artistic
 
 PERL5_PACKLIST=		auto/Text/WikiCreole/.packlist
 
diff --git a/textproc/p5-Text-WikiCreole/distinfo b/textproc/p5-Text-WikiCreole/distinfo
index 7262ada9b2a..b1a06fe6052 100644
--- a/textproc/p5-Text-WikiCreole/distinfo
+++ b/textproc/p5-Text-WikiCreole/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/08/01 18:59:02 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2009/05/21 13:42:30 sno Exp $
 
-SHA1 (Text-WikiCreole-0.05.tar.gz) = 83793e0e058929727e0d114335d3ad33d3c4c92b
-RMD160 (Text-WikiCreole-0.05.tar.gz) = bb21e35e22afddba87ef85e41670bb45a9a17bac
-Size (Text-WikiCreole-0.05.tar.gz) = 11465 bytes
-SHA1 (patch-aa) = 3a298775cdb24cbbe8afd86a8a544091dcf6ade3
+SHA1 (Text-WikiCreole-0.07.tar.gz) = b325fb45e62bdd5a281cb30ba6ee5a4b2fd8a9f4
+RMD160 (Text-WikiCreole-0.07.tar.gz) = 0991fce15a042d59550ff6bee9a7145983581e2c
+Size (Text-WikiCreole-0.07.tar.gz) = 11875 bytes
diff --git a/textproc/p5-Text-WikiCreole/patches/patch-aa b/textproc/p5-Text-WikiCreole/patches/patch-aa
deleted file mode 100644
index 004695558c9..00000000000
--- a/textproc/p5-Text-WikiCreole/patches/patch-aa
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/08/01 18:59:02 schmonz Exp $
-
---- lib/Text/WikiCreole.pm.orig	2007-10-11 17:56:06.000000000 -0400
-+++ lib/Text/WikiCreole.pm
-@@ -1,7 +1,8 @@
- package Text::WikiCreole;
- require Exporter;
- @ISA = (Exporter);
--@EXPORT = qw(creole_parse creole_plugin creole_link creole_tag creole_img creole_customlinks creole_customimgs);
-+@EXPORT = qw(creole_parse creole_plugin creole_tag creole_img creole_customimgs
-+             creole_link creole_barelink creole_customlinks creole_custombarelinks);
- use vars qw($VERSION);
- use strict;
- use warnings;
-@@ -44,6 +45,8 @@ my $bol = '(?:^|\n)'; # beginning of lin
- my $plugin_function;
- # user-supplied link URL parser function
- my $link_function;
-+# user-supplied bare link parser function
-+my $barelink_function;
- # user-supplied image URL parser function
- my $img_function;
- 
-@@ -321,9 +324,12 @@ my %chunks = (
-     curpat => '(?=(?:https?|ftp):\/\/)',
-     stops => '(?=[[:punct:]]?(?:\s|$))',
-     hint => ['h', 'f'],
--    filter => sub { 
-+    filter => sub {
-       $_[0] =~ s/^\s*//o;
-       $_[0] =~ s/\s*$//o;
-+      if($barelink_function) {
-+        $_[0] = &$barelink_function($_[0]);
-+      }
-       return "href=\"$_[0]\">$_[0]"; },
-     open => "<a ", close=> "</a>",
-   },
-@@ -643,6 +649,22 @@ sub creole_customlinks {
-   }
- }
- 
-+sub creole_barelink {
-+  return unless defined $_[0];
-+  $barelink_function = $_[0];
-+}
-+
-+sub creole_custombarelinks {
-+  $chunks{ilink}{open} = "";
-+  $chunks{ilink}{close} = "";
-+  $chunks{ilink}{filter} = sub {
-+    if($barelink_function) {
-+      $_[0] = &$barelink_function($_[0]);
-+    }
-+    return $_[0];
-+  }
-+}
-+
- sub creole_customimgs {
-   $chunks{img}{open} = "";
-   $chunks{img}{close} = "";
-@@ -756,6 +778,20 @@ reads Creole 1.0 markup and returns XHTM
-   
-     This has no effect on "bare" link markup, such as http://cpan.org.
- 
-+=head2 creole_barelink
-+
-+    Same purpose as creole_link, but for "bare" link markup.
-+
-+    sub mybarelink {
-+      return "$_[0].html";
-+      return $_[0];
-+    }
-+    creole_barelink \&mybarelink;
-+
-+=head2 creole_custombarelinks
-+
-+    Same purpose as creole_customlinks, but for "bare" link markup.
-+
- =head2 creole_img
- 
-     Same purpose as creole_link, but for image URLs.