[154261] trunk/dports/graphics/inkscape

[devans at macports.org]

Revision: 154261
          https://trac.macports.org/changeset/154261
Author:   devans at macports.org
Date:     2016-10-25 17:34:49 +0200 (Tue, 25 Oct 2016)
Log Message:
-----------
inkscape: update descriptions, patch to build using a specific perl rather than an indeterminate one, currently perl5.24, otherwise sync with inkscape-devel, rebuild not required.

Modified Paths:
--------------
    trunk/dports/graphics/inkscape/Portfile

Added Paths:
-----------
    trunk/dports/graphics/inkscape/files/patch-use-configured-perl.diff

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile	2016-10-25 13:59:09 UTC (rev 154260)
+++ trunk/dports/graphics/inkscape/Portfile	2016-10-25 15:34:49 UTC (rev 154261)
@@ -13,10 +13,11 @@
 platforms           darwin
 homepage            http://www.inkscape.org/
 
-description         Inkscape is an multi-platform, Open-Source Vector Graphics Editor \
-                    that uses SVG as its native file format.
+description         This is the current stable release version of Inkscape.
 
-long_description    ${description}
+long_description    Inkscape is an multi-platform, Open-Source Vector Graphics Editor \
+                    that uses SVG as its native file format. \
+                    ${description}
 
 master_sites        https://inkscape.org/en/gallery/item/3860/
 
@@ -25,12 +26,14 @@
 checksums           rmd160  77421bcb96c6ad4fe17e775e86b77d576b90cf32 \
                     sha256  4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b
 
+set perl_version    5.24
+
 depends_build       port:pkgconfig \
                     port:autoconf \
                     port:automake \
                     port:libtool \
                     port:intltool \
-                    path:bin/perl:perl5
+                    port:perl${perl_version}
 
 depends_lib         port:desktop-file-utils \
                     port:popt \
@@ -51,8 +54,12 @@
                     port:py27-lxml \
                     port:py27-numpy
 
+
+patchfiles          patch-use-configured-perl.diff
+
 post-patch {
     xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+    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
     reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -97,8 +104,14 @@
 configure.cppflags-append \
                     -I${worksrcpath}/src/extension/script
 
-if {[string match "*clang*" ${configure.compiler}]} {
-    configure.cxxflags-append -std=c++11
+platform darwin {
+    if {[string match "*clang*" ${configure.compiler}]} {
+        if {${configure.cxx_stdlib} eq "libstdc++"} {
+            configure.cxxflags-append -std=c++98
+        } else {
+            configure.cxxflags-append -std=c++11
+        }
+    }
 }
 
 variant strict description {Enable strict build} {

Added: trunk/dports/graphics/inkscape/files/patch-use-configured-perl.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-use-configured-perl.diff	                        (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-use-configured-perl.diff	2016-10-25 15:34:49 UTC (rev 154261)
@@ -0,0 +1,45 @@
+--- Makefile.am.orig	2016-10-25 03:16:54.000000000 -0700
++++ Makefile.am	2016-10-25 03:21:48.000000000 -0700
+@@ -576,12 +576,12 @@
+ 	d=`sed -n 's,/,-,g;s,.*\$$[D]ate: \(..........\).*,\1,p' $<`; \
+ 	pod2man --utf8 $< \
+ 	  | sed 's/^\.TH .*/.TH INKSCAPE 1 "'"$$d"'" "Inkscape-$(VERSION)" "Inkscape"/' \
+-	  | perl -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
+-	  | perl $(srcdir)/fix-roff-punct \
++	  | @@MP_PERL@@ -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
++	  | @@MP_PERL@@ $(srcdir)/fix-roff-punct \
+ 	  > tmp.$$$$ \
+ 	 && mv -f tmp.$$$$ $@
+ # ut8-to-roff removed (groff now supports utf8).
+-# 	  | perl -CI $(srcdir)/utf8-to-roff	\
++# 	  | @@MP_PERL@@ -CI $(srcdir)/utf8-to-roff	\
+ # man 7 groff_char for further remarks on charset encoding for man pages.
+ 
+ po/inkscape.pot:
+@@ -605,21 +605,21 @@
+ #.PHONY: warn_markup
+ noinst_DATA = warn_markup
+ warn_markup:
+-	@if perl $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \
++	@if @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \
+ 	  echo "WARNING: Bad markup found in translations.  Please consider fixing the above problems." >&2; \
+ 	fi
+ 
+ .PHONY: check_markup
+ check_DATA = check_markup
+ check_markup:
+-	perl $(srcdir)/po/check-markup $(srcdir)/po/*.po || [ $$? = 127 ]
++	@@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po || [ $$? = 127 ]
+ #	# `make check' probably shouldn't require perl to be installed, hence ignoring 127.
+ 
+ distcheck-hook:
+-	perl $(srcdir)/po/check-markup $(srcdir)/po/*.po
++	@@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po
+ 
+ test-check-markup:
+-	if perl -e 42; then \
+-	  perl $(srcdir)/po/check-markup $(srcdir)/po/bad.po.test 2>&1	\
++	if @@MP_PERL@@ -e 42; then \
++	  @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/bad.po.test 2>&1	\
+ 	    | diff $(srcdir)/po/bad.po.test.exp -;	\
+ 	fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161025/19efe4f5/attachment-0002.html>