CVS commit: pkgsrc/graphics/pstoedit

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jul 10 10:25:36 UTC 2021

Modified Files:
        pkgsrc/graphics/pstoedit: Makefile PLIST distinfo
        pkgsrc/graphics/pstoedit/patches: patch-src_Makefile.in
Removed Files:
        pkgsrc/graphics/pstoedit/patches: patch-configure patch-doc_pstoedit.1
            patch-doc_pstoedit.htm patch-doc_pstoedit.tex
            patch-src_pstoedit.cpp

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/graphics/pstoedit/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/pstoedit/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/pstoedit/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/pstoedit/patches/patch-configure \
    pkgsrc/graphics/pstoedit/patches/patch-doc_pstoedit.1 \
    pkgsrc/graphics/pstoedit/patches/patch-doc_pstoedit.htm \
    pkgsrc/graphics/pstoedit/patches/patch-doc_pstoedit.tex \
    pkgsrc/graphics/pstoedit/patches/patch-src_pstoedit.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/pstoedit/patches/patch-src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/pstoedit/Makefile
diff -u pkgsrc/graphics/pstoedit/Makefile:1.108 pkgsrc/graphics/pstoedit/Makefile:1.109
--- pkgsrc/graphics/pstoedit/Makefile:1.108     Wed Apr 21 13:24:49 2021
+++ pkgsrc/graphics/pstoedit/Makefile   Sat Jul 10 10:25:36 2021
@@ -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"

Index: pkgsrc/graphics/pstoedit/PLIST
diff -u pkgsrc/graphics/pstoedit/PLIST:1.10 pkgsrc/graphics/pstoedit/PLIST:1.11
--- pkgsrc/graphics/pstoedit/PLIST:1.10 Mon May 16 20:17:10 2016
+++ pkgsrc/graphics/pstoedit/PLIST      Sat Jul 10 10:25:36 2021
@@ -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

Index: pkgsrc/graphics/pstoedit/distinfo
diff -u pkgsrc/graphics/pstoedit/distinfo:1.18 pkgsrc/graphics/pstoedit/distinfo:1.19
--- pkgsrc/graphics/pstoedit/distinfo:1.18      Mon Aug 22 11:20:56 2016
+++ pkgsrc/graphics/pstoedit/distinfo   Sat Jul 10 10:25:36 2021
@@ -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

Index: pkgsrc/graphics/pstoedit/patches/patch-src_Makefile.in
diff -u pkgsrc/graphics/pstoedit/patches/patch-src_Makefile.in:1.1 pkgsrc/graphics/pstoedit/patches/patch-src_Makefile.in:1.2
--- pkgsrc/graphics/pstoedit/patches/patch-src_Makefile.in:1.1  Mon May 16 20:17:10 2016
+++ pkgsrc/graphics/pstoedit/patches/patch-src_Makefile.in      Sat Jul 10 10:25:36 2021
@@ -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