diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 367925eb599d..3d8e27ed3953 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,66 +1,66 @@ PORTNAME= pstoedit -PORTVERSION= 3.78 -PORTREVISION= 1 +DISTVERSION= 4.00 CATEGORIES= graphics print MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= eduardo@FreeBSD.org COMMENT= Convert PostScript to other vector graphic formats WWW= http://www.pstoedit.net/ -LICENSE= GPLv2+ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/copying -LIB_DEPENDS= libgd.so:graphics/gd \ +LIB_DEPENDS= libgd.so:graphics/gd \ libzip.so:archivers/libzip USES= ghostscript gmake libtool localbase pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_ENV= INSTALL_STRIP_FLAG="${STRIP}" 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_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_LIB_DEPENDS= libming.so:graphics/ming -MING_CONFIGURE_ON= --with-swf -MING_CONFIGURE_OFF= --without-swf -PLOTUTILS_LIB_DEPENDS= libplotter.so:graphics/plotutils -PLOTUTILS_CONFIGURE_ON= --with-libplot +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_LIB_DEPENDS= libming.so:graphics/ming +MING_CONFIGURE_ON= --with-swf +MING_CONFIGURE_OFF= --without-swf +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 fabca8785c07..7b81914efeb0 100644 --- a/graphics/pstoedit/distinfo +++ b/graphics/pstoedit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682094664 -SHA256 (pstoedit-3.78.tar.gz) = 8cc28e34bc7f88d913780f8074e813dd5aaa0ac2056a6b36d4bf004a0e90d801 -SIZE (pstoedit-3.78.tar.gz) = 1301408 +TIMESTAMP = 1687416605 +SHA256 (pstoedit-4.00.tar.gz) = 075a7daeaba75f3d1922beae680cc3662bb373c7e3826282229fda2733ac62ea +SIZE (pstoedit-4.00.tar.gz) = 1327435 diff --git a/graphics/pstoedit/files/patch-configure b/graphics/pstoedit/files/patch-configure index e84d00decc5a..213f92c17ee3 100644 --- a/graphics/pstoedit/files/patch-configure +++ b/graphics/pstoedit/files/patch-configure @@ -1,54 +1,46 @@ ---- configure.orig 2023-04-21 16:38:20 UTC +--- configure.orig 2023-06-22 08:13:13 UTC +++ configure -@@ -8517,6 +8517,7 @@ else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - #include - #include - #include -@@ -17994,12 +17995,12 @@ if test -n "$LIBMAGICK_CFLAGS"; then +@@ -19097,12 +19097,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 +- { { printf "%s\n" "$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 ++ { { printf "%s\n" "$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 + printf "%s\n" "$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 -@@ -18011,12 +18012,12 @@ if test -n "$LIBMAGICK_LIBS"; then +@@ -19114,12 +19114,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 +- { { printf "%s\n" "$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 ++ { { printf "%s\n" "$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 + printf "%s\n" "$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 -@@ -18037,9 +18038,9 @@ else +@@ -19140,9 +19140,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` +- 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` +- 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 + # Put the nasty error message in config.log where it belongs + echo "$LIBMAGICK_PKG_ERRORS" >&5 diff --git a/graphics/pstoedit/pkg-plist b/graphics/pstoedit/pkg-plist index c3a7704f0cb7..f6b2cec59972 100644 --- a/graphics/pstoedit/pkg-plist +++ b/graphics/pstoedit/pkg-plist @@ -1,49 +1,37 @@ 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