Upgrade to 1.1.8.

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

3 files changed, 81 insertions, 42 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 5c3a8e52c144..118dc9db6499 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cimg
-DISTVERSION=	1-17
-PORTREVISION=	2
+DISTVERSION=	1-18
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,8 +24,28 @@ MAKE_ENV=	CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}"	\
 
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-USE_GCC=	3.4
+USE_GCC=	3.4+
 REINPLACE_ARGS=	-i ""
+. 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
+
+WANT_FORTRAN=	yes #dummy but future use
+BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
+FC=		gfortran42
+F77=		gfortran42
+
+. if !defined(WITHOUT_OPTIMIZATIONS)
+USE_XLIB=	yes
+LIB_DEPENDS+=	png:${PORTSDIR}/graphics/png		\
+		jpeg:${PORTSDIR}/graphics/jpeg		\
+		tiff:${PORTSDIR}/graphics/tiff		\
+		Magick:${PORTSDIR}/graphics/ImageMagick	\
+		fftw3:${PORTSDIR}/math/fftw3
+. 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	\
@@ -38,26 +57,18 @@ NOBUILD=	yes
 .if !defined(WITHOUT_IM)
 RUN_DEPENDS+=	${LOCALBASE}/lib/libMagick.so.10:${PORTSDIR}/graphics/ImageMagick
 .endif
-.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
-
-WANT_FORTRAN=	yes #dummy but future use
-BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
-FC=		gfortran42
-F77=		gfortran42
-
-#post-extract:
 
 post-patch:
 	${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 #	@${CP} ${WRKSRC}/CImg.h ${WRKSRC}/CImg.h.dos
 #	@${TR} -d '\r' < ${WRKSRC}/CImg.h.dos > ${WRKSRC}/CImg.h
+
+pre-configure:
 .if !defined(NOPORTDOCS)
-	@${GREP} -lR 'img/' ${BUILD_WRKSRC} |	\
+	${GREP} -lR 'img/' ${BUILD_WRKSRC} |	\
 		${XARGS} ${REINPLACE_CMD} -e 's|img/|${EXAMPLESDIR}/img/|g'
+.else
+	${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile
 .endif
 
 .if !defined(NOPORTDOCS)
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index d58e0aa3b689..e9d04a96aa43 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-MD5 (cimg-1.17_2/CImg-1-17.zip) = aae01ef36c598402751f2ddbd3eca0ee
-SHA256 (cimg-1.17_2/CImg-1-17.zip) = 61aa14b239ee3683e9f0684e875703a30b21ca93b1e4b9e4ac676c89708c159e
-SIZE (cimg-1.17_2/CImg-1-17.zip) = 3732010
+MD5 (cimg-1.18/CImg-1-18.zip) = 04cfec2237a87fab394e48a814b346f1
+SHA256 (cimg-1.18/CImg-1-18.zip) = c00f0616e1dc4d6bcf532107404589b49ccfacfb1e24f10830a99727d27a1d8e
+SIZE (cimg-1.18/CImg-1-18.zip) = 3730154
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index 9623d5f9623f..c9e171252568 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,35 +1,63 @@
---- examples/Makefile.orig	Mon Nov  6 15:26:08 2006
-+++ examples/Makefile	Mon Nov  6 16:16:00 2006
-@@ -8,10 +8,10 @@
+--- examples/Makefile.orig	Fri Jan 26 11:09:14 2007
++++ examples/Makefile	Sat Jan 27 14:37:02 2007
+@@ -7,10 +7,10 @@
+ # -----------------------------------------------------------------------------------
  
  # Set correct variables and paths
- CIMGVER = 1.17
--CC      = g++
--X11PATH = /usr/X11R6
--CFLAGS  = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
--LDFLAGS = -L$(X11PATH)/lib -lm -lpthread -lX11
-+CC      = $(CXX)
-+#X11PATH = /usr/X11R6
-+#CFLAGS  = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
-+#LDFLAGS = -L$(X11PATH)/lib -lm -lpthread -lX11
- 
- # Uncomment to enable fast image display, using the XSHM library.
- XSHM_FLAGS = -Dcimg_use_xshm -lXext 
-@@ -59,7 +59,7 @@
+-CC       = g++
+-X11PATH  = /usr/X11R6
+-CFLAGS   = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
+-LDFLAGS  = -L$(X11PATH)/lib -lm -lpthread -lX11
++CC       = $(CXX)
++#X11PATH  = /usr/X11R6
++#CFLAGS   = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
++#LDFLAGS  = -L$(X11PATH)/lib -lm -lpthread -lX11
+ 
+ # Set CImg version number
+ CIMG_VERSION = 1.18
+@@ -25,21 +25,21 @@
+ CIMG_XRANDR_FLAGS = -Dcimg_use_xrandr -lXrandr
+ 
+ # Uncomment to enable native support for PNG image files, using the PNG library.
+-#CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
++CIMG_PNG_FLAGS = -Dcimg_use_png -lpng -lz
+ 
+ # Uncomment to enable native support for JPEG image files, using the JPEG library.
+-#CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
++CIMG_JPEG_FLAGS = -Dcimg_use_jpeg -ljpeg
+ 
+ # Uncomment to enable native support for TIFF image files, using the TIFF library.
+-#CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
++CIMG_TIFF_FLAGS = -Dcimg_use_tiff -ltiff
+ 
+ # Uncomment to enable native support of most classical image file formats, using the Magick++ library.
+-#CIMG_MAGICK_FLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags` `Magick++-config --ldflags` `Magick++-config --libs`
++CIMG_MAGICK_FLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags` `Magick++-config --ldflags` `Magick++-config --libs`
+ 
+ # Uncomment to enable faster Discrete Fourier Transform computation, using the FFTW3 library
+-#CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
++CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
+ 
+-OPTFLAGS = -O3 $(CIMG_STRICT_FLAG) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
++OPTFLAGS = $(CIMG_STRICT_FLAG) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
+ 
+ CIMG_FILES = CImg_demo \
+ 	     dtmri_view \
+@@ -67,7 +67,7 @@
  	@echo
- 	@echo "** Compiling '$* ($(CIMGVER))' with '`$(CC) -v 2>&1 | grep version`'"
+ 	@echo "** Compiling '$* ($(CIMG_VERSION))' 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)
++	$(CC) -o $* $< $(CPPFLAGS) -ansi -ffast-math  -I$(X11PATH)/include $(OPTFLAGS) -lX11 -L$(X11PATH)/lib $(LDFLAGS)
  menu:
  	@echo
- 	@echo "CImg Library $(CIMGVER) : Examples"
-@@ -84,7 +84,7 @@
- all: $(CIMGFILES)
+ 	@echo "CImg Library $(CIMG_VERSION) : Examples"
+@@ -92,7 +92,7 @@
+ all: $(CIMG_FILES)
  
  clean:
--	rm -f *.exe *~ $(CIMGFILES)
-+	rm -f *.exe *~ $(CIMGFILES) Makefile.orig
+-	rm -f *.exe *~ $(CIMG_FILES)
++	rm -f *.exe *~ $(CIMG_FILES) Makefile.orig
  
  # Linux/Mac OSX targets
  linux: