Upgrade to CImg 1.1.6.

Changelog at
<https://sourceforge.net/project/shownotes.php?release_id=449151>.

4 files changed, 19 insertions, 14 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index f8e61280c7fd..50aabbd50ad5 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cimg
-DISTVERSION=	1-15
+DISTVERSION=	1-16
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index e7cdd9374cbe..05a78783206c 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-MD5 (CImg-1-15.zip) = e76015a3c30bf59c7171846c4c24f77c
-SHA256 (CImg-1-15.zip) = db5e75d64cee640d1f825b4f1670b7c5bc6d6f58e548f8cfed2edbfccc93fc57
-SIZE (CImg-1-15.zip) = 3495302
+MD5 (CImg-1-16.zip) = 2da106df51c5e5052ccbc3830c79bae8
+SHA256 (CImg-1-16.zip) = 7236aa9dba702983bf5ba52e6c7743b50bc8f998c8100520e3ffb08c314917b4
+SIZE (CImg-1-16.zip) = 3601071
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index f745d27d3a82..4e72f92ea65d 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,21 +1,21 @@
---- examples/Makefile.orig	Wed Jul 19 09:41:26 2006
-+++ examples/Makefile	Wed Jul 19 14:31:27 2006
-@@ -7,10 +7,10 @@
- # -----------------------------------------------------------------------------------
+--- examples/Makefile.orig	Thu Sep 21 15:25:22 2006
++++ examples/Makefile	Thu Sep 21 20:34:29 2006
+@@ -8,10 +8,10 @@
  
  # Set correct variables and paths
+ CIMGVER = 1.16
 -CC      = g++
 -X11PATH = /usr/X11R6
 -CFLAGS  = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
--LDFLAGS = -lm
+-LDFLAGS = -L$(X11PATH)/lib -lm -lpthread -lX11
 +CC      = $(CXX)
 +#X11PATH = /usr/X11R6
 +#CFLAGS  = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
-+#LDFLAGS = -lm
- CIMGVER = 1.15
++#LDFLAGS = -L$(X11PATH)/lib -lm -lpthread -lX11
  
- CIMGFILES = CImg_demo \
-@@ -38,7 +38,7 @@
+ # Uncomment to enable fast image display, using the XSHM library.
+ XSHM_FLAGS = -Dcimg_use_xshm -lXext 
+@@ -59,7 +59,7 @@
  	@echo
  	@echo "** Compiling '$* ($(CIMGVER))' with '`$(CC) -v 2>&1 | grep version`'"
  	@echo
@@ -24,7 +24,7 @@
  menu:
  	@echo
  	@echo "CImg Library $(CIMGVER) : Examples"
-@@ -63,7 +63,7 @@
+@@ -84,7 +84,7 @@
  all: $(CIMGFILES)
  
  clean:
diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist
index 925c82cc599c..2946f898ec65 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -27,6 +27,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_bubble.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_bump.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_demomenu.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_dtmri.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_hough.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_imgfade.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_landscape.jpg
@@ -53,6 +54,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000018.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000019.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000020.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000021.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_odykill.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_optflow.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_paint.jpg
@@ -90,6 +92,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x72.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x73.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x74.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x75.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x76.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x78.html
@@ -115,6 +118,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x72.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x73.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x74.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x75.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x76.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x78.html
@@ -160,6 +164,7 @@ include/CImg.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.m
+%%PORTDOCS%%%%EXAMPLESDIR%%/dtmri_view.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/fade_images.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration4integration.cpp