CVS commit: pkgsrc/textproc/p5-Text-Markdown-Discount

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Mar 10 05:45:02 UTC 2018

Modified Files:
        pkgsrc/textproc/p5-Text-Markdown-Discount: Makefile distinfo
        pkgsrc/textproc/p5-Text-Markdown-Discount/patches: patch-MANIFEST
Added Files:
        pkgsrc/textproc/p5-Text-Markdown-Discount/patches: patch-Discount.xs
            patch-Makefile.PL
Removed Files:
        pkgsrc/textproc/p5-Text-Markdown-Discount/patches: patch-configure.sh
            patch-discount_Makefile.in

Log Message:
Depend on external libdiscount. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Discount.xs
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-configure.sh
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-discount_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile
diff -u pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile:1.15 pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile:1.16
--- pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile:1.15     Mon Jun  5 14:24:50 2017
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile  Sat Mar 10 05:45:02 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2017/06/05 14:24:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2018/03/10 05:45:02 schmonz Exp $
 #
 
 DISTNAME=              Text-Markdown-Discount-0.11
 PKGNAME=               p5-${DISTNAME}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            textproc perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Text/}
 
@@ -15,16 +15,14 @@ LICENSE=            ${PERL5_LICENSE}
 PERL5_PACKLIST=                auto/Text/Markdown/Discount/.packlist
 USE_LANGUAGES=         c
 
-MAKE_JOBS_SAFE=                no
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-PKG_CPP=               /usr/bin/cpp
-.endif
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     Makefile.PL
+SUBST_VARS.paths=      PREFIX
+SUBST_STAGE.paths=     pre-configure
 
 post-extract:
-       cd ${WRKSRC} && mv discount/VERSION discount/MYVERSION
+       cd ${WRKSRC} && rm -rf discount
 
+.include "../../textproc/discount/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo
diff -u pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo:1.9 pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo:1.10
--- pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo:1.9      Sat Mar 18 19:06:19 2017
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo  Sat Mar 10 05:45:02 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2017/03/18 19:06:19 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2018/03/10 05:45:02 schmonz Exp $
 
 SHA1 (Text-Markdown-Discount-0.11.tar.gz) = cd0b2bdc3479f90a0f3e68421984bb47f015d1d2
 RMD160 (Text-Markdown-Discount-0.11.tar.gz) = a4484f181746789b7bfb7c0faa95011bb374e383
 SHA512 (Text-Markdown-Discount-0.11.tar.gz) = 0f748330f76cfd5153f9bcd8bb9f1f67732657a2ee511a7ca7f0f4d9e29a085ad97373b8716d7c7436d2b6f262e8d8223393664a9c079c63b16ea417cb5c0614
 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
+SHA1 (patch-Discount.xs) = 6851538b8c894a9069eb70994a6c32b533510601
+SHA1 (patch-MANIFEST) = 6ff1d67f8210d7a72ac1a000010bd944c06c25ac
+SHA1 (patch-Makefile.PL) = a0bbf8acc769933b429385dd9c2126b69052d93d

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST
diff -u pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST:1.1 pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST:1.2
--- pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST:1.1        Fri Aug 30 15:49:49 2013
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST    Sat Mar 10 05:45:02 2018
@@ -1,15 +1,114 @@
-$NetBSD: patch-MANIFEST,v 1.1 2013/08/30 15:49:49 schmonz Exp $
+$NetBSD: patch-MANIFEST,v 1.2 2018/03/10 05:45:02 schmonz Exp $
 
