Upgrade to 1.2.2.

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

4 files changed, 15 insertions, 11 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index dcf126a1bfc8..cdcb8299afea 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cimg
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index ca4c8cb1438b..d48b19fd6d65 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-MD5 (cimg-1.2.1,1/CImg-1.2.1.zip) = 1ba7e00d25e2ceba623540508c47d764
-SHA256 (cimg-1.2.1,1/CImg-1.2.1.zip) = 8f68a55f91fb44befdba5951f977563fc445ce3605e656462430d3c46ef2b1d1
-SIZE (cimg-1.2.1,1/CImg-1.2.1.zip) = 4112434
+MD5 (cimg-1.2.2,1/CImg-1.2.2.zip) = 52b3ca16e6628bf978b66682301188bd
+SHA256 (cimg-1.2.2,1/CImg-1.2.2.zip) = 2c6ca6215420d3ba51910d88adcf9b715826ecd578153f74dfb25635ab09cbba
+SIZE (cimg-1.2.2,1/CImg-1.2.2.zip) = 4320056
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index 8b1ce52a89a4..f2190b6f7973 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,9 +1,9 @@
---- examples/Makefile.orig	Tue Jun 12 14:54:41 2007
-+++ examples/Makefile	Tue Jun 12 19:04:08 2007
-@@ -37,10 +37,10 @@
+--- examples/Makefile.orig	Wed Jul  4 13:23:28 2007
++++ examples/Makefile	Wed Jul  4 23:23:43 2007
+@@ -38,10 +38,10 @@
  # Set correct variables and paths
  #---------------------------------
- CIMG_VERSION = 1.21
+ CIMG_VERSION = 1.22
 -CC           = g++
 -X11PATH      = /usr/X11R6
 -CFLAGS       = -Wall -W -ansi -pedantic -ffast-math
@@ -15,7 +15,7 @@
  
  #--------------------------------------------------
  # Set compilation flags allowing to customize CImg
-@@ -76,6 +76,9 @@
+@@ -77,6 +77,9 @@
  # Flags to compile on Solaris
  CIMG_SOLARIS_FLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
  
@@ -25,7 +25,7 @@
  # Set default compilation flags.
  # Uncomment lines here, if you want to customize your default configuration
  CIMG_DEFAULT_FLAGS = $(CIMG_X11_FLAGS) \
-@@ -129,7 +132,7 @@
+@@ -130,7 +133,7 @@
  all: $(CIMG_FILES)
  
  clean:
@@ -34,7 +34,7 @@
  
  # Linux/Mac OSX targets
  linux:
-@@ -155,3 +158,9 @@
+@@ -156,3 +159,9 @@
  Msolaris:
  	make "ARCHFLAGS=-Dcimg_display_type=0 -O3 $(CIMG_ALL_FLAGS)" all
  
diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist
index 9f63a85c519d..cdb0d9ee312d 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -11,6 +11,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/FAQ_item.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/curve_editor.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/download_item.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/item_codesample.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/item_getting.jpg
@@ -26,6 +27,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard3.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard4.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/postcard5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/project-support.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/screenshots_item.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_blobs.jpg
@@ -61,6 +63,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000020.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000021.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000022.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000023.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_odykill.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_optflow.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_paint.jpg
@@ -172,6 +175,7 @@ include/CImg.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.m
+%%PORTDOCS%%%%EXAMPLESDIR%%/curve_editor.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/dtmri_view.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/edge_explorer.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/fade_images.cpp