<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f7524ecca19e43497ae960cb722b7dcb2945853b">https://github.com/macports/macports-ports/commit/f7524ecca19e43497ae960cb722b7dcb2945853b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f7524ec pstoedit: update to version 3.71
</span>f7524ec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f7524ecca19e43497ae960cb722b7dcb2945853b
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat May 5 16:02:45 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> pstoedit: update to version 3.71
</span>---
graphics/pstoedit/Portfile | 9 +-
graphics/pstoedit/files/patch-pkglibdir.diff | 180 ---------------------------
2 files changed, 4 insertions(+), 185 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pstoedit/Portfile b/graphics/pstoedit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c916321..60b5910 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pstoedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pstoedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name pstoedit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.71
</span> categories graphics
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +18,9 @@ long_description pstoedit converts PostScript™ and PDF files to other \
</span> homepage http://www.pstoedit.net/
master_sites sourceforge:project/pstoedit/pstoedit/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b41a02485ebba3861681d280407a788a59538d15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 06b86113f7847cbcfd4e0623921a8763143bbcaef9f9098e6def650d1ff8138c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8ceec688b2f133b91a93a90b6a062e1e2a75c341 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0589cd22cd9c23dee12d9bc9f26760f872185d8a1fb72a05bc58f6b824cfbc95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1046071
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,6 @@ depends_run port:ghostscript
</span>
patchfiles patch-config-pstoedit.pc.in.diff \
patch-configure.ac.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pkglibdir.diff \
</span> patch-src-cppcomp.h.diff
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pstoedit/files/patch-pkglibdir.diff b/graphics/pstoedit/files/patch-pkglibdir.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 162d27f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pstoedit/files/patch-pkglibdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,180 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix for pstoedit search for plugins.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-By default, pstoedit "make install" installs to PSTOEDITLIBDIR, so if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-nobody moves them to another location, then it is sufficient to search in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PSTOEDITLIBDIR.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-But the way how pstoedit searches for plugins is broken:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-If pstoedit.reg does not exist or does not contain common/plugindir, then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-it tries $exepath/../lib/pstoedit, always sets pluginsloaded, and never
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-tries PSTOEDITLIBDIR.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-If pstoedit.reg contains common/plugindir, then it tries that path,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-always sets pluginsloaded, and never tries PSTOEDITLIBDIR.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-=> The default installation directory is never tried, if it is not equal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to one of above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The implementation has just another problem:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-If pstoedit.reg contains common/plugindir, and the directory defined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-there is equal to $pkglibdir, but the string is not literally
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"{expansion_of_bindir}/../lib/pstoedit", then plugins are loaded twice.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-So the check as it is makes only a little sense, because nobody would
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-create ~/.pstoedit.reg containing:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-common/plugindir=/usr/bin/../lib/pstoedit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The new implementation does things differently:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-If common/plugindir is defined, it checks only that directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It swaps the check order: First checks whether PSTOEDITLIBDIR exists. If
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-it exists, it skips blind attempts to find plugins.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-As PSTOEDITLIBDIR is always defined by makefile, the blind fallback will
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-be attempted only in obscure environments.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: pstoedit-3.70/src/pstoedit.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pstoedit.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pstoedit.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include I_string_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pstoeditoptions.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -261,33 +262,33 @@ static void loadpstoeditplugins(const ch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loadPlugInDrivers(plugindir.c_str(), errstream, verbose); // load the driver plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginsloaded = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // also look in the directory where the pstoedit .exe/dll was found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char szExePath[1000];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- szExePath[0] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const unsigned long r = P_GetPathToMyself(progname, szExePath, sizeof(szExePath));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (verbose) errstream << "pstoedit : path to myself:" << progname << " " << r << " " << szExePath<< endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *p = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *p = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!strequal(szExePath, plugindir.c_str())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- loadPlugInDrivers(szExePath, errstream,verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pluginsloaded = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // now try also $exepath/../lib/pstoedit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strcat_s(szExePath,1000,"/../lib/pstoedit");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!strequal(szExePath, plugindir.c_str())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- loadPlugInDrivers(szExePath, errstream,verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pluginsloaded = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PSTOEDITLIBDIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!pluginsloaded) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!pluginsloaded &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ !stat(PSTOEDITLIBDIR, &s) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ S_ISDIR(s.st_mode)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // also try to load drivers from the PSTOEDITLIBDIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loadPlugInDrivers(PSTOEDITLIBDIR, errstream,verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pluginsloaded = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // If the above failed, also look in the directory where the pstoedit .exe/dll was found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!pluginsloaded) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char szExePath[1000];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ szExePath[0] = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const unsigned long r = P_GetPathToMyself(progname, szExePath, sizeof(szExePath));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (verbose) errstream << "pstoedit : path to myself:" << progname << " " << r << " " << szExePath<< endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *p = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *p = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ loadPlugInDrivers(szExePath, errstream,verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // now try also $exepath/../lib/pstoedit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcat_s(szExePath,1000,"/../lib/pstoedit");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!strequal(szExePath, plugindir.c_str())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ loadPlugInDrivers(szExePath, errstream,verbose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // delete[]plugindir;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: pstoedit-3.70/doc/pstoedit.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/pstoedit.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/pstoedit.tex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -352,7 +352,7 @@ If the \Opt{-fontmap} option is not spe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \item MS Windows: The same directory where the \Prog{pstoedit} executable is located
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \item Unix:\\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $<$\emph{The directory where the pstoedit executable is located}$>$\verb+/../lib/+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ The default installation directory. If it fails, then $<$\emph{The directory where the pstoedit executable is located}$>$\verb+/../lib/+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \end{itemize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: pstoedit-3.70/doc/pstoedit.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pstoedit.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/pstoedit.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '\" t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--.\" Manual page created with latex2man on Thu Jan 1 20:55:12 CET 2015
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.\" Manual page created with latex2man on Fri Mar 13 20:58:53 CET 2015
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .\" NOTE: This file is generated, DO NOT EDIT.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .de Vb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .ft CW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--.TH "PSTOEDIT" "1" "01 January 2015" "Conversion Tools " "Conversion Tools "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.TH "PSTOEDIT" "1" "13 March 2015" "Conversion Tools " "Conversion Tools "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .SH NAME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pstoedit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -367,7 +367,7 @@ MS Windows: The same directory where the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .B *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Unix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .br
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--<\fIThe directory where the pstoedit executable is located\fP>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+The default installation directory. If it fails, then <\fIThe directory where the pstoedit executable is located\fP>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /../lib/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .RS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: pstoedit-3.70/doc/pstoedit.htm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/pstoedit.htm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/pstoedit.htm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--<!-- Manual page created with latex2man on Thu Jan 1 20:55:13 CET 2015
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<!-- Manual page created with latex2man on Fri Mar 13 20:58:54 CET 2015
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** Author of latex2man: Juergen.Vollmer@informatik-vollmer.de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** NOTE: This file is generated, DO NOT EDIT. -->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <html>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,7 +9,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PSTOEDIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </h1>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <h4 align=center>Dr. Wolfgang Glunz </h4>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--<h4 align=center>01 January 2015</h4>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<h4 align=center>13 March 2015</h4>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <h4 align=center>Version 3.70 </h4>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <tt>pstoedit</tt>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - a tool converting PostScript and PDF files into various
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -561,7 +561,7 @@ in the installation directory and uses t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </li>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <li>Unix:<br>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--<<em>The directory where the pstoedit executable is located</em>>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+The default installation directory. If it fails, then <<em>The directory where the pstoedit executable is located</em>>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <tt>/../lib/</tt>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <p>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </li>
</span></pre><pre style='margin:0'>
</pre>