Deal with stricter C++ compliant string.h.

4 files changed, 83 insertions, 1 deletions

diff --git a/fonts/mminstance/distinfo b/fonts/mminstance/distinfo
index 503f5356e77..b40f20c0ebb 100644
--- a/fonts/mminstance/distinfo
+++ b/fonts/mminstance/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 20:44:37 agc Exp $
+$NetBSD: distinfo,v 1.7 2018/12/27 15:16:53 joerg Exp $
 
 SHA1 (mminstance-1.20.tar.gz) = 599cace92339e4120d30db40dfd157e400c745c8
 RMD160 (mminstance-1.20.tar.gz) = 6e5d190a8459d8c737782eeec8a7a7d9bf676d8a
@@ -6,5 +6,8 @@ SHA512 (mminstance-1.20.tar.gz) = 27d320b51e7d8934ea0c479bbe170e28f9315a7b56fedf
 Size (mminstance-1.20.tar.gz) = 191723 bytes
 SHA1 (patch-aa) = d601f1bdaec7de91d64d0b7b9ccabf85522dada2
 SHA1 (patch-ab) = 8c73881e0c9f08eebd8c0ea2ff6e358469faefba
+SHA1 (patch-libefont_findmet.cc) = 6de5dac67695781a37fa6f70680dd40b65271b30
 SHA1 (patch-libefont_t1interp.cc) = 1fd79f69e3c95f870e9f215c135d18b490c1c640
+SHA1 (patch-mmafm_main.cc) = c47772039ed5933a1269bddbf02ce227cca04164
+SHA1 (patch-mmpfb_main.cc) = 3449fe1e7d82f9949993c16870fcd460fc181ff9
 SHA1 (patch-mmpfb_myfont.hh) = ca74679427ec1c9815b0d93be848aae46876a0b5
diff --git a/fonts/mminstance/patches/patch-libefont_findmet.cc b/fonts/mminstance/patches/patch-libefont_findmet.cc
new file mode 100644
index 00000000000..908311a6e20
--- /dev/null
+++ b/fonts/mminstance/patches/patch-libefont_findmet.cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-libefont_findmet.cc,v 1.1 2018/12/27 15:16:53 joerg Exp $
+
+--- libefont/findmet.cc.orig	2018-12-25 23:18:27.648547856 +0000
++++ libefont/findmet.cc
+@@ -188,7 +188,8 @@ Metrics *
+ InstanceMetricsFinder::find_metrics_instance(PermString name,
+ 					     MetricsFinder *finder, ErrorHandler *errh)
+ {
+-    char *underscore = strchr(name, '_');
++    char *underscore2;
++    const char *underscore = strchr(name, '_');
+     PermString amfm_name =
+ 	PermString(name.cc(), underscore - name.cc());
+   
+@@ -214,7 +215,8 @@ InstanceMetricsFinder::find_metrics_inst
+     Vector<double> design = mmspace->default_design_vector();
+     int i = 0;
+     while (underscore[0] == '_' && underscore[1]) {
+-	double x = strtod(underscore + 1, &underscore);
++	double x = strtod(underscore + 1, &underscore2);
++	underscore = underscore2;
+ 	mmspace->set_design(design, i, x, errh);
+ 	i++;
+     }
diff --git a/fonts/mminstance/patches/patch-mmafm_main.cc b/fonts/mminstance/patches/patch-mmafm_main.cc
new file mode 100644
index 00000000000..e09d8ac2e81
--- /dev/null
+++ b/fonts/mminstance/patches/patch-mmafm_main.cc
@@ -0,0 +1,33 @@
+$NetBSD: patch-mmafm_main.cc,v 1.1 2018/12/27 15:16:53 joerg Exp $
+
+--- mmafm/main.cc.orig	2018-12-25 23:20:24.379803504 +0000
++++ mmafm/main.cc
+@@ -157,7 +157,7 @@ read_file(const char *fn, MetricsFinder 
+       return;
+     
+     // check for instance name. don't use InstanceMetricsFinder.
+-    char *underscore = strchr(fn, '_');
++    const char *underscore = strchr(fn, '_');
+     if (underscore)
+       new_amfm = finder->find_amfm(PermString(fn, underscore - fn), errh);
+     if (!new_amfm)
+@@ -166,7 +166,9 @@ read_file(const char *fn, MetricsFinder 
+     
+     int i = 0;
+     while (underscore[0] == '_' && underscore[1]) {
+-      double x = strtod(underscore + 1, &underscore);
++      char *underscore2;
++      double x = strtod(underscore + 1, &underscore2);
++      underscore = underscore2;
+       set_design(i, x);
+       i++;
+     }
+@@ -249,7 +251,7 @@ main(int argc, char **argv)
+ 
+   errh = new FileErrorHandler(stderr);
+   
+-  char *output_name = "<stdout>";
++  const char *output_name = "<stdout>";
+   FILE *output_file = 0;
+   int precision = 3;
+   double kern_precision = 2.0;
diff --git a/fonts/mminstance/patches/patch-mmpfb_main.cc b/fonts/mminstance/patches/patch-mmpfb_main.cc
new file mode 100644
index 00000000000..40f178077ff
--- /dev/null
+++ b/fonts/mminstance/patches/patch-mmpfb_main.cc
@@ -0,0 +1,22 @@
+$NetBSD: patch-mmpfb_main.cc,v 1.1 2018/12/27 15:16:53 joerg Exp $
+
+--- mmpfb/main.cc.orig	2003-01-05 22:33:51.000000000 +0000
++++ mmpfb/main.cc
+@@ -153,13 +153,15 @@ do_file(const char *filename, PsresDatab
+   if (!f) {
+     // check for PostScript or instance name
+     Filename fn = psres->filename_value("FontOutline", filename);
+-    char *underscore = strchr(filename, '_');
++    const char *underscore = strchr(filename, '_');
+     if (!fn && underscore) {
+       fn = psres->filename_value
+ 	("FontOutline", PermString(filename, underscore - filename));
+       int i = 0;
+       while (underscore[0] == '_' && underscore[1]) {
+-	double x = strtod(underscore + 1, &underscore);
++        char *underscore2;
++	double x = strtod(underscore + 1, &underscore2);
++	underscore = underscore2;
+ 	set_design(i, x);
+ 	i++;
+       }