- Upgrade to 1.3.0;

  Changelog at
<http://sourceforge.net/project/shownotes.php?release_id=661746&group_id=96492>

- Replace WITHOUT_OPTIMIZATIONS by WITH_DEBUG;

- Use Blas & Lapack by default, unless Atlas is installed;

- Handle NOPORTEXAMPLES.

4 files changed, 270 insertions, 149 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index bd35df24d986..fe0958c67b94 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,45 +6,43 @@
 #
 
 PORTNAME=	cimg
-PORTVERSION=	1.2.9
-PORTREVISION=	1
+PORTVERSION=	1.3.0
 PORTEPOCH=	2
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF
-DISTNAME=	CImg-${DISTVERSION}
+DISTNAME=	CImg_${DISTVERSION}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION},${PORTEPOCH}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	The C++ Template Image Processing Library
 
-USE_ZIP=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
 BUILD_WRKSRC=	${WRKSRC}/examples
-MAKE_ENV=	CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}"		\
-		LDFLAGS="${LDFLAGS} ${LAPACK_LIB} ${PTHREAD_LIBS} -lstdc++"	\
+MAKE_ENV=	CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"	\
+		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"	\
 		X11PATH=${LOCALBASE}
 
 .if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 USE_GMAKE=	yes
 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
-LAPACK_DEF=	-Dcimg_lapack
-. endif
 
 USE_FORTRAN=	yes
 
-. if !defined(WITHOUT_OPTIMIZATIONS)
+. if !defined(WITH_DEBUG)
 LIB_DEPENDS+=	png:${PORTSDIR}/graphics/png		\
 		jpeg:${PORTSDIR}/graphics/jpeg		\
 		tiff:${PORTSDIR}/graphics/tiff		\
 		Magick:${PORTSDIR}/graphics/ImageMagick	\
+		gimp-2.0:${PORTSDIR}/graphics/gimp-app	\
 		fftw3:${PORTSDIR}/math/fftw3
 ALL_TARGET=	oFreeBSD
 . else
 ALL_TARGET=	dFreeBSD
+WITHOUT_GM=	yes
+WITHOUT_MEDCON=	yes
+WITHOUT_FFMPEG=	yes
+WITHOUT_LAPACK=	yes
 . endif
 
 . if !defined(WITHOUT_GM)
@@ -54,56 +52,69 @@ RUN_DEPENDS+=	gm:${PORTSDIR}/graphics/GraphicsMagick
 RUN_DEPENDS+=	medcon:${PORTSDIR}/graphics/xmedcon
 . endif
 . if !defined(WITHOUT_FFMPEG)
-RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	avformat.1:${PORTSDIR}/multimedia/ffmpeg
 . endif
 
 DOCBASE=	CHANGES.txt README.txt
-DOCREFS=	CImg.doxygen CImg_documentation.h CImg_reference.pdf	\
-		download.shtml favicon.ico favicon.png footer.html header.html	\
-		header_reference.html img index.shtml links.shtml news.shtml	\
-		reference screenshots.shtml
+PROGS=		CImg_demo gmic use_jpeg_buffer greycstoration4gimp gmic4gimp
 .else
 NO_BUILD=	yes
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if !defined(NOPORTDOCS)
+. if !defined(WITHOUT_LAPACK)
+.  if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
+WITH_ATLAS=	yes
+.  endif
+.  if defined(WITH_ATLAS)
+LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
+LAPACK_LIB=	-L${LOCALBASE}/lib -lalapack -lcblas -lf77blas -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -lgfortran -latlas
+.  else
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
+LAPACK_LIB=	-L${LOCALBASE}/lib -llapack -lblas -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -lgfortran
+.  endif
+. endif
+.endif
+
 pre-configure:
 .if !defined(NOPORTDOCS)
