From nobody Thu Jun 22 19:23:42 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qn9Jv1xmGz4hCC1; Thu, 22 Jun 2023 19:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qn9Jv1TWDz4dNk; Thu, 22 Jun 2023 19:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687461823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iu8aQQxPyyNgO+yG1tko6I2kWvLz5gkzQrzhml2/50w=; b=o0Ooyj3FzQ66Nm7ZWctEdbcyk7Ut7OWFahwotAEbYbPESrJXIrJY2ZgElaUtA54i8+WyoI FNoM0aA8pVWPdDA9fPrzSmcZCER1m3oTCorc5Z/g2ijCJJ+CWJ1oT7dc+QoAsXf6T2X+lQ MfzXp8gYoE1F2KrtgLW+SXbylXwEdzRhFQCAakDmzrkkk+JbhOSNAm4zm0Xvv4O4cgpQCr /ltJ4RaMTw/9r/1z+/j256E6OQAdbJ1+5gV5KpFc21lsuTVkfehFgJHo6YSJjca9fhVWNd CYHrxBcWQUCYuOnK3aEDppc4ykUtQSIMTMF/GcmnbfhgYt8tm+UbDFQdUakJ+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687461823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iu8aQQxPyyNgO+yG1tko6I2kWvLz5gkzQrzhml2/50w=; b=XkEP0PeO04p2fnic6H8MhcLyLR0Yjr7fjzUBgzqlyi7vB3D7yTiVMzXDL0pseP5jAuIG7s Wd3hRkqM5XAOD4lLTnvx8FJfJeRLvyObhlcLtuvPGGKvCpeoWTsdirYT1fxaDj0NNzj+yB m9bysQwrej9uGgq9e3CDradpVWGy35M3kz3wID56Up1bCJjORZsJUmeR2rK/h3TbdCUUVI qk6YYGmySVad0RT5UUgRooDDJZUfIMWcSBATdeKuTQSujrjf0qpy0M8TetPrDr9tNQoYvw Kl978iaqtE9jwGqvtiF996JcR4ltz4wMagBSjutIkNwhFr1rM59PX2VQ3TZcpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687461823; a=rsa-sha256; cv=none; b=Prj+HOG1Hdv0jBkoadrCEN5ihfWx3yuI6mIQpJFBYwVZ11fzdvfBeuqijsIE5QkCRlu5IR pq5dtPvxMkJug8Gg0e1LnkXxXLMiRXrZIwIwntZaux9rgRgU68PNtsWYFfh8z+zrroG0xa KBb3B35U2EzArclJLYf298mer5cjA/lghqYsTj6GqKyYv63MNq57I+Ya9fCxJNmncYEeZK 6/OAgL/AD2TFvBrsnpeR8B/0knD2mmsq9CK1s9GdmjjG2+UXEGoViWe+kBWRK8cv/mLPZ+ nM0LPzX4qTgZk3OAiHVnVG6+xn5RjKK395RV21skHwWfiUhWorNTfR17k9tIkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qn9Jv0LpPzbTW; Thu, 22 Jun 2023 19:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MJNglq092176; Thu, 22 Jun 2023 19:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MJNgNA092175; Thu, 22 Jun 2023 19:23:42 GMT (envelope-from git) Date: Thu, 22 Jun 2023 19:23:42 GMT Message-Id: <202306221923.35MJNgNA092175@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 69d2986c0302 - main - graphics/pstoedit: Update to 4.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69d2986c03027c8a1f22bae1b59a2a4eeecc1301 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=69d2986c03027c8a1f22bae1b59a2a4eeecc1301 commit 69d2986c03027c8a1f22bae1b59a2a4eeecc1301 Author: Nuno Teixeira AuthorDate: 2023-06-22 19:21:04 +0000 Commit: Nuno Teixeira CommitDate: 2023-06-22 19:23:29 +0000 graphics/pstoedit: Update to 4.0.0 - Switch to DISTVERSION - Define license - Take maintainership ChangeLog: http://www.calvina.de/pstoedit/changelog.htm --- graphics/pstoedit/Makefile | 38 +++++++++++++++---------------- graphics/pstoedit/distinfo | 6 ++--- graphics/pstoedit/files/patch-configure | 40 +++++++++++++-------------------- graphics/pstoedit/pkg-plist | 12 ---------- 4 files changed, 38 insertions(+), 58 deletions(-) diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 367925eb599d..3d8e27ed3953 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,16 +1,16 @@ 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 @@ -27,21 +27,21 @@ 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: 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 @@ -17,23 +17,11 @@ 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