Ticket #32013: gmic-1.5.0.6.diff

File gmic-1.5.0.6.diff, 4.1 KB (added by ryandesign (Ryan Schmidt), 9 years ago)

proposed patch

  • files/patch-Makefile.diff

     
    1 --- Makefile.orig       2011-02-02 03:28:31.000000000 -0600
    2 +++ Makefile    2011-11-09 20:41:11.000000000 -0600
     1--- Makefile.orig       2011-11-04 06:09:46.000000000 -0500
     2+++ Makefile    2011-11-10 00:11:10.000000000 -0600
    33@@ -51,13 +51,8 @@
    44 ifeq ($(OS),GNU/kFreeBSD)
    55 OS = Linux
     
    88-PLUGINDIR = ~/Library/Application\ Support/Gimp/plug-ins
    99-USR = /opt/local
    1010-else
    11  PLUGINDIR=`gimptool-2.0 --gimpplugindir`/plug-ins
     11 PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
    1212 USR = /usr
    1313-endif
    1414 ifeq ($(OS),MINGW32_NT-5.1)
    1515 EXE = .exe
    1616 endif
    17 @@ -96,12 +91,12 @@
     17@@ -107,12 +102,12 @@
    1818 
    1919 # Flags to enable image display, using X11
    2020 # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
    21 -X11_CFLAGS = -Dcimg_display=1 -Dcimg_display_classname=\\\"G\'MIC\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
     21-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
    2222-X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
    23 +X11_CFLAGS = -Dcimg_display=1 -Dcimg_display_classname=\\\"G\'MIC\\\" -I$(USR)/include #-Dcimg_use_xrandr
     23+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I$(USR)/include #-Dcimg_use_xrandr
    2424+X11_LDFLAGS = -L$(USR)/lib -lX11 -lpthread #-lXrandr
    2525 
    2626 # Flags to enable fast display, using XShm.
     
    2929+XSHM_LDFLAGS = -L$(USR)/lib -lXext
    3030 
    3131 # Flags to enable image display, using GDI32.
    32  GDI32_CFLAGS = -Dcimg_display=2
    33 @@ -324,8 +319,7 @@
     32 GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
     33@@ -352,8 +347,7 @@
     34        mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
    3435        cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
    3536        cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
    36         mkdir -p $(DESTDIR)$(USR)/share/doc/gmic/html/img/
    3737-       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
    3838-       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)$(USR)/etc/bash_completion.d/gmic
    40         for pixmap in ../html/*.*; do \
    41           if test -f $$pixmap; then \
    42             cp -f  $$pixmap  $(DESTDIR)$(USR)/share/doc/gmic/html/; \
     39+       mkdir -p $(DESTDIR)$(USR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic
     40 
     41 uninstall:
     42        rm -f $(DESTDIR)$(USR)/bin/gmic
  • Portfile

     
    44PortSystem          1.0
    55
    66name                gmic
    7 version             1.4.8.0
     7version             1.5.0.6
    88license             CeCILL
    99categories          science
    1010platforms           darwin
     
    2323                    different platforms (Windows, Unix, Mac OS X).
    2424
    2525homepage            http://gmic.sourceforge.net/
    26 master_sites        sourceforge:project/gmic/old
     26master_sites        sourceforge:project/gmic
    2727
    2828distfiles           ${name}_${version}${extract.suffix}
    2929
    3030worksrcdir          ${worksrcdir}/src
    3131
    32 checksums           rmd160  f545c18c1a4ec2de982e9cffc5426abbbfd07221 \
    33                     sha256  0dc6fc61093380479288db7e9cb29dc11d19d017a9ed81c7bf382acc74bab91d
     32checksums           rmd160  dc994f0abb6110ee4aa98e0beb8ac1da49f1d716 \
     33                    sha256  6eb4370242637854f806bb8fb9b69781e2f75d066e795cad8b450b9ce5154c68
    3434
    3535depends_lib         port:opencv \
    3636                    path:lib/libavcodec.dylib:ffmpeg \
     
    5252# opencv is not universal
    5353universal_variant   no
    5454
     55# build uses far more memory per job than MacPorts expects
     56use_parallel_build  no
     57
    5558build.args          CC="${configure.cxx} [get_canonical_archflags]" \
    5659                    IS_GCC=yes \
    5760                    USR=${prefix}