4 files changed, 37 insertions, 18 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 2e6cf6b3d575..0641b3c4637b 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cimg
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -27,6 +27,7 @@ MAKE_ENV=	CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}"	\
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 USE_GCC=	3.4+
 REINPLACE_ARGS=	-i ""
+LIB_DEPENDS+=	board.0:${PORTSDIR}/graphics/libboard
 . if !defined(WITHOUT_LAPACK)
 LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
 LAPACK_LIB=	-L${LOCALBASE}/lib -lalapack -lcblas -lf77blas -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -lgfortran -latlas
@@ -63,7 +64,7 @@ pre-configure:
 	${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 .if !defined(NOPORTDOCS)
 	${GREP} -lR 'img/' ${BUILD_WRKSRC} |	\
-		${XARGS} ${REINPLACE_CMD} -e 's|img/|${EXAMPLESDIR}/img/|g'
+		${XARGS} ${REINPLACE_CMD} -e 's|"img/|"${EXAMPLESDIR}/img/|g'
 .else
 	${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile
 .endif
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index d48b19fd6d65..857018890804 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (cimg-1.2.3,1/CImg-1.2.3.zip) = 2c86875918154bd4f7ef08e687a6ae42
+SHA256 (cimg-1.2.3,1/CImg-1.2.3.zip) = d151859a2af108d69342e83aa48a706fa6d1a50741e0afa3de4001aad7c134a1
+SIZE (cimg-1.2.3,1/CImg-1.2.3.zip) = 4594288
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index f2190b6f7973..0bc32d1d9a9d 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,9 +1,9 @@
---- examples/Makefile.orig	Wed Jul  4 13:23:28 2007
-+++ examples/Makefile	Wed Jul  4 23:23:43 2007
-@@ -38,10 +38,10 @@
+--- examples/Makefile.orig	Fri Aug 24 16:52:42 2007
++++ examples/Makefile	Fri Aug 24 22:14:27 2007
+@@ -41,10 +41,10 @@
  # Set correct variables and paths
  #---------------------------------
- CIMG_VERSION = 1.22
+ CIMG_VERSION = 1.23
 -CC           = g++
 -X11PATH      = /usr/X11R6
 -CFLAGS       = -Wall -W -ansi -pedantic -ffast-math
@@ -15,7 +15,13 @@
  
  #--------------------------------------------------
  # Set compilation flags allowing to customize CImg
-@@ -77,6 +77,9 @@
+@@ -81,11 +81,14 @@
+ CIMG_LAPACK_FLAGS = -Dcimg_use_lapack -lblas -lg2c -llapack
+ 
+ # Flags to enable the use of the Board library
+-CIMG_BOARD_FLAGS = -Dcimg_use_board -I../board-0.8/include -L../board-0.8/lib -lboard
++CIMG_BOARD_FLAGS = -Dcimg_use_board -lboard
+ 
  # Flags to compile on Solaris
  CIMG_SOLARIS_FLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
  
@@ -25,18 +31,18 @@
  # Set default compilation flags.
  # Uncomment lines here, if you want to customize your default configuration
  CIMG_DEFAULT_FLAGS = $(CIMG_X11_FLAGS) \
-@@ -130,7 +133,7 @@
+@@ -142,7 +145,7 @@
  all: $(CIMG_FILES)
  
  clean:
--	rm -f *.exe *~ $(CIMG_FILES)
-+	rm -f *.exe *~ $(CIMG_FILES) Makefile.orig
+-	rm -f *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES)
++	rm -f *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES) Makefile.orig
  
- # Linux/Mac OSX targets
- linux:
-@@ -156,3 +159,9 @@
- Msolaris:
- 	make "ARCHFLAGS=-Dcimg_display_type=0 -O3 $(CIMG_ALL_FLAGS)" all
+ greycstoration4gimp: greycstoration4gimp.cpp
+ 	@echo
+@@ -162,6 +165,12 @@
+ Mlinux:
+ 	make "ARCHFLAGS=-O3 $(CIMG_ALL_FLAGS)" all jpeg_buffer greycstoration4gimp
  
 +# FreeBSD targets
 +dFreeBSD:
@@ -44,3 +50,6 @@
 +
 +oFreeBSD:
 +	make "ARCHFLAGS=$(CIMG_FREEBSD_FLAGS) $(CIMG_ALL_FLAGS)" all
+ # Sun Solaris targets
+ solaris:
+ 	make "ARCHFLAGS=$(CIMG_SOLARIS_FLAGS) $(CIMG_DEFAULT_FLAGS)" all
diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist
index cdb0d9ee312d..e747bee8e78e 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -28,6 +28,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard3.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard5.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/postcard6.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/project-support.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/screenshots_item.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_blobs.jpg
@@ -37,6 +38,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_dtmri.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_hough.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_imgfade.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_jawbreaker.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_landscape.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mandelbrot.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_metaballs.jpg
@@ -64,10 +66,13 @@ include/CImg.h
 %%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_mini_000024.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000025.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_reflection.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_render3d.png
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_restoration.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_rotozoom.jpg
@@ -219,6 +224,8 @@ include/CImg.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/img/title.bmp
 %%PORTDOCS%%%%EXAMPLESDIR%%/img/tomato.bmp
 %%PORTDOCS%%%%EXAMPLESDIR%%/inrcast.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/jawbreaker.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/jpeg_buffer.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets3D.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/nlmeans.cpp
@@ -227,6 +234,8 @@ include/CImg.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/pde_heatflow2D.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/pslider.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tetris.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/toolbox3d.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/tron.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/wavelet_atrous.cpp
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/reference