diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 5259f61ad3e3..929e37c7d756 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,65 +1,65 @@ PORTNAME= pstoedit -PORTVERSION= 3.70 -PORTREVISION= 12 +PORTVERSION= 3.78 CATEGORIES= graphics print MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Convert PostScript to other vector graphic formats WWW= http://www.pstoedit.net/ LICENSE= GPLv2+ LIB_DEPENDS= libgd.so:graphics/gd \ libzip.so:archivers/libzip USES= ghostscript libtool localbase pathfix pkgconfig GNU_CONFIGURE= yes MAKE_ENV= INSTALL_STRIP_FLAG="${STRIP}" USE_LDCONFIG= yes CPPFLAGS+= -isystem ${LOCALBASE}/include/ming PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EMF EXAMPLES MAGICK MING PLOTUTILS OPTIONS_DEFAULT= EMF MAGICK MING PLOTUTILS OPTIONS_SUB= yes EMF_DESC= WMF/EMF support via libEMF +MING_DESC= Flash support via Ming +PLOTUTILS_DESC= Plotting support via Plotutils + EMF_LIB_DEPENDS= libEMF.so:graphics/libemf EMF_CONFIGURE_ON= --with-libemf-include=${LOCALBASE}/include/libEMF EMF_CONFIGURE_OFF= --without-emf MAGICK_USES= magick MAGICK_CONFIGURE_ON= --with-magick MAGICK_CONFIGURE_OFF= --without-magick -MING_DESC= Flash support via Ming MING_LIB_DEPENDS= libming.so:graphics/ming MING_CONFIGURE_ON= --with-swf MING_CONFIGURE_OFF= --without-swf -PLOTUTILS_DESC= Plotting support via Plotutils PLOTUTILS_LIB_DEPENDS= libplotter.so:graphics/plotutils PLOTUTILS_CONFIGURE_ON= --with-libplot PLOTUTILS_CONFIGURE_OFF= --without-libplot post-patch: @${REINPLACE_CMD} -e 's|CXXFLAGS="-g"|CXXFLAGS="$$CXXFLAGS"|g ; \ s|GraphicsMagick|Magick|g ; \ s|=$$OLDCPPFLAGS|=$$CPPFLAGS|g ; \ s|-lstdc++||g ; \ s|-pedantic||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/src/Makefile.in post-install: ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo index 537a934f5980..fabca8785c07 100644 --- a/graphics/pstoedit/distinfo +++ b/graphics/pstoedit/distinfo @@ -1,2 +1,3 @@ -SHA256 (pstoedit-3.70.tar.gz) = 06b86113f7847cbcfd4e0623921a8763143bbcaef9f9098e6def650d1ff8138c -SIZE (pstoedit-3.70.tar.gz) = 1013949 +TIMESTAMP = 1682094664 +SHA256 (pstoedit-3.78.tar.gz) = 8cc28e34bc7f88d913780f8074e813dd5aaa0ac2056a6b36d4bf004a0e90d801 +SIZE (pstoedit-3.78.tar.gz) = 1301408 diff --git a/graphics/pstoedit/files/patch-configure b/graphics/pstoedit/files/patch-configure index 52a4d772a974..e84d00decc5a 100644 --- a/graphics/pstoedit/files/patch-configure +++ b/graphics/pstoedit/files/patch-configure @@ -1,54 +1,54 @@ ---- configure 2014-12-28 20:39:58 UTC +--- configure.orig 2023-04-21 16:38:20 UTC +++ configure -@@ -8263,6 +8263,7 @@ +@@ -8517,6 +8517,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +#include #include #include #include -@@ -16701,12 +16702,12 @@ +@@ -17994,12 +17995,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 \"Magick++\""; } >&5 + ($PKG_CONFIG --exists --print-errors "Magick++") 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 "Magick++" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes -@@ -16718,12 +16719,12 @@ +@@ -18011,12 +18012,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 \"Magick++\""; } >&5 + ($PKG_CONFIG --exists --print-errors "Magick++") 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 "Magick++" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes -@@ -16744,9 +16745,9 @@ +@@ -18037,9 +18038,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 "Magick++" 2>&1` else - LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ImageMagick++" 2>&1` + LIBMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Magick++" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBMAGICK_PKG_ERRORS" >&5 diff --git a/graphics/pstoedit/files/patch-imagemagick7 b/graphics/pstoedit/files/patch-imagemagick7 deleted file mode 100644 index 9d9cd61ca2d9..000000000000 --- a/graphics/pstoedit/files/patch-imagemagick7 +++ /dev/null @@ -1,77 +0,0 @@ -By Jan Rekorajski, obtained from: - - http://git.pld-linux.org/gitweb.cgi/packages/pstoedit.git/commitdiff/1db94627498886a91a6e6ed80d0a8b2b6da1a16b - -and made conditional to still work with ImageMagick earlier than 7. - -(The configure.ac is not currently used by the port.) - ---- configure.ac 2014-12-28 21:39:18.000000000 +0100 -+++ configure.ac 2016-12-25 22:16:29.147826432 +0100 -@@ -299,7 +299,7 @@ - else - if test -n "$PKG_CONFIG"; then - AC_MSG_CHECKING(ImageMagick flags through pkg-config) -- PKG_CHECK_MODULES(LIBMAGICK, ImageMagick++, -+ PKG_CHECK_MODULES(LIBMAGICK, Magick++, - HAVE_LIBMAGICK=yes - LIBMAGICK_CFLAGS="-DHAVE_MAGIC $LIBMAGICK_CFLAGS" - LIBMAGICK_LDFLAGS="$LIBMAGICK_LIBS" , ---- src/drvmagick++.cpp 2015-01-01 18:05:33.000000000 +0100 -+++ src/drvmagick++.cpp 2017-08-08 16:38:28.879138000 -0400 -@@ -121,5 +121,9 @@ void drvMAGICK::create_vpath(VPathList & - switch (elem.getType()) { - case moveto:{ -+#if MagickLibVersion < 0x700 - const Point & p = elem.getPoint(0); -+#else /* MAGICK7 */ -+ const ::Point & p = elem.getPoint(0); -+#endif /* MAGICK7 */ - const Magick::Coordinate coord(p.x_ + x_offset, - currentDeviceHeight - p.y_ + y_offset); -@@ -128,5 +132,9 @@ void drvMAGICK::create_vpath(VPathList & - break; - case lineto:{ -+#if MagickLibVersion < 0x700 - const Point & p = elem.getPoint(0); -+#else /* MAGICK7 */ -+ const ::Point & p = elem.getPoint(0); -+#endif /* MAGICK7 */ - const Magick::Coordinate coord(p.x_ + x_offset, - currentDeviceHeight - p.y_ + y_offset); -@@ -138,7 +146,13 @@ void drvMAGICK::create_vpath(VPathList & - break; - case curveto:{ -+#if MagickLibVersion < 0x700 - const Point & p0 = elem.getPoint(0); - const Point & p1 = elem.getPoint(1); - const Point & p2 = elem.getPoint(2); -+#else /* MAGICK7 */ -+ const ::Point & p0 = elem.getPoint(0); -+ const ::Point & p1 = elem.getPoint(1); -+ const ::Point & p2 = elem.getPoint(2); -+#endif /* MAGICK7 */ - vpath. - push_back(PathCurvetoAbs -@@ -279,5 +293,9 @@ void drvMAGICK::show_path() - } - dasharray[dp.nrOfEntries] = 0; // mark last element -+#if MagickLibVersion < 0x700 - drawList.push_back(DrawableDashArray(dasharray)); // pulls a copy, so we are the owner of dasharray -+#else /* MAGICK7 */ -+ drawList.push_back(DrawableStrokeDashArray(dasharray)); // pulls a copy, so we are the owner of dasharray -+#endif /* MAGICK7 */ - //?? DrawableDashOffset - delete[]dasharray; -@@ -301,5 +319,11 @@ void drvMAGICK::show_path() - drawList.push_back(DrawablePopGraphicContext()); - // Draw everything using completed drawing list -+#if MagickLibVersion < 0x700 - imageptr->draw(drawList); -+#else /* MAGICK7 */ -+ std::vector drawVect; -+ copy(drawList.begin(),drawList.end(),back_inserter(drawVect)); -+ imageptr->draw(drawVect); -+#endif /* MAGICK7 */ - #endif - diff --git a/graphics/pstoedit/files/patch-src_drvwmf.cpp b/graphics/pstoedit/files/patch-src_drvwmf.cpp new file mode 100644 index 000000000000..b587d2ce0282 --- /dev/null +++ b/graphics/pstoedit/files/patch-src_drvwmf.cpp @@ -0,0 +1,15 @@ +--- src/drvwmf.cpp.orig 2021-04-17 18:52:47 UTC ++++ src/drvwmf.cpp +@@ -30,6 +30,12 @@ + #include I_stdlib + + #include ++#ifdef max ++#undef max ++#endif ++#ifdef min ++#undef min ++#endif + #include + + #ifndef M_PI