<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1ff69076611d7680b770f872e41283a2d74fcfba">https://github.com/macports/macports-ports/commit/1ff69076611d7680b770f872e41283a2d74fcfba</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1ff69076611d7680b770f872e41283a2d74fcfba
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Nov 1 02:11:48 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> asymptote: De-fuzz patchfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66100
</span>---
graphics/asymptote/Portfile | 1 -
graphics/asymptote/files/patch-Makefile.diff | 30 ++++++----------------------
2 files changed, 6 insertions(+), 25 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 fbe7a2fd0a9..398d45caebe 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;'>@@ -20,7 +20,6 @@ homepage http://asymptote.sourceforge.net
</span> license LGPL-3+
# libpaper is a dependency of ghostscript that's only used at runtime
license_noconflict libpaper
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
set python.branch 3.9
set python.version [join [split ${python.branch} "."] ""]
<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 4b43de66615..5f083b246ac 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,7 +10,7 @@ LIBATOMIC = libatomic_ops-@ATOMICVERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2022-10-29 11:21:56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2022-10-29 11:24:43
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span> GCOPTIONS = @GCOPTIONS@
GCLIB = @GCLIB@
GCPPLIB = @GCPPLIB@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,31 +8,13 @@
</span> +GCLIBS = $(GCPPLIB) $(GCLIB) -lgccpp
LFLAGS = @LDFLAGS@
LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lgdi32 -lwinmm -s -static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#@@ -110,7 +110,7 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# export prefix docdir exampledir mandir infodir INSTALL MAKE DESTDIR TEXI2DVI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# asy: version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#- -pyrcc5 GUI/res/icons.qrc -o GUI/icons_rc.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#+ $(PYRCC5) GUI/res/icons.qrc -o GUI/icons_rc.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if test -n "$(MSDOS)"; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) revision.o asy.o $(DOSLIBS); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,7 +137,7 @@ version: $(GCLIB) $(FILES:=.o) $(UIFILES:.ui=.py)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo @set VERSION $(revision) > doc/version.texi
</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;'>+@@ -138,7 +138,7 @@
</span> echo @set Datadir @datadir@ >> doc/version.texi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo @set Docdir @docdir@ >> doc/version.texi
</span>
- echo "#!/usr/bin/env python3" > GUI/xasyVersion.py
+ echo "#!@@PYTHON@@" > GUI/xasyVersion.py
echo xasyVersion = \"$(revision)\" >> GUI/xasyVersion.py
if test -n "$(MSDOS)"; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#@@ -344,7 +344,7 @@ check-all: asy FORCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# rm -f $@.$$$$
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# %.py: %.ui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# mkdir -p GUI/pyUIClass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#- -pyuic5 -o GUI/pyUIClass/$(notdir $@) $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#+ $(PYUIC5) -o GUI/pyUIClass/$(notdir $@) $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # Compile for the shared library. OpenGL must be disabled as it causes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # crashes inside a shared library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# %.pic.o: %.cc
</span></pre><pre style='margin:0'>
</pre>