<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7f7edcc5bf32b2c862b194e524cb4fdf43e4d727">https://github.com/macports/macports-ports/commit/7f7edcc5bf32b2c862b194e524cb4fdf43e4d727</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7f7edcc5bf3 octave-octproj: update to 3.0.2, use proj8
</span>7f7edcc5bf3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7f7edcc5bf32b2c862b194e524cb4fdf43e4d727
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Tue Nov 8 08:41:18 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> octave-octproj: update to 3.0.2, use proj8
</span>---
math/octave-octproj/Portfile | 15 ++++++-----
math/octave-octproj/files/patch-flags.diff | 31 -----------------------
math/octave-octproj/files/patch-src-Makefile.diff | 15 +++++++++++
3 files changed, 23 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-octproj/Portfile b/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d349ea8fabd..d9436c50e9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,22 +3,23 @@
</span> PortSystem 1.0
PortGroup octave 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-octave.setup octproj 2.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.setup octproj 3.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
description This package allows to call functions of PROJ.4 library for \
cartographic projections transformations.
long_description {*}${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://bitbucket.org/jgpallero/octproj/downloads/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3aaf32c651191eabe98b7cf091b2e5773f3c328f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 585d03683dc643fc0a81d302e5c7951510bd1bc6091674d5217e4e94c17a68d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 264778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1dec59736670720607c8c79c8d6a24565985393c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1b60239ede0a19aabd85d5c72c72fee9df6519bf37c2430766ab303628f04b3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9500328
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:proj8
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-flags.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src-Makefile.diff
</span>
post-patch {
reinplace "s|%PREFIX%|${prefix}|" ${worksrcpath}/src/Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-octproj/files/patch-flags.diff b/math/octave-octproj/files/patch-flags.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 840e9cd49fb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-octproj/files/patch-flags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2020-05-16 05:03:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2020-05-23 08:56:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,19 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -*- coding: utf-8 -*-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MKOCTFILE?=mkoctfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#MKOCTFILE?=mkoctfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Common warning flags for C and C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FLAGSCOMW=-Wall -Wextra -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#FLAGSCOMW=-Wall -Wextra -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Common optimization flags for C and C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FLAGSCOMO=-O2 -funroll-loops -fno-common -fshort-enums
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#FLAGSCOMO=-O2 -funroll-loops -fno-common -fshort-enums
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Flags for C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS=-std=c99 -pedantic $(FLAGSCOMW) -Wconversion -Wmissing-prototypes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS+=-Wstrict-prototypes -Wnested-externs $(FLAGSCOMO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CFLAGS=-std=c99 -pedantic $(FLAGSCOMW) -Wconversion -Wmissing-prototypes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CFLAGS+=-Wstrict-prototypes -Wnested-externs $(FLAGSCOMO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Flags for C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXXFLAGS=$(FLAGSCOMW) $(FLAGSCOMO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CXXFLAGS=$(FLAGSCOMW) $(FLAGSCOMO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Flags for the linker
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LDFLAGS=-lproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS+=-L%PREFIX%/lib/proj6/lib -lproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS+=-I%PREFIX%/lib/proj6/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Export flags for compilers and linker
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--export CFLAGS CXXFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#export CFLAGS CXXFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: compile
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-octproj/files/patch-src-Makefile.diff b/math/octave-octproj/files/patch-src-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1523a7aef61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-octproj/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2022-11-07 07:13:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2022-11-08 08:36:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,9 +11,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Flags for C++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS+=$(FLAGSCOMW) $(FLAGSCOMO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Flags for the linker
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS+=-lproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS+=-L%PREFIX%/lib/proj8/lib -lproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CPPFLAGS+=-I%PREFIX%/lib/proj8/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Export flags for compilers and linker
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-export CFLAGS CXXFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#export CFLAGS CXXFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: compile
</span></pre><pre style='margin:0'>
</pre>