<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f240f4ca30410fea0fbb9ef718094a8cb65963f8">https://github.com/macports/macports-ports/commit/f240f4ca30410fea0fbb9ef718094a8cb65963f8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f240f4ca30410fea0fbb9ef718094a8cb65963f8
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue Apr 18 07:02:04 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> asymptote: update to 2.85, fix the build
</span>---
graphics/asymptote/Portfile | 40 +++++++++++++++---------
graphics/asymptote/files/patch-Makefile.diff | 18 ++++++-----
graphics/asymptote/files/patch-time.diff | 46 ++++++++++++++++++++++++++++
3 files changed, 83 insertions(+), 21 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 398d45caebe..9dc63b0b95e 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;'>@@ -2,11 +2,12 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span> PortGroup texlive 1.0
name asymptote
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.70
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.85
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories graphics
maintainers {mojca @mojca} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,32 +22,41 @@ license LGPL-3+
</span> # libpaper is a dependency of ghostscript that's only used at runtime
license_noconflict libpaper
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.branch 3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.branch 3.11
</span> set python.version [join [split ${python.branch} "."] ""]
set python.bin ${prefix}/bin/python${python.branch}
master_sites sourceforge:project/${name}/${version}/
extract.suffix .src.tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c78a5d06d17dfda25e785e7b599e044e6374494b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f5cc913a858c33e92f79ab421d354c0fe2babd87f452ae9dff729a902aa80c3f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4674495
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8bb7f9e757ab5109dd4d6772dcddcad05077c7e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4c0559b62c41f947b5fbf044b4d091bd3cf0abe599c85138087069809875ec87 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15073771
</span>
# On Lion the default clang fails with
# ../base/graph_splinetype.asy: 13.10: arrays have different lengths: 24 != 25
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist {clang < 500}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gcc-4.2 fails on 10.6 with multiple errors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist {clang < 500} *gcc-4.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note, patch-time.diff should likely to be dropped with 2.86.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-time.diff
</span>
post-patch {
reinplace "s|@@PYTHON@@|${python.bin}|g" ${worksrcpath}/Makefile.in
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-gc=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-gc=system \
</span> --with-latex=${texlive_texmfports}/tex/latex \
--with-context=${texlive_texmfports}/tex/context/third \
--mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-offscreen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-offscreen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-lsp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++14
</span>
#build.env-append PYRCC5=${prefix}/bin/pyrcc5-${python.branch} \
# PYUIC5=${prefix}/bin/pyuic5-${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,19 +73,21 @@ configure.args --enable-gc=system \
</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:ghostscript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ghostscript \
</span> port:texinfo \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-fonts-recommended \
</span> port:texlive-latex-recommended \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-fonts-recommended
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-latex-extra
</span> # port:py${python.version}-pyqt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:boehmgc \
</span> port:fftw-3 \
port:glm \
port:gsl \
port:libsigsegv \
port:ncurses \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boehmgc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline
</span>
# Runtime dependencies really depend on user preferences.
# Asy can draw graphics without any TeX or without LaTeX,
<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 5f083b246ac..5d3745b814b 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;'>@@ -1,15 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2022-10-29 11:21:56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2022-10-29 11:24:43
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2023-02-09 12:53:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2023-04-18 09:49:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,10 +10,10 @@
</span> GCOPTIONS = @GCOPTIONS@
GCLIB = @GCLIB@
GCPPLIB = @GCPPLIB@
-GCLIBS = $(GCPPLIB) $(GCLIB)
+GCLIBS = $(GCPPLIB) $(GCLIB) -lgccpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lwolfssl -lgdi32 -lwinmm -s -static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,7 +138,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LFLAGS = @LDFLAGS@ -LLspCpp -LLspCpp/third_party/uri/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS) @LSPLIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lwolfssl -lgdi32 -lwinmm -s -static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lgdi32 -lwinmm -s -static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE ?= cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL ?= perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,7 +149,7 @@
</span> echo @set Datadir @datadir@ >> doc/version.texi
echo @set Docdir @docdir@ >> doc/version.texi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/asymptote/files/patch-time.diff b/graphics/asymptote/files/patch-time.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d08131aef9d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/asymptote/files/patch-time.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream fix expected in 2.86: https://github.com/vectorgraphics/asymptote/issues/338
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- seconds.h.orig 2023-02-09 12:53:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ seconds.h 2023-04-18 06:57:02.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef CLOCK_THREAD_CPUTIME_ID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cid=CLOCK_THREAD_CPUTIME_ID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #ifdef HAVE_PTHREAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(HAVE_PTHREAD) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_getcpuclockid(pthread_self(),&cid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif CLOCK_PROCESS_CPUTIME_ID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cid=CLOCK_PROCESS_CPUTIME_ID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/vectorgraphics/asymptote/commit/494e8120ee967aa9c71ae26e2476b5632211b6e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glrender.cc.orig 2023-02-09 12:53:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glrender.cc 2023-04-24 17:25:15.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -432,10 +432,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double T[16];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++timeval lasttime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_GL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_LIBGLUT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-timeval lasttime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int oldWidth,oldHeight;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool queueScreen=false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1892,14 +1893,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // HAVE_LIBOSMESA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* HAVE_GL */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool NVIDIA()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *GLSL_VERSION=(char *) glGetString(GL_SHADING_LANGUAGE_VERSION);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return string(GLSL_VERSION).find("NVIDIA") != string::npos;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* HAVE_GL */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // angle=0 means orthographic.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void glrender(const string& prefix, const picture *pic, const string& format,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double width, double height, double angle, double zoom,
</span></pre><pre style='margin:0'>
</pre>