diff options
| author | joerg <joerg@pkgsrc.org> | 2020-04-15 22:53:33 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-04-15 22:53:33 +0000 |
| commit | 0a59eb77cc6d77704b5e0e26daa916b9a1486c59 (patch) | |
| tree | 12406c2d3dac5b7424f56f0d515413807f7467a9 | |
| parent | eb0b676604ba8ee6cdddbd53b36ed0973e726b47 (diff) | |
| download | pkgsrc-0a59eb77cc6d77704b5e0e26daa916b9a1486c59.tar.gz | |
Require C++03 and check for libc++ correctly.
| -rw-r--r-- | graphics/asymptote/Makefile | 4 | ||||
| -rw-r--r-- | graphics/asymptote/distinfo | 3 | ||||
| -rw-r--r-- | graphics/asymptote/patches/patch-runlabel.in | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile index 7e10be7736f..2a220499ca1 100644 --- a/graphics/asymptote/Makefile +++ b/graphics/asymptote/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2020/03/27 03:41:34 riastradh Exp $ +# $NetBSD: Makefile,v 1.36 2020/04/15 22:53:33 joerg Exp $ DISTNAME= asymptote-2.41 PKGREVISION= 4 @@ -30,7 +30,7 @@ MAKE_JOBS_SAFE= no # random failure during build as of 2.38 GNU_CONFIGURE= yes INFO_FILES= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++03 CONFIGURE_ARGS+= --enable-gc=system CONFIGURE_ARGS+= --infodir=${PREFIX}/info diff --git a/graphics/asymptote/distinfo b/graphics/asymptote/distinfo index 02b8c09c05b..b96782456f0 100644 --- a/graphics/asymptote/distinfo +++ b/graphics/asymptote/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2019/01/08 10:58:09 markd Exp $ +$NetBSD: distinfo,v 1.11 2020/04/15 22:53:33 joerg Exp $ SHA1 (asymptote-2.41.src.tgz) = ee33febaab5b42e0f04375f4a40512102d01a1d5 RMD160 (asymptote-2.41.src.tgz) = 2614a78d24126817462a8b7bffd918c84b96b808 @@ -6,3 +6,4 @@ SHA512 (asymptote-2.41.src.tgz) = 93f737a44b085c2290c4553c765cf49679820e6623bc5b Size (asymptote-2.41.src.tgz) = 3516426 bytes SHA1 (patch-configure) = c3d035f0744b8558624863fddbe68205c862a37b SHA1 (patch-main.cc) = 1cf992b56fe28efb94128f68e941f36d9b033e9a +SHA1 (patch-runlabel.in) = 8cd6fd4cc1e7b7e72c50dea9d777ed839e1ad269 diff --git a/graphics/asymptote/patches/patch-runlabel.in b/graphics/asymptote/patches/patch-runlabel.in new file mode 100644 index 00000000000..a9498db9cd2 --- /dev/null +++ b/graphics/asymptote/patches/patch-runlabel.in @@ -0,0 +1,15 @@ +$NetBSD: patch-runlabel.in,v 1.1 2020/04/15 22:53:33 joerg Exp $ + +Use an actual feature check. + +--- runlabel.in.orig 2020-04-13 19:36:47.994115580 +0000 ++++ runlabel.in +@@ -123,7 +123,7 @@ array *readpath(const string& psname, bo + if(!pdf) gs << newl; + + // Workaround broken stringstream container in MacOS 10.9 libc++. +-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) ++#if defined(_LIBCPP_VERSION) + for(string::iterator i=s.begin(); i != s.end(); ++i) { + if(isalpha(*i) && *i != 'e') {buf << " ";} + buf << *i; |