[147739] trunk/dports/science/gmic

khindenburg at macports.org khindenburg at macports.org
Wed Apr 13 16:29:29 PDT 2016


Revision: 147739
          https://trac.macports.org/changeset/147739
Author:   khindenburg at macports.org
Date:     2016-04-13 16:29:29 -0700 (Wed, 13 Apr 2016)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/dports/science/gmic/Portfile
    trunk/dports/science/gmic/files/patch-Makefile.diff

Modified: trunk/dports/science/gmic/Portfile
===================================================================
--- 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)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                gmic
-version             1.5.0.8
-revision            6
+version             1.7.0
 license             CeCILL
 categories          science
 platforms           darwin
@@ -23,15 +22,15 @@
                     has been designed with portability in mind and runs on \
                     different platforms (Windows, Unix, Mac OS X).
 
-homepage            http://gmic.sourceforge.net/
-master_sites        sourceforge:project/gmic/old
+homepage            http://gmic.eu
+master_sites        http://gmic.eu/files/source/
 
 distfiles           ${name}_${version}${extract.suffix}
 
 worksrcdir          ${worksrcdir}/src
 
-checksums           rmd160  99532589dab47f0e1b493e8b07853eac8543ae70 \
-                    sha256  ded93e9b45513359d51512d547237bedfbc3f26a2e042b62e8ac8b44d0e5f2aa
+checksums           rmd160  fe208ee03f7b2d810fd77bd44d5714f13a1a5324 \
+                    sha256  a114ca67c988a3be6eca847d2540fcc15dd98bcdaab00dba88bda2b5fdf249db
 
 depends_build       port:pkgconfig
 
@@ -47,9 +46,14 @@
                     port:xorg-libXext \
                     port:gimp2
 
+# This also disables zart which requires qmake
 patchfiles          patch-Makefile.diff \
                     libcxx.patch
 
+post-patch {
+    reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile
+}
+
 use_configure       no
 
 # opencv is not universal
@@ -58,11 +62,15 @@
 # build uses far more memory per job than MacPorts expects
 use_parallel_build  no
 
-build.args          CC="${configure.cxx} [get_canonical_archflags]" \
+# 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]" \
                     IS_GCC=yes \
-                    USR=${prefix} \
-                    OPT_CFLAGS=${configure.optflags}
+                    OPT_CFLAGS="${configure.optflags}"
 
-destroot.args       USR=${prefix}
-
-livecheck.regex     /${name}_(\[0-9.\]+)${extract.suffix}
+livecheck.url       http://gmic.eu/files/source/
+livecheck.regex     ${name}_(\[0-9.\]+)${extract.suffix}

Modified: trunk/dports/science/gmic/files/patch-Makefile.diff
===================================================================
--- 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)
@@ -1,42 +1,55 @@
---- 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
+--- Makefile	2016-03-25 05:58:15.000000000 -0400
++++ Makefile	2016-04-13 12:26:19.000000000 -0400
+@@ -88,12 +88,7 @@
  endif
--ifeq ($(OS),Darwin)
+ 
+ ifeq ($(OS),Darwin)
 -PLUGINDIR = ~/Library/Application\ Support/Gimp/plug-ins
+-ifeq (,$(wildcard /opt/local))
+-USR = /usr/local
+-else
 -USR = /opt/local
--else
- PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
- USR = /usr
 -endif
- ifeq ($(OS),MINGW32_NT-5.1)
- EXE = .exe
++USR = @PREFIX@
+ WGET = curl -k -L --silent -o
  endif
-@@ -110,12 +105,12 @@
  
- # Flags to enable image display, using X11
+@@ -176,8 +171,8 @@
  # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
--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
- 
+ # 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 @@
  # Flags to enable fast display, using XShm.
- XSHM_CFLAGS = -Dcimg_use_xshm
--XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
-+XSHM_LDFLAGS = -L$(USR)/lib -lXext
+ # 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`
  
  # Flags to enable image display, using GDI32.
- GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
-@@ -364,8 +359,7 @@
+ # 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 @@
  	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
  	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
  	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
--	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
+-	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
  
  uninstall:
- 	rm -f $(DESTDIR)$(USR)/bin/gmic
+ 	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160413/fb0e7d85/attachment.html>


More information about the macports-changes mailing list