From aa8eddd2a4364b76347ebcd18f9f3f10dc22d1f5 Mon Sep 17 00:00:00 2001
From: John Marino <marino@FreeBSD.org>
Date: Sun, 20 Sep 2015 18:59:19 +0000
Subject: [PATCH] Add <cstring> and/or <cstdlib> to support modern gcc

Four of these five patches should have been part of the previous
commit but I didn't notice them.  The ampasCTL pach is to fix a
regression that I introduced by removing part of the post-patch
target.

Approved by:	gcc5 support blanket
---
 converters/fix-mime-charset/files/patch-src_input.cc   | 10 ++++++++++
 graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc    | 10 ++++++----
 .../graphopt/files/patch-src_classes_optFileWriter.cc  |  9 +++++++++
 .../graphopt/files/patch-src_classes_psExporter.cc     | 10 ++++++++++
 .../graphopt/files/patch-src_classes_visioExporter.cc  |  9 +++++++++
 5 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 converters/fix-mime-charset/files/patch-src_input.cc
 create mode 100644 graphics/graphopt/files/patch-src_classes_optFileWriter.cc
 create mode 100644 graphics/graphopt/files/patch-src_classes_psExporter.cc
 create mode 100644 graphics/graphopt/files/patch-src_classes_visioExporter.cc

diff --git a/converters/fix-mime-charset/files/patch-src_input.cc b/converters/fix-mime-charset/files/patch-src_input.cc
new file mode 100644
index 000000000000..cc4ba53852df
--- /dev/null
+++ b/converters/fix-mime-charset/files/patch-src_input.cc
@@ -0,0 +1,10 @@
+--- src/input.cc.orig	2003-07-29 23:29:11 UTC
++++ src/input.cc
+@@ -3,6 +3,7 @@
+ #include "input.h"
+ #include <iostream>
+ #include <fstream>
++#include <cstring>
+ 
+ /* Input */
+ 
diff --git a/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc b/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc
index 48a5ae2c7835..cac860278732 100644
--- a/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc
+++ b/graphics/ampasCTL/files/patch-lib__dpx__dpx_util.cc
@@ -1,8 +1,10 @@
---- ./lib/dpx/dpx_util.cc.orig	2013-10-12 18:55:34.000000000 +0200
-+++ ./lib/dpx/dpx_util.cc	2013-10-12 18:55:55.000000000 +0200
-@@ -57,6 +57,7 @@
+--- lib/dpx/dpx_util.cc.orig	2014-06-03 01:11:24 UTC
++++ lib/dpx/dpx_util.cc
+@@ -55,8 +55,8 @@
+ #include "dpx_util.hh"
+ #include <stdarg.h>
  #include <stdio.h>
- 
+-#include <alloca.h>
  #include <string.h>
 +#include <stdlib.h>
  
diff --git a/graphics/graphopt/files/patch-src_classes_optFileWriter.cc b/graphics/graphopt/files/patch-src_classes_optFileWriter.cc
new file mode 100644
index 000000000000..3cd96bf64003
--- /dev/null
+++ b/graphics/graphopt/files/patch-src_classes_optFileWriter.cc
@@ -0,0 +1,9 @@
+--- src/classes/optFileWriter.cc.intermediate	2015-09-20 01:43:24 UTC
++++ src/classes/optFileWriter.cc
+@@ -1,5 +1,6 @@
+ #include "optFileWriter.h"
+ #include <cstdlib>
++#include <cstring>
+ 
+ 
+ optFileWriter::optFileWriter(char *what_file, nodes *what_nodes) {
diff --git a/graphics/graphopt/files/patch-src_classes_psExporter.cc b/graphics/graphopt/files/patch-src_classes_psExporter.cc
new file mode 100644
index 000000000000..3c776c960e4e
--- /dev/null
+++ b/graphics/graphopt/files/patch-src_classes_psExporter.cc
@@ -0,0 +1,10 @@
+--- src/classes/psExporter.cc.intermediate	2015-09-20 01:43:24 UTC
++++ src/classes/psExporter.cc
+@@ -1,6 +1,6 @@
+ #include "psExporter.h"
+ #include <cstdlib>
+-
++#include <cstring>
+ 
+ psExporter::psExporter(char *what_file, nodes *what_nodes) {
+    filename = strdup(what_file);
diff --git a/graphics/graphopt/files/patch-src_classes_visioExporter.cc b/graphics/graphopt/files/patch-src_classes_visioExporter.cc
new file mode 100644
index 000000000000..95dc5fa70cfe
--- /dev/null
+++ b/graphics/graphopt/files/patch-src_classes_visioExporter.cc
@@ -0,0 +1,9 @@
+--- src/classes/visioExporter.cc.intermediate	2015-09-20 01:43:24 UTC
++++ src/classes/visioExporter.cc
+@@ -1,5 +1,6 @@
+ #include "visioExporter.h"
+ #include <cstdlib>
++#include <cstring>
+ 
+ 
+ visioExporter::visioExporter(char *what_file, nodes *what_nodes) {