Ticket #33008: gmic-1.5.0.9.diff

files/patch-Makefile.diff

@@ -1 @@
---- Makefile.orig       2011-12-29 07:32:38.000000000 -0600
-+++ Makefile    2012-01-02 18:17:09.000000000 -0600
+--- Makefile.orig       2012-01-20 07:27:10.000000000 -0600
++++ Makefile    2012-01-24 02:46:58.000000000 -0600
 @@ -51,13 +51,8 @@
  ifeq ($(OS),GNU/kFreeBSD)
  OS = Linux
@@ -14 +14 @@
  ifeq ($(OS),MINGW32_NT-5.1)
  EXE = .exe
  endif
-@@ -110,12 +105,12 @@
- 
- # Flags to enable image display, using X11
+@@ -111,14 +106,14 @@
  # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
+ # This requires the presence of the X11 include and library files.
+ # (package 'libx11-dev' on Debian).
 -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
  
  # Flags to enable fast display, using XShm.
+ # This requires the presence of the X11 extension include and library files.
+ # (package 'libx11-dev' on Debian).
  XSHM_CFLAGS = -Dcimg_use_xshm
 -XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
 +XSHM_LDFLAGS = -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.
+@@ -390,8 +385,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
++       mkdir -p $(DESTDIR)$(USR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)$(USR)/etc/bash_completion.d/gmic
  
  uninstall:
         rm -f $(DESTDIR)$(USR)/bin/gmic

Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                gmic
-version             1.5.0.8
+version             1.5.0.9
 license             CeCILL
 categories          science
 platforms           darwin
@@ -23 +23 @@
                     different platforms (Windows, Unix, Mac OS X).
 
 homepage            http://gmic.sourceforge.net/
-master_sites        sourceforge:project/gmic/old
+master_sites        sourceforge:project/gmic \
+                    sourceforge:project/gmic/old
 
 distfiles           ${name}_${version}${extract.suffix}
 
 worksrcdir          ${worksrcdir}/src
 
-checksums           rmd160  99532589dab47f0e1b493e8b07853eac8543ae70 \
-                    sha256  ded93e9b45513359d51512d547237bedfbc3f26a2e042b62e8ac8b44d0e5f2aa
+checksums           rmd160  fdd779ecbe0bc33060641dcfd6b1f5e1d3db3d26 \
+                    sha256  d647a64bd25bf4146d1c755aa2d26f129605e03b3072dca2dc2e6ec5e38ed3b0
 
 depends_build       port:pkgconfig