New or changed in 3.70:

some code improvements as suggested by Coverity. See current Coverity status here: https://scan.coverity.com/projects/498
removed the -DBUGGYGPP compile flag since now g++ can compile the code without it. The former work-arounds are still there but will be removed later.
enabled more warnings when compiling with g++ and fixed some resulting warnings.
changed the autoconf part to better support the inclusion of libzip for the pptx driver.
included a lot of documentation corrections contributed by Peter Dyballa. Many thanks!
using non case sensitive comparison when determining the target format from the file suffix.
using more STL classes instead of older private replacements (string and vector). In this context also some hard coded limits were removed.
fixed an assertion violation when using -ssp and a closepath occurred.
added the dump of the font name for the DXF format.
prototype of a "simulate fill" option for emulating filling by stroking. This is based on fillpoly.c from the hp2xx project. Thanks also to Gary Langthorne for pointing out this option. This is still kind of experimental.

7 files changed, 92 insertions, 69 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index abe6f55be1e..11079bb84ce 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,52 +1,48 @@
-# $NetBSD: Makefile,v 1.82 2016/03/05 11:28:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.83 2016/05/16 20:17:10 adam Exp $
 
-DISTNAME=	pstoedit-3.62
-PKGREVISION=	7
+DISTNAME=	pstoedit-3.70
 CATEGORIES=	converters graphics print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pstoedit/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pstoedit.net/
 COMMENT=	Convert PostScript / PDF into various vector graphic formats
-#LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v2
 # man page indicates that there are many licenses and one has to read all
 # the source files
 
-MAKE_JOBS_SAFE=		no
-
 USE_TOOLS+=	gs:run pkg-config
 
-USE_LIBTOOL=	yes
-USE_LANGUAGES=	c c++
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS} -Dunix"
-CONFIGURE_ENV+=	ac_cv_path_GS=${TOOLS_PATH.gs}
-
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+#CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 # needs libEMF which has build problems on alpha and probably
 # other 64-bit systems
-CONFIGURE_ARGS+=--without-emf
+CONFIGURE_ARGS+=	--without-emf
+CONFIGURE_ENV+=		CXXFLAGS="${CFLAGS} -Dunix"
+CONFIGURE_ENV+=		ac_cv_path_GS=${TOOLS_PATH.gs}
 
-CONFIGURE_ARGS+=--datadir=${PREFIX}/share
 GNU_CONFIGURE_LIBSUBDIR=pstoedit	# plugin dir -- unused for now
-BUILD_TARGET=
+#BUILD_TARGET=
 
 LIBS.SunOS+=	-ldl
 
-DOCDIR=		${PREFIX}/share/doc/pstoedit
-HTMLDIR=	${PREFIX}/share/doc/html/pstoedit
-DOCSRC=		${WRKSRC}/doc
+DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 
-INSTALLATION_DIRS=	${DOCDIR} ${HTMLDIR}
+INSTALLATION_DIRS=	${DOCDIR}
 
 post-install:
