Import of pkgsrc-2014Q1

textproc/p5-Text-Markdown-Discount/Makefile

@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2013/05/31 12:42:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/20 16:40:53 schmonz Exp $
 #
 
-DISTNAME=		Text-Markdown-Discount-0.02
+DISTNAME=		Text-Markdown-Discount-0.11
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		2
 CATEGORIES=		textproc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Text/}
 
@@ -17,5 +16,8 @@ USE_LANGUAGES=		c
 
 MAKE_JOBS_SAFE=		no
 
+post-extract:
+	cd ${WRKSRC} && mv discount/VERSION discount/MYVERSION
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

textproc/p5-Text-Markdown-Discount/distinfo

@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2012/04/19 21:05:45 joerg Exp $
+$NetBSD: distinfo,v 1.6 2014/02/20 16:40:53 schmonz Exp $
 
-SHA1 (Text-Markdown-Discount-0.02.tar.gz) = 101ec221011ef099599e90bec5ae0f0cea6c6e25
-RMD160 (Text-Markdown-Discount-0.02.tar.gz) = 29b4b24d76c1687ddd48568ae674b87acd8b1b20
-Size (Text-Markdown-Discount-0.02.tar.gz) = 180943 bytes
-SHA1 (patch-configure.sh) = 046ca124f1db6e659f9d950c1bda5ecb570d4224
+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) = 244ae32f085b4587fc777aaabcc63735f74cef43
+SHA1 (patch-discount_Makefile.in) = 40bbbb1ef6c0a38d04cbfab618480b504614a125

textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST

@@ -0,0 +1,15 @@
+$NetBSD: patch-MANIFEST,v 1.1 2013/08/30 15:49:49 schmonz Exp $
+
+Fix build on case-insensitive filesystems (e.g., Darwin's).
+
+--- MANIFEST.orig	2013-08-09 20:07:19.000000000 +0000
++++ MANIFEST
+@@ -98,7 +98,7 @@ discount/toc.c
+ discount/tools/checkbits.sh
+ discount/tools/cols.c
+ discount/tools/echo.c
+-discount/VERSION
++discount/MYVERSION
+ discount/version.c.in
+ discount/xml.c
+ discount/xmlpage.c

textproc/p5-Text-Markdown-Discount/patches/patch-configure.sh

@@ -1,8 +1,10 @@
-$NetBSD: patch-configure.sh,v 1.1 2012/04/19 21:05:46 joerg Exp $
+$NetBSD: patch-configure.sh,v 1.4 2014/02/20 16:40:54 schmonz Exp $
 
---- discount-2.1.2/configure.sh.orig	2012-04-19 14:00:16.000000000 +0000
-+++ discount-2.1.2/configure.sh
-@@ -76,11 +76,11 @@ AC_C_INLINE
+Fix messed up configure.sh.
+
+--- discount/configure.sh.orig	2013-08-26 08:16:50.000000000 +0000
++++ discount/configure.sh
+@@ -87,11 +87,11 @@ AC_C_INLINE
  AC_SCALAR_TYPES sub hdr
  AC_CHECK_BASENAME
  
@@ -17,30 +19,30 @@ $NetBSD: patch-configure.sh,v 1.1 2012/04/19 21:05:46 joerg Exp $
      AC_DEFINE 'INITRNG(x)' 'srand((unsigned int)x)'
  else
      AC_DEFINE 'INITRNG(x)' '(void)1'
-@@ -102,7 +102,7 @@ else
+@@ -113,7 +113,7 @@ else
      AC_DEFINE 'COINTOSS()' '1'
  fi
  
 -if AC_CHECK_FUNCS strcasecmp; then
-+if AC_CHECK_FUNCS 'strcasecmp("X", "x")'; then
++if AC_CHECK_FUNCS 'strcasecmp("X","X")'; then
      :
  elif AC_CHECK_FUNCS stricmp; then
      AC_DEFINE strcasecmp stricmp
-@@ -110,7 +110,7 @@ else
+@@ -121,7 +121,7 @@ else
      AC_FAIL "$TARGET requires either strcasecmp() or stricmp()"
  fi
  
 -if AC_CHECK_FUNCS strncasecmp; then
-+if AC_CHECK_FUNCS 'strncasecmp("X", "x", 1)'; then
++if AC_CHECK_FUNCS 'strcasecmp("X","X")'; then
      :
  elif AC_CHECK_FUNCS strnicmp; then
      AC_DEFINE strncasecmp strnicmp
-@@ -118,7 +118,7 @@ else
+@@ -129,7 +129,7 @@ else
      AC_FAIL "$TARGET requires either strncasecmp() or strnicmp()"
  fi
  
 -if AC_CHECK_FUNCS fchdir || AC_CHECK_FUNCS getcwd ; then
-+if AC_CHECK_FUNCS 'fchdir(0)' || AC_CHECK_FUNCS 'getcwd((char *)0, 0)'; then
++if AC_CHECK_FUNCS 'fchdir(0)' || AC_CHECK_FUNCS getcwd ; then
      AC_SUB 'THEME' ''
  else
      AC_SUB 'THEME' '#'

textproc/p5-Text-Markdown-Discount/patches/patch-discount_Makefile.in

@@ -0,0 +1,47 @@
+$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-11-15 18:26:06.000000000 +0000
++++ discount/Makefile.in
+@@ -25,7 +25,7 @@ all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEW
+ 
+ install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR)
+ 	@INSTALL_PROGRAM@ $(PGMS) $(DESTDIR)$(BINDIR)
+-	./librarian.sh install libmarkdown VERSION $(DESTDIR)$(LIBDIR)
++	./librarian.sh install libmarkdown MYVERSION $(DESTDIR)$(LIBDIR)
+ 	@INSTALL_DATA@ mkdio.h $(DESTDIR)$(INCDIR)
+ 
+ install.everything: install install.samples install.man
+@@ -63,10 +63,10 @@ $(DESTDIR)$(INCDIR):
+ $(DESTDIR)$(LIBDIR):
+ 	@INSTALL_DIR@ $(DESTDIR)$(LIBDIR)
+ 
+-version.o: version.c VERSION
+-	$(CC) $(CFLAGS) -DVERSION=\"`cat VERSION`\" -c version.c
++version.o: version.c MYVERSION
++	$(CC) $(CFLAGS) -DVERSION=\"`cat MYVERSION`\" -c version.c
+ 
+-VERSION:
++MYVERSION:
+ 	@true
+ 
+ tags.o: tags.c blocktags
+@@ -95,7 +95,7 @@ main.o: main.c mkdio.h config.h
+ 	$(CC) $(CFLAGS) -I. -c main.c
+ 
+ $(MKDLIB): $(OBJS)
+-	./librarian.sh make $(MKDLIB) VERSION $(OBJS)
++	./librarian.sh make $(MKDLIB) MYVERSION $(OBJS)
+ 
+ verify: echo tools/checkbits.sh
+ 	@./echo -n "headers ... "; tools/checkbits.sh && echo "GOOD"
+@@ -112,7 +112,7 @@ echo:   tools/echo.c config.h
+ 	
+ clean:
+ 	rm -f $(PGMS) $(TESTFRAMEWORK) $(SAMPLE_PGMS) *.o
+-	rm -f $(MKDLIB) `./librarian.sh files $(MKDLIB) VERSION`
++	rm -f $(MKDLIB) `./librarian.sh files $(MKDLIB) MYVERSION`
+ 
+ distclean spotless: clean
+ 	rm -f @GENERATED_FILES@ @CONFIGURE_FILES@