3 files changed, 39 insertions, 28 deletions

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