10 files changed, 49 insertions, 73 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index aa8955f7e3cf..f79ec239c40e 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -185,7 +185,7 @@ RUBY23=			""	# PLIST_SUB helpers
 # Ruby 2.4
 #
 RUBY_RELVERSION=	2.4.0
-RUBY_PORTREVISION=	0
+RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY24=			""	# PLIST_SUB helpers
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 87ea8c5e3d30..9cc798660573 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	avr-libc
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SAVANNAH
@@ -62,6 +63,7 @@ do-install:
 		 ${FIND} . -type f \
 		  \( -name '*.html' -or -name '*.css' -or \
 		     -name '*.jpg' -or -name '*.png' \) |\
+		 ${GREP} -v '/search/' |\
 		 ${SORT} |\
 		 ${SED} -e 's|^\.|share/doc/avr-libc/avr-libc-user-manual|' \
 		 >> ${TMPPLIST})
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index b94784fbdeb3..30ed35ee1ed4 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	doxygen
-PORTVERSION=	1.8.12
+PORTVERSION=	1.8.13
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
@@ -18,34 +18,25 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		bison cmake:outsource iconv python:2 shebangfix
 ALL_TARGET=	all
 CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
-REINPLACE_ARGS=	-i ''
-# I need to look into why it doesn't work with parallel jobs
+# Parallel jobs breaks when the DOCS option is on
 MAKE_JOBS_UNSAFE=	yes
 
-EXTRACT_AFTER_ARGS=	--exclude '*/libmd5' \
-			--exclude '*/libpng' \
-			--exclude '*/tmake'
+EXTRACT_AFTER_ARGS=	--exclude '*/libmd5'
 
 PLIST_FILES=	bin/doxygen
 
-OPTIONS_DEFINE=	GRAPHVIZ LATEX QT4 DOCS
+OPTIONS_DEFINE=	DOCS GRAPHVIZ LATEX SEARCH
 OPTIONS_DEFAULT=	GRAPHVIZ LATEX
-QT4_DESC=	Install Doxywizard GUI
-
-GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
-
-LATEX_USE=	TEX=base,dvipsk,pdftex
-
-QT4_USE=	QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build,uic_build
-QT4_CMAKE_ON=		-Dbuild_wizard:BOOLEAN=ON
-QT4_CMAKE_OFF=		-Dbuild_wizard:BOOLEAN=OFF
-QT4_PLIST_FILES=	bin/doxywizard
+OPTIONS_RADIO=	DOXYWIZARD
+OPTIONS_RADIO_DOXYWIZARD=	QT4 QT5
+QT4_DESC=	Install Doxywizard GUI with Qt4
+QT5_DESC=	Install Doxywizard GUI with Qt5
+SEARCH_DESC=	Build external serach tools (doxysearch and doxyindexer)
 
 DOCS_USES=		ghostscript:build
 DOCS_ALL_TARGET=	docs
 DOCS_BUILD_DEPENDS=	dot:graphics/graphviz
-DOCS_CMAKE_ON=		-Dbuild_doc:BOOLEAN=ON
-DOCS_CMAKE_OFF=		-Dbuild_doc:BOOLEAN=OFF
+DOCS_CMAKE_BOOL=	build_doc
 DOCS_PLIST_FILES=	man/man1/doxygen.1.gz \
 			man/man1/doxyindexer.1.gz \
 			man/man1/doxysearch.1.gz \
@@ -53,6 +44,23 @@ DOCS_PLIST_FILES=	man/man1/doxygen.1.gz \
 DOCS_IMPLIES=		LATEX
 PORTDOCS=		*
 
+GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
+
+LATEX_USE=	TEX=base,dvipsk,pdftex
+
+QT4_USE=	QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build,uic_build
+QT4_CMAKE_ON=	-Dbuild_wizard:BOOLEAN=true -Dforce_qt4:BOOLEAN=true
+QT4_PLIST_FILES=	bin/doxywizard
+
+QT5_USE=	QT5=core,widgets,gui,xml,qmake_build,buildtools_build
+QT5_CMAKE_ON=	-Dbuild_wizard:BOOLEAN=true
+QT5_PLIST_FILES=	bin/doxywizard
+
+SEARCH_CMAKE_BOOL=	build_search
+SEARCH_LIB_DEPENDS=	libxapian.so:databases/xapian-core
+SEARCH_PLIST_FILES=	bin/doxyindexer \
+			bin/doxysearch.cgi
+
 post-patch:
 	@${REINPLACE_CMD} -e '/PERL_PATH/ s|/usr/bin/perl|${perl_CMD}|' \
 		${WRKSRC}/src/config.xml
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index fd21f8b75d43..8f71c2ae212c 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474244407
-SHA256 (doxygen-1.8.12.src.tar.gz) = 792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c
-SIZE (doxygen-1.8.12.src.tar.gz) = 4880613
+TIMESTAMP = 1489419967
+SHA256 (doxygen-1.8.13.src.tar.gz) = af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b
+SIZE (doxygen-1.8.13.src.tar.gz) = 4893912
diff --git a/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt b/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt
index f9a02d779a1c..d1d029ed93ac 100644
--- a/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt
+++ b/devel/doxygen/files/patch-vhdlparser_CMakeLists.txt
@@ -1,8 +1,11 @@
---- vhdlparser/CMakeLists.txt.orig	2015-05-31 19:01:12 UTC
+--- vhdlparser/CMakeLists.txt.orig	2016-05-10 19:51:52 UTC
 +++ vhdlparser/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools)
