diff options
| author | schmonz <schmonz@pkgsrc.org> | 2017-03-18 19:06:19 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2017-03-18 19:06:19 +0000 |
| commit | d44a7a0431fb976f03e9ba3513bd1411d6d7190a (patch) | |
| tree | e3b50317ce6756b4f5b7dc6fecf23f0be62c7180 | |
| parent | 01fd07ec404fc0cbe0003fedc06bf7148ebb4b90 (diff) | |
| download | pkgsrc-d44a7a0431fb976f03e9ba3513bd1411d6d7190a.tar.gz | |
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.
| -rw-r--r-- | textproc/p5-Text-Markdown-Discount/Makefile | 10 | ||||
| -rw-r--r-- | textproc/p5-Text-Markdown-Discount/distinfo | 3 | ||||
| -rw-r--r-- | textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL | 15 |
3 files changed, 8 insertions, 20 deletions
diff --git a/textproc/p5-Text-Markdown-Discount/Makefile b/textproc/p5-Text-Markdown-Discount/Makefile index 8099ffc9977..b3a0df10f6d 100644 --- a/textproc/p5-Text-Markdown-Discount/Makefile +++ b/textproc/p5-Text-Markdown-Discount/Makefile @@ -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/Text-Markdown-Discount/ 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 diff --git a/textproc/p5-Text-Markdown-Discount/distinfo b/textproc/p5-Text-Markdown-Discount/distinfo index f5ac07be409..7437f289ad3 100644 --- a/textproc/p5-Text-Markdown-Discount/distinfo +++ b/textproc/p5-Text-Markdown-Discount/distinfo @@ -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 diff --git a/textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL b/textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL deleted file mode 100644 index f01a6c86ab7..00000000000 --- a/textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Makefile.PL,v 1.1 2017/03/17 17:30:33 schmonz Exp $ - -cwrappers don't like piping to cpp. Work around this. - ---- Makefile.PL.orig 2013-08-09 20:06:59.000000000 +0000 -+++ Makefile.PL -@@ -61,7 +61,7 @@ sub MY::postamble { - return sprintf(' - $(MYEXTLIB): - %s --', qq{( cd $extdir; CC='cc -fPIC' sh configure.sh; make )\n}); -+', qq{( cd $extdir; CC='cc -fPIC' AC_CPP_PROG='tradcpp' sh configure.sh; make )\n}); - } - - WriteMakefile( |