<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ff9bb6fd57a17750015c1c212884a5521ee81e58">https://github.com/macports/macports-ports/commit/ff9bb6fd57a17750015c1c212884a5521ee81e58</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ff9bb6fd57a17750015c1c212884a5521ee81e58
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Jan 4 08:40:23 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> inkscape: update to new stable version 0.92
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * autogen.sh now included in tarball
</span><span style='display:block; white-space:pre;color:#404040;'> * remove outdated svg2 variant, now part of standard build
</span><span style='display:block; white-space:pre;color:#404040;'> * requires gnome-themes-standard if building with gtk3 support
</span>---
graphics/inkscape/Portfile | 26 ++++-------
graphics/inkscape/files/autogen.sh | 51 ----------------------
.../inkscape/files/patch-use-configured-perl.diff | 4 +-
3 files changed, 11 insertions(+), 70 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/Portfile b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f3bcab8..a1f1e78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,11 @@ PortSystem 1.0
</span>
name inkscape
conflicts inkscape-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.91
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.92.0
</span> license GPL-2 LGPL-2.1
maintainers devans
categories graphics gnome
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.inkscape.org/
</span>
description This is the current stable release version of Inkscape.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,12 +16,13 @@ long_description Inkscape is an multi-platform, Open-Source Vector Graphics E
</span> that uses SVG as its native file format. \
${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://inkscape.org/en/gallery/item/3860/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.inkscape.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://inkscape.org/gallery/item/10552/
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 77421bcb96c6ad4fe17e775e86b77d576b90cf32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ac888ac85a1595242aa060085f741224dbf8bf5d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b8b4c159a00448d465384533e5a70d3f33e5f9c6b74c76ea5d636ddd6dd7ba56
</span>
set perl_version 5.24
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,14 +49,13 @@ depends_lib port:desktop-file-utils \
</span> port:libwpg-0.3 \
port:aspell \
port:gtkspell2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:potrace \
</span> port:py27-lxml \
port:py27-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-use-configured-perl.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span> reinplace "s|@@MP_PERL@@|${prefix}/bin/perl${perl_version}|" ${worksrcpath}/Makefile.am
reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.7\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,15 +78,13 @@ variant gtk3 description {Enable experimental GTK+ 3 build} {
</span> port:gtkmm3 \
port:gdl3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnome-themes-standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
--enable-gtk3-experimental
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant svg2 description {Enable experimental SVG level 2 proposed features} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DWITH_MESH -DWITH_CSSBLEND -DWITH_CSSCOMPOSITE -DWITH_SVG2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cmd ./autogen.sh && ./configure
configure.python ${prefix}/bin/python2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,10 +113,6 @@ variant strict description {Enable strict build} {
</span> configure.args-replace --disable-strict-build --enable-strict-build
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# don't build strict by default after upgrade of glib2 to 2.48.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/52248
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# default_variants +strict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #
# the following dummy variants are used
# to identify this port's binary dependencies
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/autogen.sh b/graphics/inkscape/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0a9cb79..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This script does all the magic calls to automake/autoconf and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# friends that are needed to configure a cvs checkout. As described in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the file HACKING you need a couple of extra tools to run this script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# successfully.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# If you are compiling from a released tarball you don't need these
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# tools and you shouldn't use this script. Just call ./configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# directly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$srcdir" || srcdir=`dirname "$0"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$srcdir" || srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-olddir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $srcdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-WHICH_AUTORECONF=`which autoreconf`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z $WHICH_AUTORECONF; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** No autoreconf found, please install it ***"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</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;'>-WHICH_INTLTOOLIZE=`which intltoolize`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z $WHICH_INTLTOOLIZE; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** No intltoolize found, please install the intltool package ***"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</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;'>-WHICH_AUTOPOINT=`which autopoint`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z $WHICH_AUTOPOINT; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** No autopoint found, please install the autopoint package ***"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</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;'>-autopoint --force
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch the generated po/Makefile.in.in file so that locale files are installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in the correct location on OS X and Free-BSD systems. This is a workaround
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for a bug in intltool. See https://launchpad.net/bugs/398571
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The issue should be fixed in intltool 0.51.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: Drop this hack, and bump our intltool version requirement once the issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# is fixed in intltool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sed 's/itlocaledir = $(prefix)\/$(DATADIRNAME)\/locale/itlocaledir = $(datarootdir)\/locale/' < po/Makefile.in.in > po/Makefile.in.in.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mv po/Makefile.in.in.tmp po/Makefile.in.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Done! Please run './configure' now."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-use-configured-perl.diff b/graphics/inkscape/files/patch-use-configured-perl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9050131..e3e4541 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/patch-use-configured-perl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/files/patch-use-configured-perl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Makefile.am.orig 2016-10-25 03:16:54.000000000 -0700
+++ Makefile.am 2016-10-25 03:21:48.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -576,12 +576,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -598,12 +598,12 @@
</span> d=`sed -n 's,/,-,g;s,.*\$$[D]ate: \(..........\).*,\1,p' $<`; \
pod2man --utf8 $< \
| sed 's/^\.TH .*/.TH INKSCAPE 1 "'"$$d"'" "Inkscape-$(VERSION)" "Inkscape"/' \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span> # man 7 groff_char for further remarks on charset encoding for man pages.
po/inkscape.pot:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -605,21 +605,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -630,21 +630,21 @@
</span> #.PHONY: warn_markup
noinst_DATA = warn_markup
warn_markup:
</pre><pre style='margin:0'>
</pre>