Index: head/graphics/pstoedit/Makefile =================================================================== --- head/graphics/pstoedit/Makefile (revision 447572) +++ head/graphics/pstoedit/Makefile (revision 447573) @@ -1,66 +1,67 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= pstoedit PORTVERSION= 3.70 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics print MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Convert PostScript to other vector graphic formats LICENSE= GPLv2+ -LIB_DEPENDS= libgd.so:graphics/gd +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 EMF_LIB_DEPENDS= libEMF.so:graphics/libemf EMF_CONFIGURE_ON= --with-libemf-include=${LOCALBASE}/include/libEMF EMF_CONFIGURE_OFF= --without-emf -MAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagick++-*.so:graphics/ImageMagick 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 Index: head/graphics/pstoedit/files/patch-configure =================================================================== --- head/graphics/pstoedit/files/patch-configure (revision 447572) +++ head/graphics/pstoedit/files/patch-configure (revision 447573) @@ -1,10 +1,54 @@ ---- configure.orig 2013-04-28 20:20:53.000000000 +0200 -+++ configure 2013-05-23 00:23:30.000000000 +0200 -@@ -8167,6 +8167,7 @@ +--- configure 2014-12-28 20:39:58 UTC ++++ configure +@@ -8263,6 +8263,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +#include #include #include #include +@@ -16701,12 +16702,12 @@ + 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 @@ + 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 @@ + _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 Index: head/graphics/pstoedit/files/patch-imagemagick7 =================================================================== --- head/graphics/pstoedit/files/patch-imagemagick7 (nonexistent) +++ head/graphics/pstoedit/files/patch-imagemagick7 (revision 447573) @@ -0,0 +1,77 @@ +By Jan Rekorajski, obtained from: + + http://git.pld-linux.org/gitweb.cgi/packages/pstoedit.git/commitdiff/1db94627498886a91a6e6ed80d0a8b2b6da1a16b + +and made conditional to still work with IM-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 + Property changes on: head/graphics/pstoedit/files/patch-imagemagick7 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/pstoedit/pkg-plist =================================================================== --- head/graphics/pstoedit/pkg-plist (revision 447572) +++ head/graphics/pstoedit/pkg-plist (revision 447573) @@ -1,46 +1,49 @@ bin/pstoedit include/pstoedit/base64writer.h include/pstoedit/cppcomp.h include/pstoedit/drvbase.h include/pstoedit/drvfuncs.h include/pstoedit/genericints.h include/pstoedit/miscutil.h include/pstoedit/ordlist.h include/pstoedit/papersizes.h include/pstoedit/poptions.h include/pstoedit/psimage.h include/pstoedit/pstoedit.h include/pstoedit/pstoeditoptions.h include/pstoedit/pstoeditoutputlib.h include/pstoedit/pstoedll.h lib/libpstoedit.so lib/libpstoedit.so.0 lib/libpstoedit.so.0.0.0 %%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so %%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so.0 %%PLOTUTILS%%lib/pstoedit/libp2edrvlplot.so.0.0.0 %%MAGICK%%lib/pstoedit/libp2edrvmagick++.so %%MAGICK%%lib/pstoedit/libp2edrvmagick++.so.0 %%MAGICK%%lib/pstoedit/libp2edrvmagick++.so.0.0.0 +lib/pstoedit/libp2edrvpptx.so +lib/pstoedit/libp2edrvpptx.so.0 +lib/pstoedit/libp2edrvpptx.so.0.0.0 lib/pstoedit/libp2edrvstd.so lib/pstoedit/libp2edrvstd.so.0 lib/pstoedit/libp2edrvstd.so.0.0.0 %%MING%%lib/pstoedit/libp2edrvswf.so %%MING%%lib/pstoedit/libp2edrvswf.so.0 %%MING%%lib/pstoedit/libp2edrvswf.so.0.0.0 %%EMF%%lib/pstoedit/libp2edrvwmf.so %%EMF%%lib/pstoedit/libp2edrvwmf.so.0 %%EMF%%lib/pstoedit/libp2edrvwmf.so.0.0.0 libdata/pkgconfig/pstoedit.pc man/man1/pstoedit.1.gz share/aclocal/pstoedit.m4 %%DATADIR%%/drvhpgl.pencolors %%DATADIR%%/examplefigmap.fmp %%DATADIR%%/latex2e.fmp %%DATADIR%%/mpost.fmp %%DATADIR%%/safer.ps %%DATADIR%%/svg.fmp %%DATADIR%%/swffonts/default.fdb %%DATADIR%%/unix.fmp %%DATADIR%%/wemf.fmp %%DATADIR%%/windows.fmp