svn commit: r427126 - in head: . Mk devel/qt5-help devel/qt5-help/files textproc textproc/clucene-qt5

Fri Nov 25 20:28:55 UTC 2016

Author: tcberner
Date: Fri Nov 25 20:28:53 2016
New Revision: 427126
URL: https://svnweb.freebsd.org/changeset/ports/427126

Log:
  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 at kde.org> -- thanks :)
  
  Reviewed by:	rakuco
  Approved by:	rakuco (mentor)
  Sponsored by:	https://reviews.freebsd.org/D8638

Deleted:
  head/textproc/clucene-qt5/
Modified:
  head/MOVED
  head/Mk/bsd.qt.mk
  head/devel/qt5-help/Makefile
  head/devel/qt5-help/files/patch-src__assistant__assistant.pro
  head/devel/qt5-help/pkg-plist
  head/textproc/Makefile

Modified: head/MOVED
==============================================================================

--- head/MOVED	Fri Nov 25 19:24:49 2016	(r427125)
+++ head/MOVED	Fri Nov 25 20:28:53 2016	(r427126)
@@ -8809,3 +8809,4 @@ security/krb5-112||2016-11-20|Has expire
 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

Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk	Fri Nov 25 19:24:49 2016	(r427125)
+++ head/Mk/bsd.qt.mk	Fri Nov 25 20:28:53 2016	(r427126)
@@ -293,14 +293,14 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_
 				--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 \

Modified: head/devel/qt5-help/Makefile
==============================================================================
--- head/devel/qt5-help/Makefile	Fri Nov 25 19:24:49 2016	(r427125)
+++ head/devel/qt5-help/Makefile	Fri Nov 25 20:28:53 2016	(r427126)
@@ -2,13 +2,14 @@
 
 PORTNAME=	help
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde at 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

Modified: head/devel/qt5-help/files/patch-src__assistant__assistant.pro
==============================================================================
--- head/devel/qt5-help/files/patch-src__assistant__assistant.pro	Fri Nov 25 19:24:49 2016	(r427125)
+++ head/devel/qt5-help/files/patch-src__assistant__assistant.pro	Fri Nov 25 20:28:53 2016	(r427126)
@@ -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

Modified: head/devel/qt5-help/pkg-plist
==============================================================================
--- head/devel/qt5-help/pkg-plist	Fri Nov 25 19:24:49 2016	(r427125)
+++ head/devel/qt5-help/pkg-plist	Fri Nov 25 20:28:53 2016	(r427126)
@@ -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

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Fri Nov 25 19:24:49 2016	(r427125)
+++ head/textproc/Makefile	Fri Nov 25 20:28:53 2016	(r427126)
@@ -81,7 +81,6 @@
     SUBDIR += clit
     SUBDIR += clucene
     SUBDIR += clucene-qt4
-    SUBDIR += clucene-qt5
     SUBDIR += cmark
     SUBDIR += coccigrep
     SUBDIR += code2html