-	${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
+	${DIRNAME} `${LOCALBASE}/bin/${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 	${REINPLACE_CMD} -e 's|make|${GMAKE}|' ${BUILD_WRKSRC}/Makefile
 .else
-	${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|'${BUILD_WRKSRC}/Makefile
 .endif
 . if !defined(WITHOUT_FFMPEG)
-	${REINPLACE_CMD} -e 's|#.*$$(CIMG_FFMPEG_FLAGS)|	$$(CIMG_FFMPEG_FLAGS)|'	\
+	${REINPLACE_CMD} -e 's|#CIMG_FFMPEG_CFLAGS|CIMG_FFMPEG_CFLAGS|'	\
+		-e 's|#CIMG_FFMPEG_LDFLAGS|CIMG_FFMPEG_LDFLAGS|'	\
 		${BUILD_WRKSRC}/Makefile
 . endif
 . if !defined(WITHOUT_LAPACK)
-	${REINPLACE_CMD} -e 's|#.*$$(CIMG_LAPACK_FLAGS)|	$$(CIMG_LAPACK_FLAGS)|'	\
+	${REINPLACE_CMD} -e 's|#CIMG_LAPACK_CFLAGS|CIMG_LAPACK_CFLAGS|'	\
+		-e 's|#CIMG_LAPACK_LDFLAGS|CIMG_LAPACK_LDFLAGS|'	\
+		-e 's|-lblas -llapack|${LAPACK_LIB}|'			\
 		${BUILD_WRKSRC}/Makefile
 . endif
-
-.if !defined(NOPORTDOCS)
-post-build:
-	cd ${WRKSRC}/documentation && doxygen CImg.doxygen
-.endif
+	${REINPLACE_CMD} -e 's|-pedantic|${CFLAGS}|'			\
+		-e 's|-lpthread|${PTHREAD_LIBS}|' ${BUILD_WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/CImg.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/CImg_demo ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${PROGS:C|^|${BUILD_WRKSRC}/|} ${PREFIX}/bin
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${DOCSDIR}
-. for doc in ${DOCREFS}
-	${CP} -R ${WRKSRC}/documentation/${doc} ${DOCSDIR}
-. endfor
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	cd ${WRKSRC}/html && ${COPYTREE_SHARE} \* ${DOCSDIR}
 .endif
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@(cd ${EXAMPLESDIR} && ${GMAKE} clean)
+	@${RM} ${EXAMPLESDIR}/Makefile.orig
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	${FIND} ${DOCSDIR} ${EXAMPLESDIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \;
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index 724e17f9719e..5b44b17a2e3c 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-MD5 (cimg-1.2.9,2/CImg-1.2.9.zip) = b4cad020a467559d7060e1aa372565ba
-SHA256 (cimg-1.2.9,2/CImg-1.2.9.zip) = 4499e2cc3aa3c432cde76eb3533f06cc3c6d60d7c871d764f80843028761dac5
-SIZE (cimg-1.2.9,2/CImg-1.2.9.zip) = 6698508
+MD5 (cimg-1.3.0,2/CImg_1.3.0.tar.gz) = af434dcaee6b940f5796fe2fa729c6cd
+SHA256 (cimg-1.3.0,2/CImg_1.3.0.tar.gz) = 804e024c01a55b61bd0128845f5ff1afe4d6037e9c711a616daf12e0b80e9348
+SIZE (cimg-1.3.0,2/CImg_1.3.0.tar.gz) = 7679999
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index 43255d7935c0..1ba85c216a23 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,117 +1,157 @@
---- examples/Makefile.orig	2008-06-26 14:31:17.000000000 +0200
-+++ examples/Makefile	2008-06-28 13:54:24.000000000 +0200
-@@ -75,15 +75,15 @@
+--- examples/Makefile.orig	2009-02-17 13:08:45.000000000 +0100
++++ examples/Makefile	2009-02-21 15:02:01.000000000 +0100
+@@ -78,8 +78,8 @@
  # Set correct variables and paths
  #---------------------------------
- CIMG_VERSION = 1.29
+ CIMG_VERSION = 1.30
 -X11PATH      = /usr/X11R6
 -CC           = g++
 +#X11PATH      = /usr/X11R6
 +#CC           = g++
+ CCVER        = `$(CC) -v 2>&1 | tail -n 1`
+ EXEPFX       =
  
+@@ -106,7 +106,7 @@
  ifeq ($(CC),icc)
- CFLAGS       = -ansi
- LDFLAGS      = -lpthread
+ CIMG_OPT_CFLAGS = -O3 -ipo -no-prec-div
  else
--CFLAGS       = -Wall -W -ansi -pedantic
--LDFLAGS      = -lm -lpthread
-+#CFLAGS       = -Wall -W -ansi -pedantic
-+#LDFLAGS      = -lm -lpthread
- endif
- 
- #--------------------------------------------------
-@@ -101,7 +101,7 @@
- ifeq ($(CC),icc)
- CIMG_OPT_FLAGS = -O3 -ipo -no-prec-div
- else
--CIMG_OPT_FLAGS = -O3 -ffast-math
-+CIMG_OPT_FLAGS = -ffast-math
+-CIMG_OPT_CFLAGS = -O3 -ffast-math -fno-tree-pre
++CIMG_OPT_CFLAGS = -ffast-math -fno-tree-pre
  endif
  
  # Flags to enable OpenMP support.
-@@ -146,10 +146,10 @@
- CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
+@@ -158,8 +158,8 @@
+ 
+ # Flags to enable native support for various video files, using the FFMPEG library.
+ # ( http://www.ffmpeg.org/ )
+-CIMG_FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -I/usr/include/ffmpeg
+-CIMG_FFMPEG_LDFLAGS = -lavcodec -lavformat
++#CIMG_FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -I$(LOCALBASE)/include/ffmpeg
++#CIMG_FFMPEG_LDFLAGS = -lavcodec -lavformat
+ 
+ # Flags to enable native support for compressed .cimgz files, using the Zlib library.
+ # ( http://www.zlib.net/ )
+@@ -182,14 +182,17 @@
  
  # 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
+ # ( http://www.netlib.org/lapack/ )
+-CIMG_LAPACK_CFLAGS = -Dcimg_use_lapack
+-CIMG_LAPACK_LDFLAGS = -lblas -lg2c -llapack
++#CIMG_LAPACK_CFLAGS = -Dcimg_use_lapack
++#CIMG_LAPACK_LDFLAGS = -lblas -llapack
  
  # Flags to enable the use of the Board library
--CIMG_BOARD_FLAGS = -Dcimg_use_board -I/usr/include/board -lboard
-+CIMG_BOARD_FLAGS = -Dcimg_use_board -I$(LOCALBASE)/board -lboard
- 
- # Flags to compile on Solaris
- CIMG_SOLARIS_FLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
-@@ -157,6 +157,9 @@
- # Flags to compile on MacOSX with Carbon-based display support
- CIMG_CARBON_FLAGS = -Dcimg_display=3 -framework Carbon
+ # ( http://libboard.sourceforge.net/ )
+-CIMG_BOARD_CFLAGS = -Dcimg_use_board -I/usr/include/board
++CIMG_BOARD_CFLAGS = -Dcimg_use_board -I$(LOCALBASE)/include/board
+ CIMG_BOARD_LDFLAGS = -lboard
  
 +# Flags to compile on FreeBSD
-+CIMG_FREEBSD_FLAGS = -ansi -ffast-math  -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib
++CIMG_FREEBSD_LDFLAGS = -ansi -ffast-math  -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib
 +
- # Set default compilation flags.
- # Uncomment lines here, if you want to customize your default configuration
- CIMG_DEFAULT_FLAGS = $(CIMG_VT100_FLAGS) \
-@@ -164,15 +167,15 @@
-                      $(CIMG_XSHM_FLAGS) \
-                      $(CIMG_XRANDR_FLAGS) \
- #                     $(CIMG_OPENMP_FLAGS) \
--#                     $(CIMG_PNG_FLAGS) \
--#                     $(CIMG_JPEG_FLAGS) \
--#                     $(CIMG_TIFF_FLAGS) \
-+                     $(CIMG_PNG_FLAGS) \
-+                     $(CIMG_JPEG_FLAGS) \
-+                     $(CIMG_TIFF_FLAGS) \
- #  		      $(CIMG_FFMPEG_FLAGS) \
--#                     $(CIMG_ZLIB_FLAGS) \
--#                     $(CIMG_MAGICK_FLAGS) \
--#                     $(CIMG_FFTW3_FLAGS)
--#		      $(CIMG_LAPACK_FLAGS)
--#                     $(CIMG_BOARD_FLAGS)
-+                     $(CIMG_ZLIB_FLAGS) \
-+                     $(CIMG_MAGICK_FLAGS) \
-+                     $(CIMG_FFTW3_FLAGS) \
-+#		      $(CIMG_LAPACK_FLAGS) \
-+                     $(CIMG_BOARD_FLAGS)
+ # Flags to compile on Sun Solaris
+ CIMG_SOLARIS_LDFLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
  
- # Set full compilation flags.
- CIMG_FULL_FLAGS = $(CIMG_OPT_FLAGS) \
-@@ -184,12 +187,12 @@
-                   $(CIMG_PNG_FLAGS) \
-                   $(CIMG_JPEG_FLAGS) \
-                   $(CIMG_ZLIB_FLAGS) \
-+                  $(CIMG_MAGICK_FLAGS) \
-+                  $(CIMG_BOARD_FLAGS) \
-+                  $(CIMG_FFTW3_FLAGS) \
- #		  $(CIMG_FFMPEG_FLAGS) \
--#                  $(CIMG_MAGICK_FLAGS) \
--#                  $(CIMG_OPENMP_FLAGS) \
--#                  $(CIMG_FFTW3_FLAGS) \
- #	           $(CIMG_LAPACK_FLAGS) \
--#                  $(CIMG_BOARD_FLAGS)
-+#                  $(CIMG_OPENMP_FLAGS)
+@@ -205,7 +208,7 @@
+ 	@echo
+ 	@echo "** Compiling '$* ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | tail -n 1`'"
+ 	@echo
+-	$(CC) -o $(EXEPFX)$* $< $(CFLAGS) $(LDFLAGS) $(CONF_CFLAGS) $(CONF_LDFLAGS)
++	$(CXX) -o $(EXEPFX)$* $< $(CFLAGS) $(LDFLAGS) $(CONF_CFLAGS) $(CONF_LDFLAGS)
+ ifeq ($(MACOSX_APP),true)
+ 	mkdir -p $(EXEPFX)${*}.app/Contents/MacOS
+ 	mv $(EXEPFX)${*} $(EXEPFX)${*}.app/Contents/MacOS
+@@ -227,6 +230,9 @@
+ 	@echo "  > mlinux   : Linus/BSD/MacOSX target, no display, minimal features, optimizations enabled."
+ 	@echo "  > Mlinux   : Linux/BSD/MacOSX target, X11 display, maximal features, optimizations enabled."
+ 	@echo
++	@echo "  > dFreeBSD   : FreeBSD, X11 display, debug mode."
++	@echo "  > oFreeBSD   : FreeBSD target, X11 display, maximal features for packages."
++	@echo
+ 	@echo "  > solaris  : Sun Solaris target, X11 display, optimizations disabled."
+ 	@echo "  > dsolaris : Sun Solaris target, X11 display, debug mode."
+ 	@echo "  > osolaris : Sun Solaris target, X11 display, optimizations enabled."
+@@ -270,7 +276,7 @@
+ 	@echo
+ 	@echo "** Compiling 'greycstoration4gimp ($(CIMG_VERSION))' with '$(CCVER)'"
+ 	@echo
+-	$(CC) -I.. -I./plugins -o $(EXEPFX)greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_CFLAGS) $(CIMG_GIMP_CFLAGS)
++	$(CXX) -I.. -I./plugins -o $(EXEPFX)greycstoration4gimp greycstoration4gimp.cpp `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_CFLAGS) $(CIMG_GIMP_CFLAGS)
  
- #-------------------------
- # Define Makefile entries
-@@ -234,7 +237,7 @@
- all: $(CIMG_FILES)
+ # Specific targets for the 'gmic4gimp' plug-in for GIMP.
+ gmic4gimp_def: gmic4gimp_def.raw
+@@ -281,7 +287,7 @@
+ 	$(CC) -I.. -o gmic4gimp.o -c gmic.cpp -Dgmic_minimal $(CIMG_OPT_CFLAGS) $(CIMG_FFTW3_CFLAGS)
  
- clean:
--	rm -rf *.app *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES)
-+	rm -rf *.app *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES) Makefile.orig
+ gmic4gimp: gmic4gimp.o gmic4gimp.cpp
+-	$(CC) -I.. -I./plugins -o $(EXEPFX)gmic4gimp gmic4gimp.cpp gmic4gimp.o `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_GIMP_CFLAGS)
++	$(CXX) -I.. -I./plugins -o $(EXEPFX)gmic4gimp gmic4gimp.cpp gmic4gimp.o `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_CFLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_GIMP_CFLAGS)
  
- greycstoration4gimp: greycstoration4gimp.cpp
- 	@echo
-@@ -254,6 +257,12 @@
- Mlinux:
- 	make "ARCHFLAGS=$(CIMG_FULL_FLAGS)" "STRIP_EXE=1" all jpeg_buffer greycstoration4gimp
+ # Specific targets for 'gmic'.
+ gmic_def: gmic_def.raw
+@@ -309,7 +315,7 @@
+ gmic_double.o: gmic.cpp
+ 	$(CC) -o gmic_double.o -c gmic.cpp -I. -Dgmic_separate_compilation -Dgmic_double $(CFLAGS) $(CONF_CFLAGS)
+ gmic: gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic.cpp
+-	$(CC) -o $(EXEPFX)gmic gmic.cpp -I. -Dgmic_separate_compilation -Dgmic_main \
++	$(CXX) -o $(EXEPFX)gmic gmic.cpp -I. -Dgmic_separate_compilation -Dgmic_main \
+ 		 gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o \
+ 		 gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(CFLAGS) $(LDFLAGS) $(CONF_CFLAGS) $(CONF_LDFLAGS)
+ 
+@@ -399,6 +405,56 @@
+ "STRIP_EXE=true" \
+ all use_jpeg_buffer greycstoration4gimp gmic4gimp
  
 +# FreeBSD targets
 +dFreeBSD:
-+	make "ARCHFLAGS=$(CIMG_FREEBSD_FLAGS) $(CIMG_DEFAULT_FLAGS)" all
++	make \
++"CONF_CFLAGS = \
++$(CIMG_DEBUG_CFLAGS) \
++$(CIMG_VT100_CFLAGS) \
++$(CIMG_X11_CFLAGS) \
++$(CIMG_XSHM_CFLAGS) \
++$(CIMG_XRANDR_CFLAGS) \
++$(CIMG_ZLIB_CFLAGS)" \
++"CONF_LDFLAGS = \
++$(CIMG_FREEBSD_LDFLAGS) \
++$(CIMG_ZLIB_LDFLAGS) \
++$(CIMG_X11_LDFLAGS) \
++$(CIMG_XSHM_LDFLAGS) \
++$(CIMG_XRANDR_LDFLAGS)" \
++all
 +
 +oFreeBSD:
-+	make "ARCHFLAGS=$(CIMG_FREEBSD_FLAGS) $(CIMG_FULL_FLAGS)" all
- # Sun Solaris targets
++	make \
++"CONF_CFLAGS = \
++$(CIMG_OPT_CFLAGS) \
++$(CIMG_VT100_CFLAGS) \
++$(CIMG_X11_CFLAGS) \
++$(CIMG_XSHM_CFLAGS) \
++$(CIMG_XRANDR_CFLAGS) \
++$(CIMG_TIFF_CFLAGS) \
++$(CIMG_PNG_CFLAGS) \
++$(CIMG_JPEG_CFLAGS) \
++$(CIMG_ZLIB_CFLAGS) \
++$(CIMG_MAGICK_CFLAGS) \
++$(CIMG_FFMPEG_CFLAGS) \
++$(CIMG_LAPACK_CFLAGS) \
++$(CIMG_FFTW3_CFLAGS)" \
++"CONF_LDFLAGS = \
++$(CIMG_FREEBSD_LDFLAGS) \
++$(CIMG_X11_LDFLAGS) \
++$(CIMG_XSHM_LDFLAGS) \
++$(CIMG_XRANDR_LDFLAGS) \
++$(CIMG_TIFF_LDFLAGS) \
++$(CIMG_PNG_LDFLAGS) \
++$(CIMG_JPEG_LDFLAGS) \
++$(CIMG_ZLIB_LDFLAGS) \
++$(CIMG_MAGICK_LDFLAGS) \
++$(CIMG_FFMPEG_LDFLAGS) \
++$(CIMG_LAPACK_LDFLAGS) \
++$(CIMG_FFTW3_LDFLAGS)" \
++"STRIP_EXE=true" \
++all use_jpeg_buffer greycstoration4gimp gmic4gimp
++
+ # Sun Solaris targets, with X11 display.
  solaris:
- 	make "ARCHFLAGS=$(CIMG_SOLARIS_FLAGS) $(CIMG_DEFAULT_FLAGS)" all
+ 	@make \
diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist
index d2c2f6b12f77..07445ac24b83 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -1,10 +1,15 @@
 %%PORTDOCS%%bin/CImg_demo
+%%PORTDOCS%%bin/gmic
+%%PORTDOCS%%bin/gmic4gimp
+%%PORTDOCS%%bin/greycstoration4gimp
+%%PORTDOCS%%bin/use_jpeg_buffer
 include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/CImg.doxygen
 %%PORTDOCS%%%%DOCSDIR%%/CImg_documentation.h
 %%PORTDOCS%%%%DOCSDIR%%/CImg_reference.pdf
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/chat.shtml
 %%PORTDOCS%%%%DOCSDIR%%/download.shtml
 %%PORTDOCS%%%%DOCSDIR%%/favicon.ico
 %%PORTDOCS%%%%DOCSDIR%%/favicon.png
@@ -12,30 +17,55 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/header.html
 %%PORTDOCS%%%%DOCSDIR%%/header_reference.html
 %%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo3.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/CImg_flyer.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/FAQ_item.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/curve_editor.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/item_chat.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/item_download.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_authors.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_chat.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/item_clickvideo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_clickvideo2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_copyrights.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_debian_package.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_debian_package2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_description.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_download.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/item_extensibility.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_file.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_freedom.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_genericity.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/item_guestbook.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/item_intro.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/item_links.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/item_news.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/item_screenshots.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_howtohelp.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_intro.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/item_learnmore.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_licenses.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_links.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/item_news.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/item_portability.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_precompiled.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_precompiled2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_quickhistory.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_screenshots.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/item_simplicity.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_sources.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_sources2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_standard_package.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_standard_package2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/item_usefulness.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/logoCNRS.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/logoGMIC.ppm
 %%PORTDOCS%%%%DOCSDIR%%/img/logoGREYC.gif
 %%PORTDOCS%%%%DOCSDIR%%/img/logoIMAGE.gif
 %%PORTDOCS%%%%DOCSDIR%%/img/logoINRIA.gif
-%%PORTDOCS%%%%DOCSDIR%%/img/logoODYSSEE.png
+%%PORTDOCS%%%%DOCSDIR%%/img/logoODYSSEE.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/postcard10.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard3.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard6.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/postcard7.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/postcard8.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/postcard9.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/project-support.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_blobs.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_bubble.jpg
@@ -76,12 +106,14 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000024.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000025.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000026.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000027.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_puzzle.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_reflection.jpg
-%%PORTDOCS%%%%DOCSDIR%%/img/ss_render3d.png
+%%PORTDOCS%%%%DOCSDIR%%/img/ss_render3d.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_restoration.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_rotozoom.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_shadebobs.jpg
@@ -91,12 +123,38 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_volume3d.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/ss_waves.jpg
 %%PORTDOCS%%%%DOCSDIR%%/img/tutorial.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/video_blobs.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_bubble.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_bump.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_cimgdemo.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_curveeditor.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_doubletorus.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_dtmri.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_fourier.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_imagesurface.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_jawbreaker.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_landscape.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_mandelbrot.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_menu.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_metaballs.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_minipaint.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_plasma.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_reflection.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_shadebobs.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_tetris.html
+%%PORTDOCS%%%%DOCSDIR%%/img/video_waves.html
 %%PORTDOCS%%%%DOCSDIR%%/index.shtml
 %%PORTDOCS%%%%DOCSDIR%%/links.shtml
 %%PORTDOCS%%%%DOCSDIR%%/news.shtml
 %%PORTDOCS%%%%DOCSDIR%%/reference/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/closed.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/form_0.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/form_1.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/form_2.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/formula.repository
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x61.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x62.html
@@ -175,14 +233,15 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/namespacemembers_func.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/namespacemembers_vars.html
 %%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_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_list-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_list.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/open.gif
+%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImg-members.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImg.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgDisplay-members.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgDisplay.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgException-members.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgException.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgList-members.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgList.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_l.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/tab_r.gif
@@ -191,16 +250,21 @@ include/CImg.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/CImg_demo.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/captcha.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.m
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check_all_functions.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/curve_editor.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dtmri_view.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/edge_explorer.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fade_images.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate_loop_macros.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic4gimp.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic4gimp_def.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic4gimp_def.raw
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic_def.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic_def.raw
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/greycstoration.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/greycstoration4gimp.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/greycstoration4integration.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hough_transform.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/image2ascii.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/image_registration.cpp
@@ -215,12 +279,9 @@ include/CImg.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/sh0r.pgm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/sh1r.pgm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/tetris.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inrcast.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jawbreaker.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jpeg_buffer.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mcf_levelsets.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mcf_levelsets3d.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nlmeans.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/odykill.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pde_TschumperleDeriche2d.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pde_heatflow2d.cpp
@@ -229,6 +290,15 @@ include/CImg.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tetris.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tron.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_RGBclass.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_cimgIPL.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_cimgmatlab.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_cimgmatlab.m
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_draw_gradient.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_greycstoration.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_jpeg_buffer.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_nlmeans.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_skeleton.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wavelet_atrous.cpp
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/reference
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/img