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

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Mar 18 19:06:19 UTC 2017

Modified Files:
        pkgsrc/textproc/p5-Text-Markdown-Discount: Makefile distinfo
Removed Files:
        pkgsrc/textproc/p5-Text-Markdown-Discount/patches: patch-Makefile.PL

Log Message:
Revert previous and replace with a Darwin-specific workaround.

As joerg@ pointed out, this is not a cwrappers problem. Indeed, the
package had not been broken on NetBSD 7.x. Not sure how I jumped to my
wrong conclusion.

Instead, have the package instruct the cpp wrapper to run "/usr/bin/cpp"
on Darwin rather than the usual "clang -E". This is still a little odd,
but much less wrong, and fixes the Darwin build just as well.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL

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.13 pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile:1.14
--- pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile:1.13     Fri Mar 17 17:30:33 2017
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile  Sat Mar 18 19:06:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/03/17 17:30:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.14 2017/03/18 19:06:19 schmonz Exp $
 #
 
 DISTNAME=              Text-Markdown-Discount-0.11
@@ -12,13 +12,17 @@ HOMEPAGE=           http://search.cpan.org/dist/T
 COMMENT=               Convert Markdown to (X)HTML
 LICENSE=               ${PERL5_LICENSE}
 
-BUILD_DEPENDS+=                tradcpp-[0-9]*:../../devel/tradcpp
-
 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
+
 post-extract:
        cd ${WRKSRC} && mv discount/VERSION discount/MYVERSION
 

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo
diff -u pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo:1.8 pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo:1.9
--- pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo:1.8      Fri Mar 17 17:30:33 2017
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo  Sat Mar 18 19:06:19 2017
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.8 2017/03/17 17:30:33 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2017/03/18 19:06:19 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-Makefile.PL) = a3df84ae13d1c901de1812ddc3425c66fb355b5d
 SHA1 (patch-configure.sh) = 244ae32f085b4587fc777aaabcc63735f74cef43
 SHA1 (patch-discount_Makefile.in) = 40bbbb1ef6c0a38d04cbfab618480b504614a125