Upgrade to 1.2.6.

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

4 files changed, 14 insertions, 14 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 4c61f3e43b1c..fbfb609b1bd4 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cimg
-PORTVERSION=	1.2.5
+PORTVERSION=	1.2.6
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index 3cf1137df829..9bf7298834f9 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-MD5 (cimg-1.2.5,1/CImg-1.2.5.zip) = 1fb2e897744b388a80889dbb13b04ccc
-SHA256 (cimg-1.2.5,1/CImg-1.2.5.zip) = 6acc48a00fae950e66ab74219a6e348e58d88374192704303bcd78bacd5634ea
-SIZE (cimg-1.2.5,1/CImg-1.2.5.zip) = 4899336
+MD5 (cimg-1.2.6,1/CImg-1.2.6.zip) = 1b0906a9412fcaa03d37911ad98e8dbe
+SHA256 (cimg-1.2.6,1/CImg-1.2.6.zip) = c8deaf99683cd5eb44d109257e380aba0a105cbc012d7a2299769a21a69b27e5
+SIZE (cimg-1.2.6,1/CImg-1.2.6.zip) = 5180807
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index 3c30e23d008d..c289d1d38273 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,15 +1,13 @@
---- ./examples/Makefile.orig	2007-11-27 14:35:39.000000000 +0100
-+++ ./examples/Makefile	2007-11-27 21:34:26.000000000 +0100
-@@ -40,11 +40,11 @@
- #---------------------------------
+--- ./examples/Makefile.orig	2008-01-04 11:24:33.000000000 +0100
++++ ./examples/Makefile	2008-01-04 23:22:20.000000000 +0100
+@@ -42,10 +42,10 @@
  # Set correct variables and paths
  #---------------------------------
--CIMG_VERSION = 1.24
+ CIMG_VERSION = 1.26
 -CC           = g++
 -X11PATH      = /usr/X11R6
 -CFLAGS       = -Wall -W -ansi -pedantic -ffast-math
 -LDFLAGS      = -lm -lpthread
-+CIMG_VERSION = 1.25
 +CC           = $(CXX)
 +#X11PATH      = /usr/X11R6
 +#CFLAGS       = -Wall -W -ansi -pedantic -ffast-math
@@ -17,7 +15,7 @@
  
  #--------------------------------------------------
  # Set compilation flags allowing to customize CImg
-@@ -79,7 +79,7 @@
+@@ -80,7 +80,7 @@
  CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
  
  # Flags to enable the use of LAPACK routines for matrix computation
@@ -26,7 +24,7 @@
  
  # Flags to enable the use of the Board library
  CIMG_BOARD_FLAGS = -Dcimg_use_board -lboard
-@@ -87,6 +87,9 @@
+@@ -88,6 +88,9 @@
  # Flags to compile on Solaris
  CIMG_SOLARIS_FLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
  
@@ -36,7 +34,7 @@
  # Set default compilation flags.
  # Uncomment lines here, if you want to customize your default configuration
  CIMG_DEFAULT_FLAGS = $(CIMG_X11_FLAGS) \
-@@ -143,7 +146,7 @@
+@@ -144,7 +147,7 @@
  all: $(CIMG_FILES)
  
  clean:
@@ -45,7 +43,7 @@
  
  greycstoration4gimp: greycstoration4gimp.cpp
  	@echo
-@@ -163,6 +166,12 @@
+@@ -164,6 +167,12 @@
  Mlinux:
  	make "ARCHFLAGS=-O3 $(CIMG_ALL_FLAGS)" all jpeg_buffer greycstoration4gimp
  
diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist
index 22787048febe..33bfdcb4b113 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -30,6 +30,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard6.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/postcard7.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/project-support.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/screenshots_item.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_blobs.jpg
@@ -183,6 +184,7 @@ include/CImg.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/dtmri_view.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/edge_explorer.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/fade_images.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/generate_loop_macros.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration4gimp.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration4integration.cpp