-	for f in ${DOCSRC}/*.htm; do			\
-	   ${INSTALL_DATA} $${f}	${DESTDIR}${HTMLDIR};	\
+	for f in ${WRKSRC}/doc/*.htm; do \
+		${INSTALL_DATA} $${f} ${DESTDIR}${DOCDIR}; \
 	done
-	${INSTALL_DATA} ${DOCSRC}/readme.txt	${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/readme.txt ${DESTDIR}${DOCDIR}
 
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
-.include "../../graphics/ImageMagick/buildlink3.mk"
+.include "../../graphics/GraphicsMagick/buildlink3.mk"
+# ImageMagick's v7 API is incompatible
+#.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 0167efdb8cf..1bb5b7a9d1e 100644
--- a/graphics/pstoedit/PLIST
+++ b/graphics/pstoedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2014/08/14 19:36:04 shattered Exp $
+@comment $NetBSD: PLIST,v 1.10 2016/05/16 20:17:10 adam Exp $
 bin/pstoedit
 include/pstoedit/base64writer.h
 include/pstoedit/cppcomp.h
@@ -23,9 +23,8 @@ lib/pstoedit/pstoedit/libp2edrvstd.la
 lib/pstoedit/pstoedit/libp2edrvswf.la
 man/man1/pstoedit.1
 share/aclocal/pstoedit.m4
-share/doc/html/pstoedit/changelog.htm
-share/doc/html/pstoedit/index.htm
-share/doc/html/pstoedit/pstoedit.htm
+share/doc/pstoedit/changelog.htm
+share/doc/pstoedit/pstoedit.htm
 share/doc/pstoedit/readme.txt
 share/pstoedit/drvhpgl.pencolors
 share/pstoedit/examplefigmap.fmp
diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo
index b13963bc01a..46ac047546c 100644
--- a/graphics/pstoedit/distinfo
+++ b/graphics/pstoedit/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.16 2015/11/03 21:34:15 agc Exp $
+$NetBSD: distinfo,v 1.17 2016/05/16 20:17:10 adam Exp $
 
-SHA1 (pstoedit-3.62.tar.gz) = 50d5a4e2fe0e0ff2f73cb094cb945b221083e742
-RMD160 (pstoedit-3.62.tar.gz) = f1d1ee54f4608ad8fa0d2a03a192ae6c6e27f5e9
-SHA512 (pstoedit-3.62.tar.gz) = f8c8643c873066026d0ef15a845006cf13928410e1c4b822bdd9a727d5d80f703d3ddabbcde249c72395c3b013dd2e1ef020f4a74f239b118035372ba5e4dda4
-Size (pstoedit-3.62.tar.gz) = 1013477 bytes
-SHA1 (patch-aa) = 7b6f650e502727b680fd91923f05a5188e91bfa6
-SHA1 (patch-ab) = 02f7955e508cdc3b52985ac35d8f91c621e43290
-SHA1 (patch-ac) = aa0c53f93c6f256c72f60f11363f372dfc949c40
+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-src_Makefile.in) = e792a4645127910488c89b97679b08aa9a55d33c
diff --git a/graphics/pstoedit/patches/patch-aa b/graphics/pstoedit/patches/patch-aa
deleted file mode 100644
index 89089911cd7..00000000000
--- a/graphics/pstoedit/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2010/04/13 06:53:20 obache Exp $
-
---- src/Makefile.am.orig	2009-08-13 08:13:53.000000000 +0000
-+++ src/Makefile.am
-@@ -130,7 +130,7 @@ libpstoedit_la_SOURCES =			\
- 	genericints.h 				\
- 	version.h
- 
--libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
-+libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm
- libpstoedit_la_LDFLAGS = -no-undefined
- 
- pstoedit_SOURCES = cmdmain.cpp
diff --git a/graphics/pstoedit/patches/patch-ac b/graphics/pstoedit/patches/patch-ac
deleted file mode 100644
index eab1ee4d6f6..00000000000
--- a/graphics/pstoedit/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2011/11/30 21:07:20 wiz Exp $
-
-Avoid this:
-
-/usr/pkgsrc/graphics/pstoedit/work/.buildlink/include/ImageMagick/magick/magick-type.h:120: error: ISO C++ does not support 'long long'
-/usr/pkgsrc/graphics/pstoedit/work/.buildlink/include/ImageMagick/magick/magick-type.h:121: error: ISO C++ does not support 'long long'
-
-on alpha (and probably others)
-
---- configure.orig	2011-08-27 15:27:42.000000000 +0000
-+++ configure
-@@ -16859,7 +16859,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 -pedantic -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith -Wno-long-long "
-+    SPECIAL_CXXFLAGS="-DBUGGYGPP -Wall -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-configure b/graphics/pstoedit/patches/patch-configure
new file mode 100644
index 00000000000..6fbbc181551
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-configure
@@ -0,0 +1,60 @@
+$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-ab b/graphics/pstoedit/patches/patch-src_Makefile.in
index f6cf8f9e0e3..63e636277f3 100644
--- a/graphics/pstoedit/patches/patch-ab
+++ b/graphics/pstoedit/patches/patch-src_Makefile.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2011/11/30 21:07:20 wiz Exp $
+$NetBSD: patch-src_Makefile.in,v 1.1 2016/05/16 20:17:10 adam Exp $
+
+Do not force linking with libdl.
 
 --- src/Makefile.in.orig	2011-08-27 15:27:38.000000000 +0000
 +++ src/Makefile.in