Reintegrate textproc/clucene-qt5 into devel/qt5-help

As devel/qt5-help is the only consumer of textproc/clucene-qt5 and the latter
it is part of the same distfile we can simplify it, and get rid of clucene-qt5.

This was spotted by Marie Loise Nolden <nolden@kde.org> -- thanks :)

Reviewed by:	rakuco
Approved by:	rakuco (mentor)
Sponsored by:	https://reviews.freebsd.org/D8638

11 files changed, 39 insertions, 146 deletions

diff --git a/MOVED b/MOVED
index f51c7a0bbe8a..1416320661c1 100644
--- a/MOVED
+++ b/MOVED
@@ -8809,3 +8809,4 @@ security/krb5-112||2016-11-20|Has expired: EOL twelve months after release of kr
 astro/osmium|astro/libosmium|2016-11-23|Rename according to upstream
 deskutils/xfce4-notification-daemon|deskutils/xfce4-notifyd|2016-11-23|Has expired: No longer supported by upstream, replaced with deskutils/xfce4-notifyd
 archivers/brotli|archivers/py-brotli|2016-11-24|Brotli is a python module
+textproc/clucene-qt5||2016-11-25|Reintegrated into devel/qt5-help
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index f92fe9b0e0e5..e208fcac734f 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -293,14 +293,14 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
 				--with-extra-libs=${LOCALBASE}/lib
 .endif # !defined(QT_NONSTANDARD)
 
-_USE_QT_ALL=	assistant clucene dbus declarative designer doc gui help \
+_USE_QT_ALL=	assistant dbus declarative designer doc gui help \
 				imageformats l10n linguist linguisttools multimedia \
 				network opengl pixeltool qdbusviewer qmake script \
 				scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
 				sql-sqlite2 sql-sqlite3 svg testlib webkit \
 				xml xmlpatterns
 
-_USE_QT4_ONLY=	accessible assistant-adp assistantclient codecs-cn codecs-jp \
+_USE_QT4_ONLY=	accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
 				codecs-kr codecs-tw corelib demo graphicssystems-opengl \
 				help-tools iconengines inputmethods makeqpf moc phonon \
 				phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile
index 94aba6838f02..daf48afb04b3 100644
--- a/devel/qt5-help/Makefile
+++ b/devel/qt5-help/Makefile
@@ -2,13 +2,14 @@
 
 PORTNAME=	help
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt online help integration module
 
-USE_QT5=	clucene core gui network sql widgets \
+USE_QT5=	core gui network sql widgets \
 		buildtools_build sql-sqlite3_run
 QT_DIST=	tools
 USES=		qmake
diff --git a/devel/qt5-help/files/patch-src__assistant__assistant.pro b/devel/qt5-help/files/patch-src__assistant__assistant.pro
index ff28ef284d97..7df0e599289f 100644
--- a/devel/qt5-help/files/patch-src__assistant__assistant.pro
+++ b/devel/qt5-help/files/patch-src__assistant__assistant.pro
@@ -4,20 +4,18 @@ missing dependencies.
 clucene/ is built in textproc/clucene-qt5, assistant/ is built in
 devel/qt5-assistant.
 
---- src/assistant/assistant.pro
+--- src/assistant/assistant.pro.orig	2016-08-31 07:07:13 UTC
 +++ src/assistant/assistant.pro
-@@ -1,20 +1,15 @@
- TEMPLATE = subdirs
+@@ -2,19 +2,16 @@ TEMPLATE = subdirs
  
--SUBDIRS += clucene \
--           help \
+ SUBDIRS += clucene \
+            help \
 -           assistant \
-+SUBDIRS += help \
             qhelpgenerator \
             qcollectiongenerator \
             qhelpconverter
  
--help.depends = clucene
+ help.depends = clucene
 -assistant.depends = help
  qhelpgenerator.depends = help
  qcollectiongenerator.depends = help
diff --git a/devel/qt5-help/pkg-plist b/devel/qt5-help/pkg-plist
index 4215be22a677..382ab68ccc3c 100644
--- a/devel/qt5-help/pkg-plist
+++ b/devel/qt5-help/pkg-plist
@@ -1,3 +1,25 @@
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qanalyzer_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qclucene-config_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qclucene_global_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qdocument_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qfield_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qfilter_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qhits_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qindexreader_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qindexwriter_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qquery_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qqueryparser_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qreader_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qsearchable_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qsort_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qterm_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qtoken_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qtokenizer_p.h
+%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qtokenstream_p.h
+%%QT_INCDIR%%/QtCLucene/QtCLucene
+%%QT_INCDIR%%/QtCLucene/QtCLuceneDepends
+%%QT_INCDIR%%/QtCLucene/QtCLuceneVersion
+%%QT_INCDIR%%/QtCLucene/qtcluceneversion.h
 %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qclucenefieldnames_p.h
 %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h
 %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdatainterface_p.h
@@ -38,6 +60,12 @@
 %%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfigExtras.cmake
 %%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfigVersion.cmake
+%%QT_LIBDIR%%/libQt5CLucene.prl
+%%QT_LIBDIR%%/libQt5CLucene.so
+%%QT_LIBDIR%%/libQt5CLucene.so.5
+%%QT_LIBDIR%%/libQt5CLucene.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%.debug
 %%QT_LIBDIR%%/libQt5Help.prl
 %%QT_LIBDIR%%/libQt5Help.so
 %%QT_LIBDIR%%/libQt5Help.so.5
@@ -47,6 +75,7 @@
 %%QT_BINDIR%%/qcollectiongenerator
 %%QT_BINDIR%%/qhelpconverter
 %%QT_BINDIR%%/qhelpgenerator
