<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/18fd229516a46e7272003acbe555735b2a902db7">https://github.com/macports/macports-ports/commit/18fd229516a46e7272003acbe555735b2a902db7</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 18fd229 routino: update to 3.3.2
</span>18fd229 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 18fd229516a46e7272003acbe555735b2a902db7
</span>Author: Nikolay Korotkiy <sikmir@gmail.com>
AuthorDate: Mon Feb 10 11:24:02 2020 +0300
<span style='display:block; white-space:pre;color:#404040;'> routino: update to 3.3.2
</span>---
gis/routino/Portfile | 11 +--
gis/routino/files/patch-Makefile_conf.diff | 46 ++++++++----
.../files/patch-src_Makefile_dylib_extension.diff | 83 ++++++++++++++--------
3 files changed, 91 insertions(+), 49 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/routino/Portfile b/gis/routino/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3666359..8f75783 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/routino/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/routino/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name routino
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories gis
platforms darwin
maintainers web.de:framic5 openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +22,9 @@ license GPL-3
</span> master_sites http://routino.org/download/
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ea9f8a1fd5f728f6f2a5382543be29ba1b2f1e00 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 376512ef9627ce5c12e8c7a98dba7fe5125acfb89a9f9ee6758fbe36b5cf942f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d72b47a3742ca9647a2e983b3da00389ee3e536e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4b7174d76955e058986d343635e0a184385f2756fa4ffc02eb5e2399921e9db1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2542029
</span>
patchfiles patch-Makefile_conf.diff \
patch-src_Makefile_dylib_extension.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +32,7 @@ patchfiles patch-Makefile_conf.diff \
</span> depends_lib port:libzip \
port:bzip2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build yes
</span> use_configure no
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/routino/files/patch-Makefile_conf.diff b/gis/routino/files/patch-Makefile_conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 17f471a..13992f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/routino/files/patch-Makefile_conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/routino/files/patch-Makefile_conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +1,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.conf 2015-09-07 14:11:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.conf 2016-10-16 10:43:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.conf.orig 2020-02-10 10:28:33.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.conf 2020-02-10 11:00:12.000000000 +0300
</span> @@ -45,11 +45,11 @@
# Installation locations (edit if required)
ifneq ($(HOST),MINGW)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--prefix=/usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+prefix=@PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindir=$(prefix)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incdir=$(prefix)/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdir=$(prefix)/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--docdir=$(prefix)/doc/routino
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+docdir=$(prefix)/share/doc/routino
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- datadir=$(prefix)/share/routino
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prefix=/usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prefix=@PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bindir=$(prefix)/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incdir=$(prefix)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libdir=$(prefix)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- docdir=$(prefix)/doc/routino
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ docdir=$(prefix)/share/doc/routino
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datadir=$(prefix)/share/routino
</span> else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix="c:/Program Files/Routino"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,12 +62,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix="c:/Program Files/Routino"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,9 +69,9 @@
</span>
# Compilation programs
-CC=gcc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX=g++
</span> -LD=gcc
+#CC=gcc
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#CXX=g++
</span> +#LD=gcc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef CLANG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(CLANG),1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-lm
</span>
# Language dialect selection
-CFLAGS=-std=c99
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,18 +36,28 @@
</span>
# Warning options
CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +89,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,7 +123,7 @@
</span>
# Extra flags for compiling libroutino shared library (visibility of symbols, shared)
CFLAGS_LIB=-fvisibility=hidden
-LDFLAGS_LIB=-shared
+LDFLAGS_LIB=-dynamiclib -install_name @PREFIX@/lib/$@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(HOST),UNIX)
</span> # Extra flags for compiling libroutino shared library (position independent code)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,7 +98,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(HOST),UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,13 +132,13 @@
</span> endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra flags for compiling libroutino shared library (SONAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(HOST),UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS_SONAME=-Wl,-soname=libroutino.so.$(SOVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS_SLIM_SONAME=-Wl,-soname=libroutino-slim.so.$(SOVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifeq ($(HOST),UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LDFLAGS_SONAME=-Wl,-soname=libroutino.so.$(SOVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LDFLAGS_SLIM_SONAME=-Wl,-soname=libroutino-slim.so.$(SOVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Put the current directory in the shared library path for the router using libroutino
-LDFLAGS_LDSO=-Wl,-R.
+LDFLAGS_LDSO=-Wl,-rpath,.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/routino/files/patch-src_Makefile_dylib_extension.diff b/gis/routino/files/patch-src_Makefile_dylib_extension.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 39439cd..69eef1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/routino/files/patch-src_Makefile_dylib_extension.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/routino/files/patch-src_Makefile_dylib_extension.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +1,67 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2015-10-09 23:19:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2015-10-09 23:18:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2020-02-10 10:32:14.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2020-02-10 11:19:52.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,9 +38,7 @@
</span> router+lib$(.EXE) router+lib-slim$(.EXE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--LIB=libroutino.so libroutino-slim.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIB=libroutino.dylib libroutino-slim.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(HOST),MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB =libroutino.so libroutino-slim.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB+=libroutino.so.$(SOVERSION) libroutino-slim.so.$(SOVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIB =libroutino.dylib libroutino-slim.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB =routino.dll routino-slim.dll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB+=routino.def routino-slim.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,8 +48,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INC=routino.h
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(HOST),MINGW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB+=routino.dll routino-slim.dll
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,10 +172,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ROUTER_LIB_OBJ=router+lib.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
</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;'>-@@ -190,7 +190,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBROUTINO_OBJ+=mman-win32.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(HOST),MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LINK_LIB=libroutino.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LINK_SLIM_LIB=libroutino-slim.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LINK_LIB=libroutino.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LINK_SLIM_LIB=libroutino-slim.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINK_LIB=routino.dll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINK_SLIM_LIB=routino-slim.dll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,15 +204,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBROUTINO_OBJ+=mman-win32.o
</span> endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--libroutino.so : $(LIBROUTINO_OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libroutino.so.$(LIBVERSION) : $(LIBROUTINO_OBJ)
</span> +libroutino.dylib : $(LIBROUTINO_OBJ)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) $(LDFLAGS_SONAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libroutino.so.$(SOVERSION) : libroutino.so.$(LIBVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ln -sf $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libroutino.so : libroutino.so.$(LIBVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ln -sf $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ routino.dll : $(LIBROUTINO_OBJ)
</span> $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- routino.dll : libroutino.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,7 +214,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBROUTINO_SLIM_OBJ+=mman-win32.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,15 +228,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBROUTINO_SLIM_OBJ+=mman-win32.o
</span> endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--libroutino-slim.so : $(LIBROUTINO_SLIM_OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libroutino-slim.so.$(LIBVERSION) : $(LIBROUTINO_SLIM_OBJ)
</span> +libroutino-slim.dylib : $(LIBROUTINO_SLIM_OBJ)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) $(LDFLAGS_SLIM_SONAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libroutino-slim.so.$(SOVERSION) : libroutino-slim.so.$(LIBVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ln -sf $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libroutino-slim.so : libroutino-slim.so.$(LIBVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ln -sf $< $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ routino-slim.dll : $(LIBROUTINO_SLIM_OBJ)
</span> $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- routino-slim.dll : libroutino-slim.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,7 +285,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @for file in $(LIB); do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -f $$file ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo cp $$file $(DESTDIR)$(libdir) ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp -df $$file $(DESTDIR)$(libdir) ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp -f $$file $(DESTDIR)$(libdir) ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>