From 16910d0cc46c655babbf8aba9da1389d13c88cbb Mon Sep 17 00:00:00 2001
From: schmonz <schmonz>
Date: Thu, 20 Feb 2014 16:40:53 +0000
Subject: Update to 0.11. From the changelog:

- upgraded Discount to 2.1.7, which fixed an issue generating <em> tags
  from _<nonascii>_ and *<nonascii>*
- doc typo fix (by @harupong)
---
 textproc/p5-Text-Markdown-Discount/Makefile                  |  5 ++---
 textproc/p5-Text-Markdown-Discount/distinfo                  | 12 ++++++------
 .../p5-Text-Markdown-Discount/patches/patch-configure.sh     |  4 +++-
 .../patches/patch-discount_Makefile.in                       | 10 +++++-----
 4 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'textproc/p5-Text-Markdown-Discount')

diff --git a/textproc/p5-Text-Markdown-Discount/Makefile b/textproc/p5-Text-Markdown-Discount/Makefile
index 2c4aef2eb51..6320315193b 100644
--- a/textproc/p5-Text-Markdown-Discount/Makefile
+++ b/textproc/p5-Text-Markdown-Discount/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/08/30 15:49:48 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/20 16:40:53 schmonz Exp $
 #
 
-DISTNAME=		Text-Markdown-Discount-0.10
+DISTNAME=		Text-Markdown-Discount-0.11
 PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		textproc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Text/}
@@ -11,7 +11,6 @@ HOMEPAGE=		http://search.cpan.org/dist/Text-Markdown-Discount/
 COMMENT=		Convert Markdown to (X)HTML
 LICENSE=		${PERL5_LICENSE}
 
-#WRKSRC=			${WRKDIR}/sekimura-text-markdown-discount-c45fb0c
 PERL5_PACKLIST=		auto/Text/Markdown/Discount/.packlist
 USE_LANGUAGES=		c
 
diff --git a/textproc/p5-Text-Markdown-Discount/distinfo b/textproc/p5-Text-Markdown-Discount/distinfo
index 16c8c84e9a6..3ce54092c61 100644
--- a/textproc/p5-Text-Markdown-Discount/distinfo
+++ b/textproc/p5-Text-Markdown-Discount/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2013/08/30 15:49:48 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2014/02/20 16:40:53 schmonz Exp $
 
-SHA1 (Text-Markdown-Discount-0.10.tar.gz) = 3630249ac84f863c8ca05b0217db08c719d14a20
-RMD160 (Text-Markdown-Discount-0.10.tar.gz) = b7711dbc22b3ade3cf728a2045dd6fef961db7cb
-Size (Text-Markdown-Discount-0.10.tar.gz) = 176422 bytes
+SHA1 (Text-Markdown-Discount-0.11.tar.gz) = cd0b2bdc3479f90a0f3e68421984bb47f015d1d2
+RMD160 (Text-Markdown-Discount-0.11.tar.gz) = a4484f181746789b7bfb7c0faa95011bb374e383
+Size (Text-Markdown-Discount-0.11.tar.gz) = 177087 bytes
 SHA1 (patch-MANIFEST) = 3fcc9d2a3e827d3df3c80c13727a4cc89a62feb0
-SHA1 (patch-configure.sh) = 07fb38334cd3511b4fa303ca794611f77ec2e0e9
-SHA1 (patch-discount_Makefile.in) = 28635ba1539e0bb46290ba59074b405c14acdc1a
+SHA1 (patch-configure.sh) = 244ae32f085b4587fc777aaabcc63735f74cef43
+SHA1 (patch-discount_Makefile.in) = 40bbbb1ef6c0a38d04cbfab618480b504614a125
diff --git a/textproc/p5-Text-Markdown-Discount/patches/patch-configure.sh b/textproc/p5-Text-Markdown-Discount/patches/patch-configure.sh
index 6ebc9dff59c..37d5a2a169f 100644
--- a/textproc/p5-Text-Markdown-Discount/patches/patch-configure.sh
+++ b/textproc/p5-Text-Markdown-Discount/patches/patch-configure.sh
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure.sh,v 1.3 2013/08/26 00:23:04 wen Exp $
+$NetBSD: patch-configure.sh,v 1.4 2014/02/20 16:40:54 schmonz Exp $
+
+Fix messed up configure.sh.
 
 --- discount/configure.sh.orig	2013-08-26 08:16:50.000000000 +0000
 +++ discount/configure.sh
diff --git a/textproc/p5-Text-Markdown-Discount/patches/patch-discount_Makefile.in b/textproc/p5-Text-Markdown-Discount/patches/patch-discount_Makefile.in
index b7248f0dc59..c9632ca6dbe 100644
--- a/textproc/p5-Text-Markdown-Discount/patches/patch-discount_Makefile.in
+++ b/textproc/p5-Text-Markdown-Discount/patches/patch-discount_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-discount_Makefile.in,v 1.1 2013/08/30 15:49:49 schmonz Exp $
+$NetBSD: patch-discount_Makefile.in,v 1.2 2014/02/20 16:40:54 schmonz Exp $
 
 Fix build on case-insensitive filesystems (e.g., Darwin's).
 
---- discount/Makefile.in.orig	2013-07-09 21:38:57.000000000 +0000
+--- discount/Makefile.in.orig	2013-11-15 18:26:06.000000000 +0000
 +++ discount/Makefile.in
 @@ -25,7 +25,7 @@ all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEW
  
@@ -18,9 +18,9 @@ Fix build on case-insensitive filesystems (e.g., Darwin's).
  	@INSTALL_DIR@ $(DESTDIR)$(LIBDIR)
  
 -version.o: version.c VERSION
--	$(CC) -DVERSION=\"`cat VERSION`\" -c version.c
+-	$(CC) $(CFLAGS) -DVERSION=\"`cat VERSION`\" -c version.c
 +version.o: version.c MYVERSION
-+	$(CC) -DVERSION=\"`cat MYVERSION`\" -c version.c
++	$(CC) $(CFLAGS) -DVERSION=\"`cat MYVERSION`\" -c version.c
  
 -VERSION:
 +MYVERSION:
@@ -28,7 +28,7 @@ Fix build on case-insensitive filesystems (e.g., Darwin's).
  
  tags.o: tags.c blocktags
 @@ -95,7 +95,7 @@ main.o: main.c mkdio.h config.h
- 	$(CC) -I. -c main.c
+ 	$(CC) $(CFLAGS) -I. -c main.c
  
  $(MKDLIB): $(OBJS)
 -	./librarian.sh make $(MKDLIB) VERSION $(OBJS)
-- 
cgit v1.2.3