<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9477e97a5730b394c457c5fcfdecaef0a6440649">https://github.com/macports/macports-ports/commit/9477e97a5730b394c457c5fcfdecaef0a6440649</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 9477e97 grafx2: update to 2.7
</span>9477e97 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9477e97a5730b394c457c5fcfdecaef0a6440649
</span>Author: Thomas BERNARD <miniupnp@free.fr>
AuthorDate: Sat Feb 1 17:50:25 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> grafx2: update to 2.7
</span>---
graphics/grafx2/Portfile | 41 +++++++++-------------
.../grafx2/files/patch-osx-tiger_Makefile-b.diff | 18 ++++++++++
.../grafx2/files/patch-osx-tiger_Makefile.diff | 39 ++++++++++++++++++++
.../grafx2/files/patch-osx-tiger_realpath.c.diff | 37 +++++++++++++++++++
4 files changed, 111 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/grafx2/Portfile b/graphics/grafx2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1bcc1e..7fdbd07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/grafx2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/grafx2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,12 @@
</span> PortSystem 1.0
name grafx2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.7
</span> # upstream doesn't tag "bugfixes" releases, but uses a commit count :
# tag v2.6 was v2.6.2475
# commit 75579a9 is v2.6.2490
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set commit 75579a9456115f8475b0a0c8ecf23fe17599eeae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set recoil_version 4.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set commit_count 2945
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jobid 422881812
</span> categories graphics
maintainers {@miniupnp free.fr:miniupnp} openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,24 +22,17 @@ long_description GrafX2 is a bitmap paint program inspired by the Amiga progr
</span> any detailed graphics painted with a mouse.
homepage http://grafx2.chez.com/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname grafX2-${commit}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://gitlab.com/GrafX2/grafX2/-/archive/${commit}/::gfx2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceforge:project/recoil/recoil/${recoil_version}:recoil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only ${distname}.tar.bz2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${distname}.tar.bz2:gfx2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- recoil-${recoil_version}.tar.gz:recoil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distname}.tar.bz2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d8172bf1a14ef0c227f4f6441539140f7eab7cba89f7141ef89cda78d44cbc13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d0b18f27e94c73974eff4e4badadc640277d4ac7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1090351 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- recoil-${recoil_version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1ab1859c5a0f0836a26c351567bb70107c3e0462 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8f64fd21bafa180e6cbac5853ef65453f080385b3c53600af8360e938668e574 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 448212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.com/GrafX2/grafX2/-/jobs/422881812/artifacts/raw/grafx2-2.7.2945-src.tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname grafx2-${version}.${commit_count}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://gitlab.com/GrafX2/grafX2/-/jobs/${jobid}/artifacts/raw/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${distname}.tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}.tgz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b176fd051ec9256d4b3d06a4c93d7470f01ad78838983a2def7dddcd5340d4f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e93cb37ac32ff8a1f49373176523e44a1ee055ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1101545
</span> fetch.ignore_sslcert yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir grafX2-${commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir grafx2/src
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,10 +46,11 @@ depends_lib port:libsdl \
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-osx-tiger_realpath.c.diff patch-osx-tiger_Makefile.diff patch-osx-tiger_Makefile-b.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${worksrcpath}/3rdparty/archives
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${distpath}/recoil-${recoil_version}.tar.gz ${worksrcpath}/3rdparty/archives
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'const char SVN_revision\[\]=\"macports_${revision}\";' > ${worksrcpath}/src/version.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'const char SVN_revision\[\]=\"macports_${revision}\";' > ${worksrcpath}/version.c"
</span> }
build.args-append CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,5 +80,5 @@ if {${os.platform} eq "darwin" && ${os.major} >= 11} {
</span>
destroot {
xinstall -d ${destroot}${applications_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/src/Grafx2.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/Grafx2.app ${destroot}${applications_dir}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/grafx2/files/patch-osx-tiger_Makefile-b.diff b/graphics/grafx2/files/patch-osx-tiger_Makefile-b.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1df9c0d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/grafx2/files/patch-osx-tiger_Makefile-b.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 6ffe275dea0f4b86ee347e3dec42706ddb8f5a73
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas BERNARD <miniupnp@free.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon Feb 10 23:19:10 2020 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix fbuild for OSX with OSX_STATIC=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/Makefile b/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7c7774f9..8a3ca5d6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -245,6 +245,7 @@ ifneq ($(SDLCONFIG), )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TTFLOPT += $(shell $(PKG_CONFIG) --variable=libdir SDL_ttf)/libSDL_ttf.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDLLOPT = $(shell $(SDLCONFIG) --libs) $(shell $(PKG_CONFIG) --libs SDL_image)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TTFLOPT = $(shell $(PKG_CONFIG) --libs SDL_ttf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these are for use with Mac OS X native frameworks
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/grafx2/files/patch-osx-tiger_Makefile.diff b/graphics/grafx2/files/patch-osx-tiger_Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..40cd21d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/grafx2/files/patch-osx-tiger_Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 424a1df1fd52eceaf22d3f3131c16031cbdb39b9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas BERNARD <miniupnp@free.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon Feb 10 10:11:10 2020 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile: custom "which" function to work arond OS X 10.4 which command limitations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/Makefile b/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 373f4d24..7c7774f9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # along with Grafx2; if not, see <http://www.gnu.org/licenses/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# custom which function that takes 2 arguments to work around "which" commands
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# that do not return FALSE (OS X 10.4). Usage : $(call which,arg1,arg2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++which = $(shell P=`which "$(1)"` ; if [ "$$?" = "0" ] && [ -x "$$P" ]; then echo "$$P" ; else which "$(2)" ; fi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make V=1 to enable verbose building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ V ?= 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,7 +230,7 @@ ifneq ($(PKG_CONFIG_PATH), )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(API),sdl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SDLCONFIG := $(shell which ../3rdparty/usr/bin/sdl-config || which sdl-config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SDLCONFIG := $(call which,../3rdparty/usr/bin/sdl-config,sdl-config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(SDLCONFIG), )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these are for use with macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDLCOPT = $(shell $(SDLCONFIG) --cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -304,7 +308,7 @@ ifdef MACOSX_LION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOPT = $(SDLLOPT) $(LUALOPT) -framework libpng14 -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOPT = $(SDLLOPT) $(LUALOPT) $(TTFLOPT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBPNGCONFIG := $(shell which ../3rdparty/usr/bin/libpng-config || which libpng-config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBPNGCONFIG := $(call which,../3rdparty/usr/bin/libpng-config,libpng-config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(LIBPNGCONFIG), )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COPT += $(shell $(LIBPNGCONFIG) --cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(OSX_STATIC), 1)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/grafx2/files/patch-osx-tiger_realpath.c.diff b/graphics/grafx2/files/patch-osx-tiger_realpath.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e28d51f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/grafx2/files/patch-osx-tiger_realpath.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit a0134ccf979154d120c01c95f477bd1b351c4bf3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Thomas BERNARD <miniupnp@free.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun Feb 9 20:37:22 2020 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ realpath() don't accept NULL 2nd arg with OS X < 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/realpath.c b/src/realpath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 256ad6ca..2c3e4165 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/realpath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/realpath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <limits.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "gfx2mem.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__AROS__) || defined(__BEOS__) || defined(__MORPHOS__) || defined(__GP2X__) || defined(__WIZ__) || defined(__CAANOO__) || defined(__amigaos__) || defined(__SWITCH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // These platforms don't have realpath().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // We use the following implementation, found in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,6 +139,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// So we assume all platforms now support passing NULL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// If you find a platform where this is not the case,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// please add a new implementation with ifdef's.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // realpath() accept NULL as 2nd argument since OSX 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (resolved_path == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ resolved_path = GFX2_malloc(PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (resolved_path == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return realpath(_path, resolved_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>