Upgrade to CImg-1-13.

4 files changed, 22 insertions, 25 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index e4cc7a409486..b6f70fffe56a 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cimg
-DISTVERSION=	1-12
+DISTVERSION=	1-13
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index c272fe27a189..e4c26cb5e752 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-MD5 (CImg-1-12.zip) = 5615163d35b0b1ae34a982cd8d7eac3e
-SHA256 (CImg-1-12.zip) = f26d0294a9049bd6f89dca2f87c977f08a067f13c47b888d1afab51fc26e7e70
-SIZE (CImg-1-12.zip) = 2878442
+MD5 (CImg-1-13.zip) = be9e87bc92ea64b5ce41e1549efd7009
+SHA256 (CImg-1-13.zip) = db71c38493d17752203990afd2fb1d78911f3772d45c20bbcc6136d1b029a1e6
+SIZE (CImg-1-13.zip) = 3162668
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index cd7b78eed3c1..244859fd6375 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,6 +1,6 @@
---- examples/Makefile.orig	Fri Nov 18 16:10:03 2005
-+++ examples/Makefile	Fri Nov 18 21:32:47 2005
-@@ -7,17 +7,17 @@
+--- examples/Makefile.orig	Fri Mar 31 18:11:20 2006
++++ examples/Makefile	Fri Mar 31 19:45:50 2006
+@@ -7,10 +7,10 @@
  # -----------------------------------------------------------------------------------
  
  # Set correct variables and paths
@@ -12,22 +12,23 @@
 +#X11PATH = /usr/X11R6
 +#CFLAGS  = -Wall -ansi -pedantic -ffast-math -I$(X11PATH)/include
 +#LDFLAGS = -lm -lpthread -lX11 -L$(X11PATH)/lib
+ CIMGVER = 1.13
  
  # Compilation rules
- .cpp:
+@@ -18,7 +18,7 @@
  	@echo
- 	@echo "** Compiling '$*' with '`$(CC) -v 2>&1 | grep version`'"
+ 	@echo "** Compiling '$* ($(CIMGVER))' with '`$(CC) -v 2>&1 | grep version`'"
  	@echo
 -	$(CC) -o $* $< $(CFLAGS) $(LDFLAGS) $(ARCHFLAGS)
 +	$(CC) -o $* $< $(CPPFLAGS) -Wall -ansi -pedantic -ffast-math  -I$(X11PATH)/include -lX11 -L$(X11PATH)/lib $(LDFLAGS)
- linux:
- 	make all
- solaris:
-@@ -42,6 +42,7 @@
+ 
+ first:
+ 	@echo
+@@ -72,6 +72,7 @@
  
  clean:
  	rm -f *.exe *~ \
 +	Makefile.orig \
-         CImg_test \
+ 	CImg_test \
          fade_images \
          greycstoration \
diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist
index 1b422d4ab8fd..669783e13d08 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -31,6 +31,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_imgfade.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_landscape.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mandelbrot.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_metaballs.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000000.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000001.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000002.jpg
@@ -50,14 +51,17 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000016.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000017.jpg
 %%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_odykill.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_optflow.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_paint.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_plasma.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/ss_render3d.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_render3d.png
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_restoration.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_rotozoom.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_shadebobs.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_surface.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_tetris.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_triangle.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_volume3d.jpg
@@ -139,22 +143,14 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/namespaces.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img-members.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_display-members.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_display.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_exception-members.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_exception.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/structcimg__library_1_1_c_img_subset-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_subset.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_subset.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_imgl-members.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_imgl.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_imgl.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_imgl_subset-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_imgl_subset.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_imgl_subset.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_l.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_r.gif
@@ -167,7 +163,7 @@ include/CImg.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/hough_transform.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/image2ascii.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/image_registration.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/img/background.jpg
+%%PORTDOCS%%%%EXAMPLESDIR%%/image_surface.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/img/brain.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/img/cdrom.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/img/choose.png
@@ -202,11 +198,11 @@ include/CImg.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/img/tomato.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/inrcast.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets3D.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/odykill.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/pde_TschumperleDeriche2D.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/pde_heatflow2D.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/pslider.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/render3d.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tetris.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/wavelet_atrous.cpp