pstoedit: update to 3.75

New or changed in 3.75:
 * Fix a compile problem under certain MacOS versions.
 * Various changes needed for interworking with newer versions of GhostScript.
 * Some code modernization based on feedback from VS-2019, Clang Powertools
   and PVS Studio.

New or changed in 3.74:
 * Added support for dotted and dashed lines to the DXF backend.
 * Reduce redundancy in help documents.
 * Porting to Windows CE by Rohan Shetty.
 * Made pstoedit compatible with ghostscript 9.27.

New or changed in 3.73:
 * Fix a bug occurring with large scale factors.
 * Include full documentation by default and provide an option to generate
   documentation locally which then fit best to the local installation.
 * Started to apply improvements proposed by clang-tidy.

New or changed in 3.72:
 * Included a bunch of patches from Debian for easier maintenance of the package
   plus correction to some spelling issues. Thanks to Barak A. Pearlmutter.

New or changed in 3.71:
 * added a -vl option to specify a verbosity level. Using the older -v enables
   level 1. For more use -vl 2.
 * included a patch contributed by OpenSuse folks fixing a problem in finding
   the plugins under certain conditions.
 * included a patch contributed by Martin Madsen related to checking non
   existing directories when looking for plugins.
 * added support for pdfwithshow and pdfawidthshow special operators when
   reading PDF files.
 * Scott Pakin updated the cfdg driver to support the current version of cfdg.
 * changes needed for newer versions of GhostScript.
 * some code cleanup. pstoedit passed all Coverity checks.

9 files changed, 21 insertions, 229 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 5698795181d..a626b1d1b78 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.108 2021/04/21 13:24:49 adam Exp $
+# $NetBSD: Makefile,v 1.109 2021/07/10 10:25:36 markd Exp $
 
-DISTNAME=	pstoedit-3.70
-PKGREVISION=	23
+DISTNAME=	pstoedit-3.75
 CATEGORIES=	converters graphics print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pstoedit/}
 
@@ -31,6 +30,11 @@ LIBS.SunOS+=	-ldl
 
 DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 
+SUBST_CLASSES+=		magick
+SUBST_STAGE.magick=	pre-configure
+SUBST_FILES.magick=	configure
+SUBST_SED.magick+=	-e 's|ImageMagick|Magick|g'
+
 INSTALLATION_DIRS=	${DOCDIR}
 
 post-install:
@@ -42,9 +46,7 @@ post-install:
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
-.include "../../graphics/GraphicsMagick/buildlink3.mk"
-# ImageMagick's v7 API is incompatible
-#.include "../../graphics/ImageMagick/buildlink3.mk"
+.include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/plotutils/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/ming/buildlink3.mk"
diff --git a/graphics/pstoedit/PLIST b/graphics/pstoedit/PLIST
index 1bb5b7a9d1e..88138406344 100644
--- a/graphics/pstoedit/PLIST
+++ b/graphics/pstoedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2016/05/16 20:17:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2021/07/10 10:25:36 markd Exp $
 bin/pstoedit
 include/pstoedit/base64writer.h
 include/pstoedit/cppcomp.h
@@ -25,6 +25,7 @@ man/man1/pstoedit.1
 share/aclocal/pstoedit.m4
 share/doc/pstoedit/changelog.htm
 share/doc/pstoedit/pstoedit.htm
+share/doc/pstoedit/pstoedit.pdf
 share/doc/pstoedit/readme.txt
 share/pstoedit/drvhpgl.pencolors
 share/pstoedit/examplefigmap.fmp
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index 6d8fa9c9bc3..27552afb5e9 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.18 2016/08/22 11:20:56 markd Exp $
+$NetBSD: distinfo,v 1.19 2021/07/10 10:25:36 markd Exp $
 
-SHA1 (pstoedit-3.70.tar.gz) = 657f8f7070fde1432cd65a34b6b1c4b5b42f8b50
-RMD160 (pstoedit-3.70.tar.gz) = b41a02485ebba3861681d280407a788a59538d15
-SHA512 (pstoedit-3.70.tar.gz) = 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
-Size (pstoedit-3.70.tar.gz) = 1013949 bytes
-SHA1 (patch-configure) = a8078dc9774148c3b3700549d7d37fcd018cb799
-SHA1 (patch-doc_pstoedit.1) = b50bddcc1e1ead67c52db7a54eec828cb1b13570
-SHA1 (patch-doc_pstoedit.htm) = 29e050ca77710c035e0b0640f0d39e2d1214b3ac
-SHA1 (patch-doc_pstoedit.tex) = 74313654e322fefd69d67a23d8e29d63aaffbd08
-SHA1 (patch-src_Makefile.in) = e792a4645127910488c89b97679b08aa9a55d33c
-SHA1 (patch-src_pstoedit.cpp) = a2fb3609456e46fcb7e3a5f45ad90f1a62f51463
+SHA1 (pstoedit-3.75.tar.gz) = b0fa3356efdca67bbc0c7c9145827c31384a6cc6
+RMD160 (pstoedit-3.75.tar.gz) = f3c23a0d478009f956217a60f50d49bfc558aba3
+SHA512 (pstoedit-3.75.tar.gz) = 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
+Size (pstoedit-3.75.tar.gz) = 1290057 bytes
+SHA1 (patch-src_Makefile.in) = 0f36cd43cbe154d9cf47db6918e9ecc238aa444f
diff --git a/graphics/pstoedit/patches/patch-configure b/graphics/pstoedit/patches/patch-configure
deleted file mode 100644
index 6fbbc181551..00000000000
--- a/graphics/pstoedit/patches/patch-configure
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2016/05/16 20:17:10 adam Exp $
-
-Pedantry leads to compilation errors.
-Use GraphicsMagick, because ImageMagick's v7 API is incompatible.
-
---- configure.orig	2014-12-28 20:39:58.000000000 +0000
-+++ configure
-@@ -16701,12 +16701,12 @@ if test -n "$LIBMAGICK_CFLAGS"; then
-     pkg_cv_LIBMAGICK_CFLAGS="$LIBMAGICK_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ImageMagick++\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "ImageMagick++") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"GraphicsMagick++\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "GraphicsMagick++") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LIBMAGICK_CFLAGS=`$PKG_CONFIG --cflags "ImageMagick++" 2>/dev/null`
-+  pkg_cv_LIBMAGICK_CFLAGS=`$PKG_CONFIG --cflags "GraphicsMagick++" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -16718,12 +16718,12 @@ if test -n "$LIBMAGICK_LIBS"; then
-     pkg_cv_LIBMAGICK_LIBS="$LIBMAGICK_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ImageMagick++\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "ImageMagick++") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"GraphicsMagick++\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "GraphicsMagick++") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LIBMAGICK_LIBS=`$PKG_CONFIG --libs "ImageMagick++" 2>/dev/null`
-+  pkg_cv_LIBMAGICK_LIBS=`$PKG_CONFIG --libs "GraphicsMagick++" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -16744,9 +16744,9 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ImageMagick++" 2>&1`
-+	        LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "GraphicsMagick++" 2>&1`
-         else
--	        LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ImageMagick++" 2>&1`
-+	        LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "GraphicsMagick++" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBMAGICK_PKG_ERRORS" >&5
-@@ -17100,7 +17100,7 @@ $as_echo "GNU on RiscOS" >&6; }
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: GNU" >&5
- $as_echo "GNU" >&6; }
- #   need to disable long long warning here because of ImageMagick using it
--    SPECIAL_CXXFLAGS="-DBUGGYGPP_NOLONGERNEEDE -pedantic -Wall -Wextra -Wuninitialized -Wswitch-default -Wunused -Wshadow -Wwrite-strings -Wcast-qual -Wpointer-arith -Wno-long-long"
-+    SPECIAL_CXXFLAGS="-DBUGGYGPP_NOLONGERNEEDE -Wall -Wextra -Wuninitialized -Wswitch-default -Wunused -Wshadow -Wwrite-strings -Wcast-qual -Wpointer-arith -Wno-long-long"
-   fi
- elif test `echo "$CXX" | egrep -c 'xlC$'` -eq 1; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX xlC" >&5
diff --git a/graphics/pstoedit/patches/patch-doc_pstoedit.1 b/graphics/pstoedit/patches/patch-doc_pstoedit.1
deleted file mode 100644
index 0ea7dd335ee..00000000000
--- a/graphics/pstoedit/patches/patch-doc_pstoedit.1
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-doc_pstoedit.1,v 1.1 2016/08/22 11:20:56 markd Exp $
-
-Upstream patch for not finding plugins. 
-
---- doc/pstoedit.1.orig	2015-01-01 19:55:13.000000000 +0000
-+++ doc/pstoedit.1
-@@ -1,5 +1,5 @@
- '\" t
--.\" Manual page created with latex2man on Thu Jan  1 20:55:12 CET 2015
-+.\" Manual page created with latex2man on Fri Mar 13 20:58:53 CET 2015
- .\" NOTE: This file is generated, DO NOT EDIT.
- .de Vb
- .ft CW
-@@ -10,7 +10,7 @@
- 
- .fi
- ..
--.TH "PSTOEDIT" "1" "01 January 2015" "Conversion Tools " "Conversion Tools "
-+.TH "PSTOEDIT" "1" "13 March 2015" "Conversion Tools " "Conversion Tools "
- .SH NAME
- 
- pstoedit
-@@ -367,7 +367,7 @@ MS Windows: The same directory where the
- .B *
- Unix:
- .br 
--<\fIThe directory where the pstoedit executable is located\fP>
-+The default installation directory. If it fails, then <\fIThe directory where the pstoedit executable is located\fP>
- /../lib/ 
- .RS
- .PP
diff --git a/graphics/pstoedit/patches/patch-doc_pstoedit.htm b/graphics/pstoedit/patches/patch-doc_pstoedit.htm
deleted file mode 100644
index 6ca6b966463..00000000000
--- a/graphics/pstoedit/patches/patch-doc_pstoedit.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-doc_pstoedit.htm,v 1.1 2016/08/22 11:20:56 markd Exp $
-
-Upstream patch for not finding plugins. 
-
---- doc/pstoedit.htm.orig	2015-01-01 19:55:14.000000000 +0000
-+++ doc/pstoedit.htm
-@@ -1,5 +1,5 @@
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
--<!-- Manual page created with latex2man on Thu Jan  1 20:55:13 CET 2015
-+<!-- Manual page created with latex2man on Fri Mar 13 20:58:54 CET 2015
- ** Author of latex2man: Juergen.Vollmer@informatik-vollmer.de
- ** NOTE: This file is generated, DO NOT EDIT. -->
- <html>
-@@ -9,7 +9,7 @@
- PSTOEDIT 
- </h1>
- <h4 align=center>Dr. Wolfgang Glunz </h4>
--<h4 align=center>01 January 2015</h4>
-+<h4 align=center>13 March 2015</h4>
- <h4 align=center>Version 3.70 </h4>
- <tt>pstoedit</tt>
- - a tool converting PostScript and PDF files into various 
-@@ -561,7 +561,7 @@ in the installation directory and uses t
- </li>
- <li>Unix:<br>
-  
--&lt;<em>The directory where the pstoedit executable is located</em>&gt;
-+The default installation directory. If it fails, then &lt;<em>The directory where the pstoedit executable is located</em>&gt;
- <tt>/../lib/</tt> 
- <p>
- </li>
diff --git a/graphics/pstoedit/patches/patch-doc_pstoedit.tex b/graphics/pstoedit/patches/patch-doc_pstoedit.tex
deleted file mode 100644
index 9116c6caa0b..00000000000
--- a/graphics/pstoedit/patches/patch-doc_pstoedit.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-doc_pstoedit.tex,v 1.1 2016/08/22 11:20:56 markd Exp $
-
-Upstream patch for not finding plugins. 
-
---- doc/pstoedit.tex.orig	2015-01-01 19:55:12.000000000 +0000
-+++ doc/pstoedit.tex
-@@ -352,7 +352,7 @@ If  the \Opt{-fontmap} option is not spe
-   \item MS Windows: The same directory where the \Prog{pstoedit} executable is located
- 
-   \item Unix:\\
--  $<$\emph{The directory where the pstoedit executable is located}$>$\verb+/../lib/+
-+  The default installation directory. If it fails, then $<$\emph{The directory where the pstoedit executable is located}$>$\verb+/../lib/+
- 
- \end{itemize}
- 
diff --git a/graphics/pstoedit/patches/patch-src_Makefile.in b/graphics/pstoedit/patches/patch-src_Makefile.in
index 63e636277f3..2eece5c6d34 100644
--- a/graphics/pstoedit/patches/patch-src_Makefile.in
+++ b/graphics/pstoedit/patches/patch-src_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2016/05/16 20:17:10 adam Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2021/07/10 10:25:36 markd Exp $
 
 Do not force linking with libdl.
 
