From 7563a1b6bf1d3254423f7fa58a9f7f50e5fc856d Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 11 Nov 2013 16:43:21 +0000
Subject: Fix unnecessary GCCisms.

---
 graphics/asymptote/distinfo                     |  4 +++-
 graphics/asymptote/patches/patch-genv.cc        | 12 ++++++++++++
 graphics/asymptote/patches/patch-prc_writePRC.h | 22 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 graphics/asymptote/patches/patch-genv.cc
 create mode 100644 graphics/asymptote/patches/patch-prc_writePRC.h

(limited to 'graphics/asymptote')

diff --git a/graphics/asymptote/distinfo b/graphics/asymptote/distinfo
index 0fcefc36503..2bcc44c76c6 100644
--- a/graphics/asymptote/distinfo
+++ b/graphics/asymptote/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2012/07/03 18:07:03 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/11/11 16:43:21 joerg Exp $
 
 SHA1 (asymptote-2.15.src.tgz) = e0fb336c195fb21a39e3d0f3acd4881ce5e170a7
 RMD160 (asymptote-2.15.src.tgz) = 1916f4160034d4d76280bfed8ebe0bb898fc80ce
 Size (asymptote-2.15.src.tgz) = 1763773 bytes
 SHA1 (patch-configure) = ddefab8f9aed037a32cc854d0aedc4b861153b0f
+SHA1 (patch-genv.cc) = a02d289383ff2f84617d9cb8bf2df1e51962ee11
+SHA1 (patch-prc_writePRC.h) = 4b26db72fd611f0dd8ded8484f0025a3f058a141
 SHA1 (patch-runtime.cc) = e61bdfc8c911f81f727c0b341522e66372905b1a
diff --git a/graphics/asymptote/patches/patch-genv.cc b/graphics/asymptote/patches/patch-genv.cc
new file mode 100644
index 00000000000..1b6483bf275
--- /dev/null
+++ b/graphics/asymptote/patches/patch-genv.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-genv.cc,v 1.1 2013/11/11 16:43:21 joerg Exp $
+
+--- genv.cc.orig	2013-11-10 20:25:05.000000000 +0000
++++ genv.cc
+@@ -15,7 +15,6 @@
+ 
+ #include <sstream>
+ #include <unistd.h>
+-#include <bits/stl_algo.h>
+ 
+ #include "genv.h"
+ #include "env.h"
diff --git a/graphics/asymptote/patches/patch-prc_writePRC.h b/graphics/asymptote/patches/patch-prc_writePRC.h
new file mode 100644
index 00000000000..d908545659c
--- /dev/null
+++ b/graphics/asymptote/patches/patch-prc_writePRC.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-prc_writePRC.h,v 1.1 2013/11/11 16:43:21 joerg Exp $
+
+--- prc/writePRC.h.orig	2013-11-10 20:22:58.000000000 +0000
++++ prc/writePRC.h
+@@ -24,7 +24,7 @@
+ #include <vector>
+ #include <deque>
+ #include <list>
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(_LIBCPP_VERSION)
+ #include <ext/slist>
+ #endif
+ #include <map>
+@@ -224,7 +224,7 @@ class PRCAttribute : public PRCAttribute
+   void addKey(const PRCSingleAttribute &key) { attribute_keys.push_back(key); }
+   std::deque<PRCSingleAttribute> attribute_keys;
+ };
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(_LIBCPP_VERSION)
+ typedef __gnu_cxx::slist<PRCAttribute> PRCAttributeList;
+ #else
+ typedef std::list<PRCAttribute> PRCAttributeList;
-- 
cgit v1.2.3