-+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools)
- add_library(vhdlparser
+@@ -6,7 +6,7 @@ add_custom_command(
+ )
+ set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1)
+ 
+-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
++include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
+ add_library(vhdlparser STATIC
+ ${GENERATED_SRC}/configvalues.h
  CharStream.cc
- ParseException.cc
diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index 23e111da5fca..7948e2dabe18 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdcm
 PORTVERSION=	${GDCM_MAJOR}.${GDCM_MINOR}.${GDCM_PATCH}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/gdcm/gdcm%202.x/GDCM%20${PORTVERSION}
 
@@ -15,21 +15,10 @@ LICENSE=	BSD3CLAUSE
 LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15 \
 		libexpat.so:textproc/expat2
 
-OPTIONS_DEFINE=		DOXYGEN
 OPTIONS_RADIO=		VTK
 OPTIONS_RADIO_VTK=	VTK5 VTK6
 OPTIONS_SUB=		yes
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
-			docbook-xsl-ns>0:textproc/docbook-xsl-ns
-DOXYGEN_USES=		ghostscript
-DOXYGEN_USE=		gnome=libxslt:build tex=latex:build
-DOXYGEN_CMAKE_ON=	-DGDCM_DOCUMENTATION:BOOL=ON \
-			-DGDCM_PDF_DOCUMENTATION:BOOL=OFF \
-			-DGDCM_INSTALL_MAN_DIR:PATH=man \
-			-DGDCM_INSTALL_DOC_DIR:PATH=${DOCSDIR_REL}
-DOXYGEN_CMAKE_OFF=	-DGDCM_DOCUMENTATION:BOOL=OFF
-
 VTK5_DESC=		Build VTK 5 integration classes
 VTK5_LIB_DEPENDS=	libvtkHybrid.so:math/vtk5
 VTK5_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=ON \
@@ -58,7 +47,8 @@ CMAKE_ARGS=	-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
 		-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
 		-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
 		-DGDCM_BUILD_EXAMPLES:BOOL=OFF \
-		-DGDCM_INSTALL_DATA_DIR:PATH=${DATADIR_REL}
+		-DGDCM_INSTALL_DATA_DIR:PATH=${DATADIR_REL} \
+		-DGDCM_DOCUMENTATION:BOOL=OFF
 
 .include <bsd.port.options.mk>
 
@@ -73,12 +63,4 @@ PLIST_SUB+=	GDCM_MAJOR="${GDCM_MAJOR}" \
 		GDCM_MINOR="${GDCM_MINOR}" \
 		GDCM_PATCH="${GDCM_PATCH}"
 
-pre-build-DOXYGEN-on:
-	(cd ${WRKSRC}/Utilities/doxygen \
-		&& ${LOCALBASE}/bin/doxygen -u doxyfile.in)
-
-post-install-DOXYGEN-on:
-	@(${FIND} ${STAGEDIR}${DOCSDIR} -type f | ${SED} -e \
-		"s|^${STAGEDIR}${PREFIX}/||" >> ${TMPPLIST})
-
 .include <bsd.port.mk>
diff --git a/devel/gdcm/pkg-plist b/devel/gdcm/pkg-plist
index 7dc1cdf6e13e..65b8e772529f 100644
--- a/devel/gdcm/pkg-plist
+++ b/devel/gdcm/pkg-plist
@@ -14,23 +14,6 @@ bin/gdcmscu
 bin/gdcmtar
 %%VTK%%bin/gdcmviewer
 bin/gdcmxml
-%%DOXYGEN%%man/man1/gdcm2pnm.1.gz
-%%DOXYGEN%%man/man1/gdcm2vtk.1.gz
-%%DOXYGEN%%man/man1/gdcmanon.1.gz
-%%DOXYGEN%%man/man1/gdcmconv.1.gz
-%%DOXYGEN%%man/man1/gdcmdiff.1.gz
-%%DOXYGEN%%man/man1/gdcmdump.1.gz
-%%DOXYGEN%%man/man1/gdcmgendir.1.gz
-%%DOXYGEN%%man/man1/gdcmimg.1.gz
-%%DOXYGEN%%man/man1/gdcminfo.1.gz
-%%DOXYGEN%%man/man1/gdcmpap3.1.gz
-%%DOXYGEN%%man/man1/gdcmpdf.1.gz
-%%DOXYGEN%%man/man1/gdcmraw.1.gz
-%%DOXYGEN%%man/man1/gdcmscanner.1.gz
-%%DOXYGEN%%man/man1/gdcmscu.1.gz
-%%DOXYGEN%%man/man1/gdcmtar.1.gz
-%%DOXYGEN%%man/man1/gdcmviewer.1.gz
-%%DOXYGEN%%man/man1/gdcmxml.1.gz
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAAbortPDU.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAAssociateACPDU.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAAssociateRJPDU.h
diff --git a/lang/ruby24/pkg-plist b/lang/ruby24/pkg-plist
index 643f295172fa..1b18a05a04bd 100644
--- a/lang/ruby24/pkg-plist
+++ b/lang/ruby24/pkg-plist
@@ -3444,8 +3444,6 @@ man/man1/%%RUBY_NAME%%.1.gz
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d31/structfpreg.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3a/tgamma_8c.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3a/tgamma_8c_source.html
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3c/conftest_8c.html
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3c/conftest_8c_source.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3c/ossl__pkey_8h.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3c/ossl__pkey_8h_source.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/db/d3f/cls__pointer_8c.html
diff --git a/mail/libcmime/Makefile b/mail/libcmime/Makefile
index 57252afbeea4..b65da37369f3 100644
--- a/mail/libcmime/Makefile
+++ b/mail/libcmime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libcmime
 PORTVERSION=	0.1.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libcmime.org/files/
 
diff --git a/mail/libcmime/pkg-plist b/mail/libcmime/pkg-plist
index e1373ff90938..d28043d63673 100644
--- a/mail/libcmime/pkg-plist
+++ b/mail/libcmime/pkg-plist
@@ -103,15 +103,15 @@ libdata/pkgconfig/libcmime.pc
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_14dd74dc80f24763b120f0ff163f9df8_dep.map
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_14dd74dc80f24763b120f0ff163f9df8_dep.md5
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_14dd74dc80f24763b120f0ff163f9df8_dep.png
-%%DOXYGEN%%%%DOCSDIR%%/html/dir_2bb7f550d8e697095cc7f47e9f37ad22.html
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_5c5ffee34b892d1b4d0cf55593804adf.html
-%%DOXYGEN%%%%DOCSDIR%%/html/dir_67f864eb8ebacc07ebdb04fb5b180557.html
-%%DOXYGEN%%%%DOCSDIR%%/html/dir_7e106de535c2fdcdb6daafe445d0af81.html
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_956073a70a76f7335c4dfe03041f0cce.html
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_99da1446927cd2941c13f852e43c52f0.html
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_e428b993447293e8c40322f1ce81b90e.html
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_fb5e4eb41281a43f514336e9345ffcea.html
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_fb5e4eb41281a43f514336e9345ffcea_dep.map
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_fb5e4eb41281a43f514336e9345ffcea_dep.md5
 %%DOXYGEN%%%%DOCSDIR%%/html/dir_fb5e4eb41281a43f514336e9345ffcea_dep.png
+%%DOXYGEN%%%%DOCSDIR%%/html/dir_fd18f8d362bfa7bb7b6aab0781005110.html
 %%DOXYGEN%%%%DOCSDIR%%/html/doc.png
 %%DOXYGEN%%%%DOCSDIR%%/html/doxygen.png
 %%DOXYGEN%%%%DOCSDIR%%/html/dynsections.js