---- src/Makefile.in.orig	2011-08-27 15:27:38.000000000 +0000
+--- src/Makefile.in.orig	2019-12-08 12:32:08.000000000 +0000
 +++ src/Makefile.in
-@@ -412,7 +412,7 @@ libpstoedit_la_SOURCES = \
- 	genericints.h 				\
- 	version.h
+@@ -576,7 +576,7 @@ libpstoedit_la_SOURCES = \
+ 	psfront.h				\
+ 	genericints.h
  
 -libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
 +libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm
diff --git a/graphics/pstoedit/patches/patch-src_pstoedit.cpp b/graphics/pstoedit/patches/patch-src_pstoedit.cpp
deleted file mode 100644
index cec907825e8..00000000000
--- a/graphics/pstoedit/patches/patch-src_pstoedit.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-src_pstoedit.cpp,v 1.1 2016/08/22 11:20:56 markd Exp $
-
-Upstream patch for not finding plugins.
-
---- src/pstoedit.cpp.orig	2014-09-04 18:21:45.000000000 +0000
-+++ src/pstoedit.cpp
-@@ -30,6 +30,7 @@
- #include I_string_h
- 
- #include <assert.h>
-+#include <sys/stat.h>
- 
- #include "pstoeditoptions.h"
- 
-@@ -261,33 +262,33 @@ static void loadpstoeditplugins(const ch
- 		loadPlugInDrivers(plugindir.c_str(), errstream, verbose);	// load the driver plugins
- 		pluginsloaded = true;
- 	}
--	// also look in the directory where the pstoedit .exe/dll was found
--	char szExePath[1000];
--	szExePath[0] = '\0';
--	const unsigned long r = P_GetPathToMyself(progname, szExePath, sizeof(szExePath));
--	if (verbose)  errstream << "pstoedit : path to myself:" << progname << " " << r << " " << szExePath<< endl;
--	char *p = 0;
--	if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
--		*p = '\0';
--		if (!strequal(szExePath, plugindir.c_str())) {
--			loadPlugInDrivers(szExePath, errstream,verbose);
--			pluginsloaded = true;
--		}
--	}
--	// now try also $exepath/../lib/pstoedit
--	strcat_s(szExePath,1000,"/../lib/pstoedit");
--	if (!strequal(szExePath, plugindir.c_str())) {
--    	loadPlugInDrivers(szExePath, errstream,verbose);
--		pluginsloaded = true;
--	}
--
- #ifdef PSTOEDITLIBDIR
--	if (!pluginsloaded) {
-+	struct stat s;
-+	if (!pluginsloaded &&
-+	    !stat(PSTOEDITLIBDIR, &s) &&
-+	    S_ISDIR(s.st_mode)) {
-   	  // also try to load drivers from the PSTOEDITLIBDIR
- 	  loadPlugInDrivers(PSTOEDITLIBDIR, errstream,verbose);
- 	  pluginsloaded = true;
- 	}
- #endif
-+	// If the above failed, also look in the directory where the pstoedit .exe/dll was found
-+	if (!pluginsloaded) {
-+	  char szExePath[1000];
-+	  szExePath[0] = '\0';
-+	  const unsigned long r = P_GetPathToMyself(progname, szExePath, sizeof(szExePath));
-+	  if (verbose)  errstream << "pstoedit : path to myself:" << progname << " " << r << " " << szExePath<< endl;
-+	  char *p = 0;
-+	  if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
-+		*p = '\0';
-+		loadPlugInDrivers(szExePath, errstream,verbose);
-+	  }
-+	  // now try also $exepath/../lib/pstoedit
-+	  strcat_s(szExePath,1000,"/../lib/pstoedit");
-+	  if (!strequal(szExePath, plugindir.c_str())) {
-+	  loadPlugInDrivers(szExePath, errstream,verbose);
-+	  }
-+	}
- 
- 	// delete[]plugindir;
- }