<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/85e58854e78e0cc45c6b010adfbfad4e93213f7a">https://github.com/macports/macports-ports/commit/85e58854e78e0cc45c6b010adfbfad4e93213f7a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 85e58854e78e0cc45c6b010adfbfad4e93213f7a
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat Feb 2 22:48:47 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> asymptote: update to 2.47, use python 3.7
</span>---
graphics/asymptote/Portfile | 84 ++++++++++------------------
graphics/asymptote/files/patch-Makefile.diff | 27 +++++++++
2 files changed, 55 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/asymptote/Portfile b/graphics/asymptote/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 152321a..c840328 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/asymptote/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/asymptote/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span> PortGroup texlive 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup vectorgraphics asymptote 2.44
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name asymptote
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories graphics
maintainers {mojca @mojca} openmaintainer
description A vector graphics language
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,25 +20,32 @@ license LGPL-3+
</span> license_noconflict libpaper
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ce0a959b0b11d2cbcced2c9aeb45edf0d7038a06 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6373edad55752eb425e824670b4aa5d7e1e6aba1e19c3c1c8cedf37ee53cb005 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1264551
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.version 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.bin ${prefix}/bin/python${python.branch}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\\\[${version}git\\\]|\\\[${version}\\\]|" ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:asymptote
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.suffix .src.tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6f0adc5bbc5e56351e573c052db4f61d454b5d9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e1a4e5a36f87f62986f86bc4cff5ae922c8aa71bd3e17b5975ad7fbe8525827d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3621676
</span>
patchfiles patch-Makefile.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON@@|${python.bin}|g" ${worksrcpath}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args --with-latex=${texlive_texmfports}/tex/latex \
--with-context=${texlive_texmfports}/tex/context/third \
--mandir=${prefix}/share/man \
--disable-offscreen
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#build.env-append PYRCC5=${prefix}/bin/pyrcc5-${python.branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PYUIC5=${prefix}/bin/pyuic5-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#destroot.env-append PYRCC5=${prefix}/bin/pyrcc5-${python.branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PYUIC5=${prefix}/bin/pyuic5-${python.branch}
</span>
# texlive-latex-recommended and texinfo are only used for building the docs
# other relevant packages are:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,12 +57,11 @@ build.target all
</span> #
# one day we could split that into a separate +docs variant
# or fetch the PDF from somewhere
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gawk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ghostscript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:ghostscript \
</span> port:texinfo \
port:texlive-latex-recommended \
port:texlive-fonts-recommended
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py${python.version}-pyqt5
</span>
depends_lib port:readline \
port:fftw-3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +81,10 @@ depends_lib port:readline \
</span> #
# But then asy also supports luatex, context, etc.
depends_run port:ghostscript \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-basic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-basic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pycson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py${python.version}-pyqt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: python dependencies for xasy should be optional
</span>
depends_skip_archcheck-append \
port:ghostscript \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,21 +94,8 @@ depends_skip_archcheck-append \
</span> port:texlive-latex-recommended
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch 2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch 3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch 3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.branch} != ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.bin ${prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#!/usr/bin/env python|#!${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}[glob -directory ${destroot}${prefix}/share/${name}/GUI *.py]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/bin/xasy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#!/usr/bin/env python.*|#!${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob -directory ${destroot}${prefix}/share/${name}/GUI *.py]
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,28 +106,4 @@ post-deactivate {
</span> system "mktexlsr"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# asymptote's GUI needs either pyXY-pil or pyXY-Pillow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/44284
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python35 python36 description {Enable xasy GUI using Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.version 27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-tkinter \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/PIL:py${python.version}-Pillow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python36 description {Enable xasy GUI using Python 3.5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.version 35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-tkinter \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-Pillow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python35 description {Enable xasy GUI using Python 3.6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.version 36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-tkinter \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-Pillow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {archive/([0-9.]+).tar.gz}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "If you want to use xasy, install py${python.version}-pyqt5."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/asymptote/files/patch-Makefile.diff b/graphics/asymptote/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index aa07a99..65b7995 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/asymptote/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/asymptote/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,30 @@
</span> LFLAGS = @LDFLAGS@
LIBS = $(LFLAGS) @PTHREAD_LIBS@ @LIBS@ $(GCLIBS)
DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -s -static
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#@@ -110,7 +110,7 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# export prefix docdir exampledir mandir infodir INSTALL MAKE DESTDIR TEXI2DVI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# asy: version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#- -pyrcc5 GUI/res/icons.qrc -o GUI/icons_rc.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#+ $(PYRCC5) GUI/res/icons.qrc -o GUI/icons_rc.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# if test -n "$(MSDOS)"; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) revision.o asy.o $(DOSLIBS); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,7 +128,7 @@ version: $(GCLIB) $(FILES:=.o) $(UIFILES:.ui=.py)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo @set VERSION $(revision) > doc/version.texi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo @set Datadir @datadir@ >> doc/version.texi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "#!/usr/bin/env python3" > GUI/xasyVersion.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "#!@@PYTHON@@" > GUI/xasyVersion.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo xasyVersion = \"$(revision)\" >> GUI/xasyVersion.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$(MSDOS)"; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#@@ -344,7 +344,7 @@ check-all: asy FORCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# rm -f $@.$$$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# %.py: %.ui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# mkdir -p GUI/pyUIClass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#- -pyuic5 -o GUI/pyUIClass/$(notdir $@) $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#+ $(PYUIC5) -o GUI/pyUIClass/$(notdir $@) $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # Compile for the shared library. OpenGL must be disabled as it causes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # crashes inside a shared library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# %.pic.o: %.cc
</span></pre><pre style='margin:0'>
</pre>