Upgrade to 1.2.5.

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

5 files changed, 29 insertions, 30 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index c8149ac51007..4c61f3e43b1c 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cimg
-PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTVERSION=	1.2.5
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -49,6 +48,13 @@ ALL_TARGET=	oFreeBSD
 ALL_TARGET=	dFreeBSD
 . endif
 
+.if !defined(WITHOUT_GM)
+RUN_DEPENDS+=	gm:${PORTSDIR}/graphics/GraphicsMagick
+.endif
+.if !defined(WITHOUT_MEDCON)
+RUN_DEPENDS+=	medcon:${PORTSDIR}/graphics/xmedcon
+.endif
+
 DOCBASE=	CHANGES.txt README.txt
 DOCREFS=	download.shtml favicon.ico favicon.png foot_reference.html	\
 		head.html head_reference.html img index.shtml links.shtml	\
@@ -57,10 +63,6 @@ DOCREFS=	download.shtml favicon.ico favicon.png foot_reference.html	\
 NOBUILD=	yes
 .endif
 
-.if !defined(WITHOUT_IM)
-RUN_DEPENDS+=	${LOCALBASE}/lib/libMagick.so.10:${PORTSDIR}/graphics/ImageMagick
-.endif
-
 pre-configure:
 	${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 .if !defined(NOPORTDOCS)
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index 67fcc318b0e0..3cf1137df829 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-MD5 (cimg-1.2.4_1,1/CImg-1.2.4.zip) = bdd90d57d594b551a49544c8cf4977c2
-SHA256 (cimg-1.2.4_1,1/CImg-1.2.4.zip) = 484a824e32ba1178b3b4b6ded1591dd564375fe977102412474c428baecce9d4
-SIZE (cimg-1.2.4_1,1/CImg-1.2.4.zip) = 4629360
+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
diff --git a/graphics/cimg/files/patch-CImg.h b/graphics/cimg/files/patch-CImg.h
deleted file mode 100644
index 6eb94f7c32ec..000000000000
--- a/graphics/cimg/files/patch-CImg.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- CImg.h.orig	Tue Mar  6 15:17:06 2007
-+++ CImg.h	Wed Mar  7 21:14:51 2007
-@@ -3777,7 +3777,7 @@
-    */
-   //! Class used to compute basic statistics on pixel values of a \ref CImg image.
-   /**
--      Constructing a CImgStats instance from an image CImg<T> or a list CImgList<T>
-+      Constructing a CImgStats instance from an image CImg&lt;T&gt; or a list CImgList&lt;T&gt;
-       will compute the minimum, maximum and average pixel values of the input object.
-       Optionally, the variance of the pixel values can be computed.
-       Coordinates of the pixels whose values are minimum and maximum are also stored.
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index 99bec50302ae..3c30e23d008d 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,13 +1,15 @@
---- examples/Makefile.orig	Wed Sep 26 11:32:03 2007
-+++ examples/Makefile	Wed Sep 26 22:04:27 2007
-@@ -41,10 +41,10 @@
+--- ./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 @@
+ #---------------------------------
  # Set correct variables and paths
  #---------------------------------
- CIMG_VERSION = 1.24
+-CIMG_VERSION = 1.24
 -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
@@ -15,7 +17,16 @@
  
  #--------------------------------------------------
  # Set compilation flags allowing to customize CImg
-@@ -86,6 +86,9 @@
+@@ -79,7 +79,7 @@
+ CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
+ 
+ # Flags to enable the use of LAPACK routines for matrix computation
+-CIMG_LAPACK_FLAGS = -Dcimg_use_lapack -lblas -lg2c -llapack
++CIMG_LAPACK_FLAGS = -Dcimg_use_lapack -lblas -llapack
+ 
+ # Flags to enable the use of the Board library
+ CIMG_BOARD_FLAGS = -Dcimg_use_board -lboard
+@@ -87,6 +87,9 @@
  # Flags to compile on Solaris
  CIMG_SOLARIS_FLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
  
@@ -25,7 +36,7 @@
  # Set default compilation flags.
  # Uncomment lines here, if you want to customize your default configuration
  CIMG_DEFAULT_FLAGS = $(CIMG_X11_FLAGS) \
-@@ -142,7 +145,7 @@
+@@ -143,7 +146,7 @@
  all: $(CIMG_FILES)
  
  clean:
@@ -34,7 +45,7 @@
  
  greycstoration4gimp: greycstoration4gimp.cpp
  	@echo
-@@ -162,6 +165,12 @@
+@@ -163,6 +166,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 91845803ed25..22787048febe 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -114,7 +114,6 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x78.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x79.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x7a.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x7e.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x62.html
@@ -171,8 +170,6 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_exception.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_list-members.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_list.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_stats-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_stats.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_l.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_r.gif