<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e42b396a83af76eaf3f7cb9ba36ec44f18137fd1">https://github.com/macports/macports-ports/commit/e42b396a83af76eaf3f7cb9ba36ec44f18137fd1</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 e42b396 gmic: update version 1.7.3->1.7.9.1
</span>e42b396 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e42b396a83af76eaf3f7cb9ba36ec44f18137fd1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jan 16 10:11:58 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmic: update version 1.7.3->1.7.9.1
</span>---
science/gmic/Portfile | 40 ++++++-------------------
science/gmic/files/libcxx.patch | 10 -------
science/gmic/files/patch-Makefile.diff | 55 ----------------------------------
3 files changed, 9 insertions(+), 96 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/Portfile b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba24927..8d44648 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.0
</span>
name gmic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.7.9.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> license CeCILL
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,12 +26,14 @@ long_description G'MIC stands for GREYC's Magic Image Converter. It is \
</span> homepage http://gmic.eu
master_sites http://gmic.eu/files/source/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> distfiles ${name}_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${worksrcdir}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}-[join [lrange [split ${version} .] 0 2] .]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 165f6ebbf01333121c0336092b402ba377d1f04e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 32975672ac3ebd8d78db6d49531720497de6cb83c7d44a92c7b6cc959cf95025
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6f0f9a36f66db044a28cae654996883cad8ec7fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 152f100eb139a5f6e5b3d1e43aaed34f2b3786f72f52724ebde5e5ccea2c7133
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,33 +47,8 @@ depends_lib path:lib/libavcodec.dylib:ffmpeg \
</span> port:ilmbase \
port:fftw-3 \
port:xorg-libXext \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:opencv \
</span> port:gimp2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This also disables zart which requires qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libcxx.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile
</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;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# opencv is not universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# build uses far more memory per job than MacPorts expects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# There is one .c program that needs CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP="${configure.cpp}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="[get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IS_GCC=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT_CFLAGS="${configure.optflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.url http://gmic.eu/files/source/
livecheck.regex ${name}_(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/libcxx.patch b/science/gmic/files/libcxx.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f9aca53..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/libcxx.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmic.h.orig 2013-08-29 16:59:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmic.h 2013-08-29 17:00:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,6 +45,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <clocale>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <locale>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef gmic_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define gmic_version 1508
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-Makefile.diff b/science/gmic/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5fe2460..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/patch-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,55 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile 2016-03-25 05:58:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2016-04-13 12:26:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,12 +88,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PLUGINDIR = ~/Library/Application\ Support/Gimp/plug-ins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq (,$(wildcard /opt/local))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--USR = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--USR = /opt/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+USR = @PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WGET = curl -k -L --silent -o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,8 +171,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This requires the presence of the X11 include and library files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--X11_LIBS = `pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I$(USR)/include` #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+X11_LIBS = `pkg-config --libs x11 || echo -L$(USR)/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq (,$(wildcard /usr/X11R6))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X11_CFLAGS = -Dcimg_display=0 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -190,7 +185,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Flags to enable fast display, using XShm.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This requires the presence of the X11 extension include and library files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XSHM_CFLAGS = -Dcimg_use_xshm `pkg-config --cflags xcb-shm`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--XSHM_LIBS = `pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib -lXext`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+XSHM_LIBS = `pkg-config --libs xcb-shm || echo -L$(USR)/lib -lXext`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Flags to enable image display, using GDI32.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This requires the presence of the GDI32 include and library files (Windows only).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -386,7 +381,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "**"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Start building G'MIC with default MacOSX configuration."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "**"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MAKE) cli gimp lib libc zart
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE) cli gimp lib libc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "**"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "** Start building G'MIC with default Windows configuration."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -605,8 +600,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p $(DESTDIR)$(USR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)$(USR)/etc/bash_completion.d/gmic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uninstall:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
</span></pre><pre style='margin:0'>
</pre>