<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[147739] trunk/dports/science/gmic</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/147739">147739</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2016-04-13 16:29:29 -0700 (Wed, 13 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gmic: update to 1.7.0 #33008
Testing: the plugin and command line appear to work as the previous
versions. Disable new Qt GUI zart for now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegmicPortfile">trunk/dports/science/gmic/Portfile</a></li>
<li><a href="#trunkdportssciencegmicfilespatchMakefilediff">trunk/dports/science/gmic/files/patch-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegmicPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gmic/Portfile (147738 => 147739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gmic/Portfile 2016-04-13 19:25:10 UTC (rev 147738)
+++ trunk/dports/science/gmic/Portfile 2016-04-13 23:29:29 UTC (rev 147739)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gmic
</span><del>-version 1.5.0.8
-revision 6
</del><ins>+version 1.7.0
</ins><span class="cx"> license CeCILL
</span><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -23,15 +22,15 @@
</span><span class="cx"> has been designed with portability in mind and runs on \
</span><span class="cx"> different platforms (Windows, Unix, Mac OS X).
</span><span class="cx">
</span><del>-homepage http://gmic.sourceforge.net/
-master_sites sourceforge:project/gmic/old
</del><ins>+homepage http://gmic.eu
+master_sites http://gmic.eu/files/source/
</ins><span class="cx">
</span><span class="cx"> distfiles ${name}_${version}${extract.suffix}
</span><span class="cx">
</span><span class="cx"> worksrcdir ${worksrcdir}/src
</span><span class="cx">
</span><del>-checksums rmd160 99532589dab47f0e1b493e8b07853eac8543ae70 \
- sha256 ded93e9b45513359d51512d547237bedfbc3f26a2e042b62e8ac8b44d0e5f2aa
</del><ins>+checksums rmd160 fe208ee03f7b2d810fd77bd44d5714f13a1a5324 \
+ sha256 a114ca67c988a3be6eca847d2540fcc15dd98bcdaab00dba88bda2b5fdf249db
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -47,9 +46,14 @@
</span><span class="cx"> port:xorg-libXext \
</span><span class="cx"> port:gimp2
</span><span class="cx">
</span><ins>+# This also disables zart which requires qmake
</ins><span class="cx"> patchfiles patch-Makefile.diff \
</span><span class="cx"> libcxx.patch
</span><span class="cx">
</span><ins>+post-patch {
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile
+}
+
</ins><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="cx"> # opencv is not universal
</span><span class="lines">@@ -58,11 +62,15 @@
</span><span class="cx"> # build uses far more memory per job than MacPorts expects
</span><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><del>-build.args CC="${configure.cxx} [get_canonical_archflags]" \
</del><ins>+# There is one .c program that needs CC
+build.args-append CC="${configure.cc}" \
+ CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+ CXX=${configure.cxx} \
+ CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
+ CPP="${configure.cpp}" \
+ LDFLAGS="[get_canonical_archflags ld]" \
</ins><span class="cx"> IS_GCC=yes \
</span><del>- USR=${prefix} \
- OPT_CFLAGS=${configure.optflags}
</del><ins>+ OPT_CFLAGS="${configure.optflags}"
</ins><span class="cx">
</span><del>-destroot.args USR=${prefix}
-
-livecheck.regex /${name}_(\[0-9.\]+)${extract.suffix}
</del><ins>+livecheck.url http://gmic.eu/files/source/
+livecheck.regex ${name}_(\[0-9.\]+)${extract.suffix}
</ins></span></pre></div>
<a id="trunkdportssciencegmicfilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gmic/files/patch-Makefile.diff (147738 => 147739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gmic/files/patch-Makefile.diff 2016-04-13 19:25:10 UTC (rev 147738)
+++ trunk/dports/science/gmic/files/patch-Makefile.diff 2016-04-13 23:29:29 UTC (rev 147739)
</span><span class="lines">@@ -1,42 +1,55 @@
</span><del>---- Makefile.orig 2011-12-29 07:32:38.000000000 -0600
-+++ Makefile 2012-01-02 18:17:09.000000000 -0600
-@@ -51,13 +51,8 @@
- ifeq ($(OS),GNU/kFreeBSD)
- OS = Linux
</del><ins>+--- Makefile 2016-03-25 05:58:15.000000000 -0400
++++ Makefile 2016-04-13 12:26:19.000000000 -0400
+@@ -88,12 +88,7 @@
</ins><span class="cx"> endif
</span><del>--ifeq ($(OS),Darwin)
</del><ins>+
+ ifeq ($(OS),Darwin)
</ins><span class="cx"> -PLUGINDIR = ~/Library/Application\ Support/Gimp/plug-ins
</span><ins>+-ifeq (,$(wildcard /opt/local))
+-USR = /usr/local
+-else
</ins><span class="cx"> -USR = /opt/local
</span><del>--else
- PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
- USR = /usr
</del><span class="cx"> -endif
</span><del>- ifeq ($(OS),MINGW32_NT-5.1)
- EXE = .exe
</del><ins>++USR = @PREFIX@
+ WGET = curl -k -L --silent -o
</ins><span class="cx"> endif
</span><del>-@@ -110,12 +105,12 @@
</del><span class="cx">
</span><del>- # Flags to enable image display, using X11
</del><ins>+@@ -176,8 +171,8 @@
</ins><span class="cx"> # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
</span><del>--X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
--X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
-+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I$(USR)/include #-Dcimg_use_xrandr
-+X11_LDFLAGS = -L$(USR)/lib -lX11 -lpthread #-lXrandr
-
</del><ins>+ # This requires the presence of the X11 include and library files.
+ ifneq ($(OS),Darwin)
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr
+-X11_LIBS = `pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
++X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I$(USR)/include` #-Dcimg_use_xrandr
++X11_LIBS = `pkg-config --libs x11 || echo -L$(USR)/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
+ else
+ ifeq (,$(wildcard /usr/X11R6))
+ X11_CFLAGS = -Dcimg_display=0 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
+@@ -190,7 +185,7 @@
</ins><span class="cx"> # Flags to enable fast display, using XShm.
</span><del>- XSHM_CFLAGS = -Dcimg_use_xshm
--XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
-+XSHM_LDFLAGS = -L$(USR)/lib -lXext
</del><ins>+ # This requires the presence of the X11 extension include and library files.
+ XSHM_CFLAGS = -Dcimg_use_xshm `pkg-config --cflags xcb-shm`
+-XSHM_LIBS = `pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib -lXext`
++XSHM_LIBS = `pkg-config --libs xcb-shm || echo -L$(USR)/lib -lXext`
</ins><span class="cx">
</span><span class="cx"> # Flags to enable image display, using GDI32.
</span><del>- GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
-@@ -364,8 +359,7 @@
</del><ins>+ # This requires the presence of the GDI32 include and library files (Windows only).
+@@ -386,7 +381,7 @@
+ @echo "**"
+ @echo "** Start building G'MIC with default MacOSX configuration."
+ @echo "**"
+- $(MAKE) cli gimp lib libc zart
++ $(MAKE) cli gimp lib libc
+ else
+ @echo "**"
+ @echo "** Start building G'MIC with default Windows configuration."
+@@ -605,8 +600,7 @@
</ins><span class="cx"> mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
</span><span class="cx"> cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
</span><span class="cx"> cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
</span><del>-- if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
-- if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
-+ mkdir -p $(DESTDIR)$(USR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic
</del><ins>+- 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
+- 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
++ mkdir -p $(DESTDIR)$(USR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)$(USR)/etc/bash_completion.d/gmic
</ins><span class="cx">
</span><span class="cx"> uninstall:
</span><del>- rm -f $(DESTDIR)$(USR)/bin/gmic
</del><ins>+ rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
</ins></span></pre>
</div>
</div>
</body>
</html>