<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/591997f9170e64303c77db087bfe839213d9dd25">https://github.com/macports/macports-ports/commit/591997f9170e64303c77db087bfe839213d9dd25</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 591997f9170e64303c77db087bfe839213d9dd25
</span>Author: nila <n_larsson@yahoo.com>
AuthorDate: Mon Apr 27 15:11:17 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> grass7: update to 7.8.3
</span>---
gis/grass7/Portfile | 30 +++++++++++--------------
gis/grass7/files/patch-Install_make.diff | 17 +++-----------
gis/grass7/files/vector_v.in.pdal_Makefile.diff | 14 ------------
3 files changed, 16 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/Portfile b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2257812..c7731b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup wxWidgets 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OSGeo grass 7.8.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo grass 7.8.3
</span> name grass7
set main_version [join [lrange [split ${version} "."] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set realVersion ${version}
#distname grass-${version}
distname grass-${realVersion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ long_description GRASS is a Geographic Information System (GIS) used for \
</span> homepage http://grass.osgeo.org/
master_sites ${homepage}grass[join [lrange [split ${realVersion} .] 0 1] {}]/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dfe9144c2f9d81dee0ed05a179cc9834938da5d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 33576f7078f805b39ca20c2fa416ac79c64260c0581072a6dc7d813f53aa9abb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 60563736
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 21ccb5c7d45c5da9d91bfbacc222f4d9f5144297 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 25e79a0d513927b4f783a871f4f4bb7cd43c87ab4abd5523348b32411356a95b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 60292787
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,7 @@ depends_lib port:bzip2 \
</span>
patchfiles patch-configure.diff \
patch-Install_make.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libraster_gdal_c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vector_v.in.pdal_Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libraster_gdal_c.diff
</span>
configure.ldflags-append -framework OpenCL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,10 +65,8 @@ configure.args-append \
</span> --with-tiff-libs=${prefix}/lib \
--with-png-includes=${prefix}/include \
--with-png-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-geos \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-geos-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-geos-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-liblas-includes=${prefix}/include/liblas\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-geos=${prefix}/bin/geos-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-liblas-includes=${prefix}/include/liblas \
</span> --with-liblas-libs=${prefix}/lib \
--without-postgres \
--with-pthread \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,7 +110,7 @@ post-patch {
</span> fs-traverse f ${worksrcpath} {
if {[file extension ${f}] eq ".py"} {
reinplace -q "s|/usr/bin/env python3|${pybin}|" ${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
reinplace "s|PYVER.*|PYVER = ${pyversion}|" ${worksrcpath}/macosx/Makefile
reinplace "s|^PYTHON.*|PYTHON = ${pybin}|" ${worksrcpath}/include/Make/Platform.make.in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,11 +246,10 @@ post-configure {
</span> file copy ${prefix}/include/cpl_port.h ${worksrcpath}/lib/python/ctypes
reinplace -E "s|#include <x86intrin.h>|/* #include <x86intrin.h> */|" \
${worksrcpath}/lib/python/ctypes/cpl_port.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|\\\$\\\(CPPFLAGS)|-I${worksrcpath}/lib/python/ctypes \$(CPPFLAGS)\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \\\\\"-DLL=\\\\\" \\\\\"-Drestrict=\\\\\" \\\\\"-D__attribute__(x)=\\\\\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \\\\\"-D_Nullable=\\\\\" \\\\\"-D_Nonnull=\\\\\" \\\\\"-D__compar=\\\\\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \\\\\"-Dint8_t=char\\\\\" \\\\\"-DCF_INLINE=\\\\\" \\\\\"-Duint16_t=short\\\\\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lib/python/ctypes/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|\\\$\\\(CPPFLAGS)|-I${worksrcpath}/lib/python/ctypes \$(CPPFLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \\\\\"-Drestrict=\\\\\" \\\\\"-D__attribute__(x)=\\\\\" \\\\\"-D_Nonnull=\\\\\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \\\\\"-Dint8_t=char\\\\\" \\\\\"-DCF_INLINE=\\\\\" \\\\\"-D_Null_unspecified=\\\\\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \\\\\"-D__DARWIN_OS_INLINE=\\\\\"|" ${worksrcpath}/lib/python/ctypes/Makefile
</span> }
pre-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/files/patch-Install_make.diff b/gis/grass7/files/patch-Install_make.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 131ecf7..399175e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/files/patch-Install_make.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/files/patch-Install_make.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/Make/Install.make.orig 2015-11-22 10:40:39.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/Make/Install.make 2015-11-22 10:40:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/Make/Install.make.orig 2020-04-27 11:15:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/Make/Install.make 2020-04-27 10:57:13.000000000 +0200
</span> @@ -54,7 +54,7 @@
while [ ! -d "$$INST_PATH" ]; do \
INST_PATH=`dirname $$INST_PATH`; \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,15 +9,6 @@
</span> echo "ERROR: Directory $$INST_PATH is a parent directory of your" >&2 ; \
echo " install directory $(INST_DIR) and is not writable." >&2 ; \
echo " Perhaps you need root access." >&2 ; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-check-writable:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @ if [ -d "$(INST_DIR)" -a ! -w "$(INST_DIR)" ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @ if [ -d "$(DESTDIR)$(INST_DIR)" -a ! -w "$(DESTDIR)$(INST_DIR)" ] ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "ERROR: Your install directory $(INST_DIR) is not writable." >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Perhaps you need root access." >&2 ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Installation aborted, exiting Make." >&2 ; \
</span> @@ -71,7 +71,7 @@
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +18,7 @@
</span> if [ "$$result" = "" ] ; then \
echo "WARNING: Your install directory $(INST_DIR)" >&2 ; \
echo " does not contain the word 'grass'." >&2 ; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,53 +96,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,52 +96,52 @@
</span> PLATMAKE = include/Make/Platform.make
GRASSMAKE = include/Make/Grass.make
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,9 +46,7 @@
</span> + -rm $(DESTDIR)$(INST_DIR)/$(GRASSMAKE)
$(MAKE) $(INST_DIR)/$(GRASSMAKE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- -$(INSTALL) config.status $(INST_DIR)/config.status
</span> - -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -$(INSTALL) config.status $(DESTDIR)$(INST_DIR)/config.status
</span> + -$(CHMOD) -R a+rX $(DESTDIR)$(INST_DIR) 2>/dev/null
ifneq ($(findstring darwin,$(ARCH)),)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/files/vector_v.in.pdal_Makefile.diff b/gis/grass7/files/vector_v.in.pdal_Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 18f3fc5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/files/vector_v.in.pdal_Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vector/v.in.pdal/Makefile.orig 2019-04-13 12:20:09.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vector/v.in.pdal/Makefile 2019-04-13 12:20:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,9 +6,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPENDENCIES = $(GPROJDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_INC = $(VECT_INC) $(PROJINC) $(PDALINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--EXTRA_CFLAGS = $(VECT_CFLAGS) $(PDALCPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EXTRA_CFLAGS = $(VECT_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include $(MODULE_TOPDIR)/include/Make/Module.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJDIR)/main.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINK = $(CXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>