+%%QT_MKSPECDIR%%/modules/qt_lib_clucene_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_help.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
 libdata/pkgconfig/Qt5Help.pc
diff --git a/textproc/Makefile b/textproc/Makefile
index f0a248a0e946..ec39668cda2e 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -81,7 +81,6 @@
     SUBDIR += clit
     SUBDIR += clucene
     SUBDIR += clucene-qt4
-    SUBDIR += clucene-qt5
     SUBDIR += cmark
     SUBDIR += coccigrep
     SUBDIR += code2html
diff --git a/textproc/clucene-qt5/Makefile b/textproc/clucene-qt5/Makefile
deleted file mode 100644
index b0f6961b4846..000000000000
--- a/textproc/clucene-qt5/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	clucene
-DISTVERSION=	${QT5_VERSION}
-CATEGORIES=	textproc
-PKGNAMEPREFIX=	qt5-
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt bindings for the CLucene full-text search library
-
-DEPRECATED=	This port will be merged with qt5-help in Qt 5.7 ports.
-EXPIRATION_DATE=	2016-08-11
-
-USE_QT5=	core buildtools_build
-QT_DIST=	tools
-USES=		qmake
-USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
-
-BUILD_WRKSRC=	${WRKSRC}/src/assistant/${PORTNAME}
-INSTALL_WRKSRC=	${WRKSRC}/src/assistant/${PORTNAME}
-
-.include <bsd.port.mk>
diff --git a/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp b/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp
deleted file mode 100644
index 2047d2861f89..000000000000
--- a/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
-+++ src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
-@@ -11,6 +11,8 @@
- CL_NS_USE(index)
- CL_NS_DEF(search)
- 
-+using ::wcschr;
-+
- FieldCacheImpl::FieldCacheImpl():
-     cache(false,true){
- }
diff --git a/textproc/clucene-qt5/files/patch-src__assistant__assistant.pro b/textproc/clucene-qt5/files/patch-src__assistant__assistant.pro
deleted file mode 100644
index 5defce3a9904..000000000000
--- a/textproc/clucene-qt5/files/patch-src__assistant__assistant.pro
+++ /dev/null
@@ -1,28 +0,0 @@
-Only enter the directories we want to build, otherwise we might fail due to
-missing dependencies.
-
---- src/assistant/assistant.pro
-+++ src/assistant/assistant.pro
-@@ -1,21 +1,3 @@
- TEMPLATE = subdirs
- 
--SUBDIRS += clucene \
--           help \
--           assistant \
--           qhelpgenerator \
--           qcollectiongenerator \
--           qhelpconverter
--
--help.depends = clucene
--assistant.depends = help
--qhelpgenerator.depends = help
--qcollectiongenerator.depends = help
--qhelpconverter.depends = help
--
--qtNomakeTools( \
--    assistant \
--    qhelpgenerator \
--    qcollectiongenerator \
--    qhelpconverter \
--)
-+SUBDIRS += clucene
diff --git a/textproc/clucene-qt5/files/patch-src__src.pro b/textproc/clucene-qt5/files/patch-src__src.pro
deleted file mode 100644
index 72825f82f0ea..000000000000
--- a/textproc/clucene-qt5/files/patch-src__src.pro
+++ /dev/null
@@ -1,45 +0,0 @@
-Only enter the directories we want to build, otherwise we might fail due to
-missing dependencies.
-
---- src/src.pro.orig	2016-02-24 20:44:09 UTC
-+++ src/src.pro
-@@ -1,38 +1,3 @@
- TEMPLATE = subdirs
- 
--qtHaveModule(widgets) {
--    no-png {
--        message("Some graphics-related tools are unavailable without PNG support")
--    } else {
--        SUBDIRS = assistant \
--                  pixeltool \
--                  qtestlib \
--                  designer
--
--        linguist.depends = designer
--    }
--}
--
--SUBDIRS += linguist \
--    qdoc \
--    qtplugininfo
--if(!android|android_app):!ios: SUBDIRS += qtpaths
--
--mac {
--    SUBDIRS += macdeployqt
--}
--
--android {
--    SUBDIRS += androiddeployqt
--}
--
--qtHaveModule(dbus): SUBDIRS += qdbus
--
--win32|winrt:SUBDIRS += windeployqt
--winrt:SUBDIRS += winrtrunner
--qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
--
--qtNomakeTools( \
--    pixeltool \
--    macdeployqt \
--)
-+SUBDIRS = assistant
diff --git a/textproc/clucene-qt5/pkg-plist b/textproc/clucene-qt5/pkg-plist
deleted file mode 100644
index 6bb72a72f673..000000000000
--- a/textproc/clucene-qt5/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qanalyzer_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qclucene-config_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qclucene_global_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qdocument_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qfield_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qfilter_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qhits_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qindexreader_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qindexwriter_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qquery_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qqueryparser_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qreader_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qsearchable_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qsort_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qterm_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qtoken_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qtokenizer_p.h
-%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qtokenstream_p.h
-%%QT_INCDIR%%/QtCLucene/QtCLucene
-%%QT_INCDIR%%/QtCLucene/QtCLuceneDepends
-%%QT_INCDIR%%/QtCLucene/QtCLuceneVersion
-%%QT_INCDIR%%/QtCLucene/qtcluceneversion.h
-%%QT_LIBDIR%%/libQt5CLucene.prl
-%%QT_LIBDIR%%/libQt5CLucene.so
-%%QT_LIBDIR%%/libQt5CLucene.so.5
-%%QT_LIBDIR%%/libQt5CLucene.so.%%SHORTVER%%
-%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%
-%%DEBUG%%%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%.debug
-%%QT_MKSPECDIR%%/modules/qt_lib_clucene_private.pri