4 files changed, 58 insertions, 46 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 60a5c1ce8563..12f061386b39 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cimg
-DISTVERSION=	1-09
-PORTREVISION=	4
+DISTVERSION=	1-10
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +16,6 @@ MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	The C++ Template Image Processing Library
 
 USE_ZIP=	yes
-WRKSRC=		${WRKDIR}/CImg
 BUILD_WRKSRC=	${WRKSRC}/examples
 MAKE_ENV=	CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}"	\
 		LDFLAGS="${LDFLAGS} ${LAPACK_LIB} ${PTHREAD_LIBS}"	\
@@ -29,6 +27,9 @@ USE_GCC=	3.4
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 DOCBASE=	CHANGES.txt README.txt
+DOCREFS=	download.shtml favicon.ico favicon.png foot_reference.html	\
+		head.html head_reference.html img index.shtml news.html		\
+		reference screenshots.shtml
 .else
 NOBUILD=	yes
 .endif
@@ -52,13 +53,20 @@ post-patch:
 		${XARGS} ${REINPLACE_CMD} -e 's|img/|${EXAMPLESDIR}/img/|g'
 .endif
 
+.if !defined(NOPORTDOCS)
+post-build:
+	cd ${WRKSRC}/documentation && doxygen CImg.doxygen
+.endif
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/CImg.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/CImg_test ${PREFIX}/bin
 	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/documentation/* ${DOCSDIR}
+. for doc in ${DOCREFS}
+	${CP} -R ${WRKSRC}/documentation/${doc} ${DOCSDIR}
+. endfor
 	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@(cd ${EXAMPLESDIR} && ${MAKE} clean)
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} ${EXAMPLESDIR}
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index cd233e44f6e5..9c3eee24f23f 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,2 +1,3 @@
-MD5 (CImg-1-09.zip) = f88bf8f28c27523ba78edb27798643c2
-SIZE (CImg-1-09.zip) = 2955508
+MD5 (CImg-1-10.zip) = 870605b5e2b1722c7c2b64f0d9eb56d0
+SHA256 (CImg-1-10.zip) = 45e9cad35b929925d3ca5d3234f0d1ae2a450abb516e9b2b8bca081c6310b4aa
+SIZE (CImg-1-10.zip) = 2993324
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index aeada6f928c3..cd7b78eed3c1 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,27 +1,29 @@
---- examples/Makefile.orig	Thu Jun  2 08:51:07 2005
-+++ examples/Makefile	Thu Jun  2 22:49:16 2005
-@@ -7,16 +7,16 @@
+--- examples/Makefile.orig	Fri Nov 18 16:10:03 2005
++++ examples/Makefile	Fri Nov 18 21:32:47 2005
+@@ -7,17 +7,17 @@
  # -----------------------------------------------------------------------------------
  
  # Set correct variables and paths
 -CC      = g++
 -X11PATH = /usr/X11R6
 -CFLAGS  = -Wall -ansi -pedantic -ffast-math -I$(X11PATH)/include
+-LDFLAGS = -lm -lpthread -lX11 -L$(X11PATH)/lib
 +CC      = $(CXX)
 +#X11PATH = /usr/X11R6
 +#CFLAGS  = -Wall -ansi -pedantic -ffast-math -I$(X11PATH)/include
++#LDFLAGS = -lm -lpthread -lX11 -L$(X11PATH)/lib
  
  # Compilation rules
  .cpp:
  	@echo
  	@echo "** Compiling '$*' with '`$(CC) -v 2>&1 | grep version`'"
  	@echo
--	$(CC) -o $* $< $(CFLAGS) $(LDFLAGS)
+-	$(CC) -o $* $< $(CFLAGS) $(LDFLAGS) $(ARCHFLAGS)
 +	$(CC) -o $* $< $(CPPFLAGS) -Wall -ansi -pedantic -ffast-math  -I$(X11PATH)/include -lX11 -L$(X11PATH)/lib $(LDFLAGS)
  linux:
- 	make "LDFLAGS=-lm -lpthread -lX11 -L$(X11PATH)/lib" all
+ 	make all
  solaris:
-@@ -41,6 +41,7 @@
+@@ -42,6 +42,7 @@
  
  clean:
  	rm -f *.exe *~ \
diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist
index 764cae4ed845..6276c66fbf63 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -1,11 +1,11 @@
 %%PORTDOCS%%bin/CImg_test
 include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/CImg.doxygen
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/download.shtml
 %%PORTDOCS%%%%DOCSDIR%%/favicon.ico
 %%PORTDOCS%%%%DOCSDIR%%/favicon.png
+%%PORTDOCS%%%%DOCSDIR%%/foot_reference.html
 %%PORTDOCS%%%%DOCSDIR%%/head.html
 %%PORTDOCS%%%%DOCSDIR%%/head_reference.html
 %%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo.jpg
@@ -62,13 +62,10 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/img/tutorial.jpg
 %%PORTDOCS%%%%DOCSDIR%%/index.shtml
 %%PORTDOCS%%%%DOCSDIR%%/news.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/CImg_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/files.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x61.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x62.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x63.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x64.html
@@ -94,14 +91,15 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x7a.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x7e.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x61.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x62.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x63.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x64.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x65.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x66.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x67.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x68.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x6b.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x6c.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x6d.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x6e.html
@@ -114,9 +112,19 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x76.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x78.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x79.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x7e.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/functions_rela.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__displays.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__drawing.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__environment.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__files__io.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__loops.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__options.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__storage.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__structure.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/modules.html
@@ -126,35 +134,28 @@ 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_1CImg-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImg.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImg.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgArgumentException-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgArgumentException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgArgumentException.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgDisplay-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgDisplay.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgDisplayException-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgDisplayException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgDisplayException.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgException-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgException.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgIOException-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgIOException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgIOException.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgInstanceException-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgInstanceException.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgInstanceException.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgROI-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgROI.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgROI.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgStats-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgStats.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImg_1_1__draw__fill-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImg_1_1__draw__fill.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgl-members.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImgl.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
+%%PORTDOCS%%%%DOCSDIR%%/reference/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/screenshots.shtml
 %%PORTDOCS%%%%EXAMPLESDIR%%/CImg_test.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile