Ignore:
Timestamp:
Apr 13, 2016, 11:29:29 PM (4 years ago)
Author:
khindenburg@…
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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/gmic/files/patch-Makefile.diff

    r89303 r147739  
    1 --- Makefile.orig       2011-12-29 07:32:38.000000000 -0600
    2 +++ Makefile    2012-01-02 18:17:09.000000000 -0600
    3 @@ -51,13 +51,8 @@
    4  ifeq ($(OS),GNU/kFreeBSD)
    5  OS = Linux
     1--- Makefile    2016-03-25 05:58:15.000000000 -0400
     2+++ Makefile    2016-04-13 12:26:19.000000000 -0400
     3@@ -88,12 +88,7 @@
    64 endif
    7 -ifeq ($(OS),Darwin)
     5 
     6 ifeq ($(OS),Darwin)
    87-PLUGINDIR = ~/Library/Application\ Support/Gimp/plug-ins
     8-ifeq (,$(wildcard /opt/local))
     9-USR = /usr/local
     10-else
    911-USR = /opt/local
    10 -else
    11  PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
    12  USR = /usr
    1312-endif
    14  ifeq ($(OS),MINGW32_NT-5.1)
    15  EXE = .exe
     13+USR = @PREFIX@
     14 WGET = curl -k -L --silent -o
    1615 endif
    17 @@ -110,12 +105,12 @@
    1816 
    19  # Flags to enable image display, using X11
     17@@ -176,8 +171,8 @@
    2018 # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
    21 -X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
    22 -X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
    23 +X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I$(USR)/include #-Dcimg_use_xrandr
    24 +X11_LDFLAGS = -L$(USR)/lib -lX11 -lpthread #-lXrandr
    25  
     19 # This requires the presence of the X11 include and library files.
     20 ifneq ($(OS),Darwin)
     21-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr
     22-X11_LIBS = `pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
     23+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I$(USR)/include` #-Dcimg_use_xrandr
     24+X11_LIBS = `pkg-config --libs x11 || echo -L$(USR)/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
     25 else
     26 ifeq (,$(wildcard /usr/X11R6))
     27 X11_CFLAGS = -Dcimg_display=0 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
     28@@ -190,7 +185,7 @@
    2629 # Flags to enable fast display, using XShm.
    27  XSHM_CFLAGS = -Dcimg_use_xshm
    28 -XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
    29 +XSHM_LDFLAGS = -L$(USR)/lib -lXext
     30 # This requires the presence of the X11 extension include and library files.
     31 XSHM_CFLAGS = -Dcimg_use_xshm `pkg-config --cflags xcb-shm`
     32-XSHM_LIBS = `pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib -lXext`
     33+XSHM_LIBS = `pkg-config --libs xcb-shm || echo -L$(USR)/lib -lXext`
    3034 
    3135 # Flags to enable image display, using GDI32.
    32  GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
    33 @@ -364,8 +359,7 @@
     36 # This requires the presence of the GDI32 include and library files (Windows only).
     37@@ -386,7 +381,7 @@
     38        @echo "**"
     39        @echo "** Start building G'MIC with default MacOSX configuration."
     40        @echo "**"
     41-       $(MAKE) cli gimp lib libc zart
     42+       $(MAKE) cli gimp lib libc
     43 else
     44        @echo "**"
     45        @echo "** Start building G'MIC with default Windows configuration."
     46@@ -605,8 +600,7 @@
    3447        mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
    3548        cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
    3649        cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
    37 -       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
    38 -       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
    39 +       mkdir -p $(DESTDIR)$(USR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic
     50-       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
     51-       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
     52+       mkdir -p $(DESTDIR)$(USR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)$(USR)/etc/bash_completion.d/gmic
    4053 
    4154 uninstall:
    42         rm -f $(DESTDIR)$(USR)/bin/gmic
     55        rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
Note: See TracChangeset for help on using the changeset viewer.