-Fix build on case-insensitive filesystems (e.g., Darwin's).
+Remove local copy of libdiscount.
 
---- MANIFEST.orig      2013-08-09 20:07:19.000000000 +0000
+--- MANIFEST.orig      2013-11-15 18:30:16.000000000 +0000
 +++ MANIFEST
-@@ -98,7 +98,7 @@ discount/toc.c
- discount/tools/checkbits.sh
- discount/tools/cols.c
- discount/tools/echo.c
+@@ -1,107 +1,5 @@
+ Changes
+ Discount.xs
+-discount/amalloc.c
+-discount/amalloc.h
+-discount/basename.c
+-discount/configure.inc
+-discount/configure.sh
+-discount/COPYRIGHT
+-discount/CREDITS
+-discount/Csio.c
+-discount/css.c
+-discount/cstring.h
+-discount/docheader.c
+-discount/dumptree.c
+-discount/emmatch.c
+-discount/flags.c
+-discount/generate.c
+-discount/github_flavoured.c
+-discount/html5.c
+-discount/INSTALL
+-discount/main.c
+-discount/Makefile.in
+-discount/makepage.1
+-discount/makepage.c
+-discount/markdown.1
+-discount/markdown.3
+-discount/markdown.7
+-discount/markdown.c
+-discount/markdown.h
+-discount/mkd-callbacks.3
+-discount/mkd-extensions.7
+-discount/mkd-functions.3
+-discount/mkd-line.3
+-discount/mkd2html.1
+-discount/mkd2html.c
+-discount/mkdio.c
+-discount/mkdio.h.in
+-discount/mktags.c
+-discount/pgm_options.c
+-discount/pgm_options.h
+-discount/Plan9/markdown.1
+-discount/Plan9/markdown.2
+-discount/Plan9/markdown.6
+-discount/Plan9/mkfile
+-discount/Plan9/README
+-discount/README
+-discount/resource.c
+-discount/setup.c
+-discount/tags.c
+-discount/tags.h
+-discount/tests/autolink.t
+-discount/tests/automatic.t
+-discount/tests/backslash.t
+-discount/tests/callbacks.t
+-discount/tests/chrome.text
+-discount/tests/code.t
+-discount/tests/compat.t
+-discount/tests/crash.t
+-discount/tests/defects.t
+-discount/tests/div.t
+-discount/tests/dl.t
+-discount/tests/embedlinks.text
+-discount/tests/emphasis.t
+-discount/tests/extrafootnotes.t
+-discount/tests/flow.t
+-discount/tests/footnotes.t
+-discount/tests/functions.sh
+-discount/tests/header.t
+-discount/tests/html.t
+-discount/tests/html5.t
+-discount/tests/links.text
+-discount/tests/linkylinky.t
+-discount/tests/linkypix.t
+-discount/tests/list.t
+-discount/tests/list3deep.t
+-discount/tests/misc.t
+-discount/tests/pandoc.t
+-discount/tests/para.t
+-discount/tests/paranoia.t
+-discount/tests/peculiarities.t
+-discount/tests/pseudo.t
+-discount/tests/reddit.t
+-discount/tests/reparse.t
+-discount/tests/schiraldi.t
+-discount/tests/smarty.t
+-discount/tests/snakepit.t
+-discount/tests/strikethrough.t
+-discount/tests/style.t
+-discount/tests/superscript.t
+-discount/tests/syntax.text
+-discount/tests/tables.t
+-discount/tests/tabstop.t
+-discount/tests/toc.t
+-discount/tests/xml.t
+-discount/theme.1
+-discount/theme.c
+-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
+-discount/version.c.in
+-discount/xml.c
+-discount/xmlpage.c
+ INSTALL.Discount
+ lib/Text/Markdown/Discount.pm
+ Makefile.PL

Added files:

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Discount.xs
diff -u /dev/null pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Discount.xs:1.1
--- /dev/null   Sat Mar 10 05:45:02 2018
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Discount.xs Sat Mar 10 05:45:02 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-Discount.xs,v 1.1 2018/03/10 05:45:02 schmonz Exp $
+
+Don't expect to find this in /usr/include or equivalent.
+
+--- Discount.xs.orig   2013-08-09 20:07:01.000000000 +0000
++++ Discount.xs
+@@ -5,7 +5,7 @@
+ #include "ppport.h"
+ 
+ #include <string.h>
+-#include <mkdio.h>
++#include "mkdio.h"
+ 
+ MODULE = Text::Markdown::Discount             PACKAGE = Text::Markdown::Discount      PREFIX = TextMarkdown_
+ 

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL
diff -u /dev/null pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL:1.3
--- /dev/null   Sat Mar 10 05:45:02 2018
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL Sat Mar 10 05:45:02 2018
@@ -0,0 +1,83 @@
+$NetBSD: patch-Makefile.PL,v 1.3 2018/03/10 05:45:02 schmonz Exp $
+
+Remove build instructions for the local copy of libdiscount.
+
+--- Makefile.PL.orig   2013-08-09 20:06:59.000000000 +0000
++++ Makefile.PL
+@@ -4,66 +4,6 @@ use warnings;
+ use ExtUtils::MakeMaker;
+ use File::Spec;
+ 
+-my $extdir = 'discount';
+-my $myextlib = File::Spec->catfile($extdir, 'libmarkdown.a');
+-my $clean_files = join (" ",
+-                  map{ File::Spec->catfile($extdir, $_) }
+-                  qw ( 
+-Csio.o
+-basename.o
+-blocktags
+-cols
+-config.cmd
+-config.h
+-config.log
+-config.mak
+-config.md
+-config.sub
+-css.o
+-docheader.o
+-dumptree.o
+-echo
+-emmatch.o
+-flags.o
+-generate.o
+-html5.o
+-libmarkdown
+-libmarkdown.a
+-librarian.sh
+-main.o
+-makepage
+-markdown
+-markdown.o
+-mkd2html
+-mkd2html.o
+-mkdio.h
+-mkdio.o
+-mktags
+-pgm_options.o
+-resource.o
+-setup.o
+-tags.o
+-theme
+-theme.o
+-toc.o
+-theme
+-theme.o
+-toc.o
+-version.c
+-version.o
+-xml.o
+-xmlpage.o
+-                  ));
+-
+-
+-
+-sub MY::postamble {
+-    return sprintf('
+-$(MYEXTLIB):
+-      %s
+-', qq{( cd $extdir; CC='cc -fPIC' sh configure.sh; make )\n});
+-}
+-
+ WriteMakefile(
+     NAME              => 'Text::Markdown::Discount',
+     VERSION_FROM      => 'lib/Text/Markdown/Discount.pm',
+@@ -71,8 +11,5 @@ WriteMakefile(
+     ($] >= 5.005 ?
+       (ABSTRACT_FROM  => 'lib/Text/Markdown/Discount.pm',
+        AUTHOR         => 'Masayoshi Sekimura <sekimura%cpan.org@localhost>') : ()),
+-    LIBS               => '-L' . $extdir,
+-    INC               => '-I. -I' . $extdir,
+-    MYEXTLIB          => $myextlib,
+-    clean             => { FILES => $clean_files },
++    LIBS              => '-L@PREFIX@/lib -lmarkdown',
+ );