svn commit: r421185 - head/devel/extra-cmake-modules

[Kurt Jaeger]

Author: pi
Date: Wed Aug 31 19:30:51 2016
New Revision: 421185
URL: https://svnweb.freebsd.org/changeset/ports/421185

Log:
  devel/extra-cmake-modules: 5.24.0 -> 5.25.0
  
  - Add TEST port option to match BUILD_TESTING cmake option
    o CAVEAT: TEST=off is currently broken, see upstream bug# in Makefile
  - DOCS requires qcollectiongenerator, added it via QT5=help
  - TEST requires QT5=buildtools_build,linguisttools_build,qmake_build
  - Patches FindQCollectionGenerator cmake test for the correct binary
    path under qt5/
  
  PR:		211375
  MFH:		2016Q3
  Submitted by:	Yuri Victorovich <yuri at rawbw.com> (maintainer)

Modified:
  head/devel/extra-cmake-modules/Makefile
  head/devel/extra-cmake-modules/distinfo
  head/devel/extra-cmake-modules/pkg-plist

Modified: head/devel/extra-cmake-modules/Makefile
==============================================================================
--- head/devel/extra-cmake-modules/Makefile	Wed Aug 31 19:25:30 2016	(r421184)
+++ head/devel/extra-cmake-modules/Makefile	Wed Aug 31 19:30:51 2016	(r421185)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	extra-cmake-modules
-PORTVERSION=	5.24.0
+PORTVERSION=	5.25.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -16,20 +16,33 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	KDE
 
 USES=		cmake
+DOCS_USE=	QT5=help
+TEST_USE=	QT5=buildtools_build,linguisttools_build,qmake_build
 NO_ARCH=	yes
 
 ## options
 
-OPTIONS_DEFINE=	DOCS MANPAGES
-OPTIONS_DEFAULT=MANPAGES
+OPTIONS_DEFINE=	DOCS HELP MANPAGES TEST
+OPTIONS_DEFAULT=HELP MANPAGES TEST # TEST=off fails: https://bugs.kde.org/show_bug.cgi?id=366110
+OPTIONS_SUB=	yes
+
+HELP_DESC=	Generate QtHelp documentation for installed modules
 
 SPHINX_DEP=		sphinx-build:textproc/py-sphinx
 DOCS_BUILD_DEPENDS=	${SPHINX_DEP}
+HELP_BUILD_DEPENDS=	${SPHINX_DEP}
 MANPAGES_BUILD_DEPENDS=	${SPHINX_DEP}
 DOCS_CMAKE_ON=		-DBUILD_HTML_DOCS:BOOL=ON
-DOCS_CMAKE_OFF=	        -DBUILD_HTML_DOCS:BOOL=OFF
+DOCS_CMAKE_OFF=		-DBUILD_HTML_DOCS:BOOL=OFF
+HELP_CMAKE_ON=		-DBUILD_QTHELP_DOCS:BOOL=ON
+HELP_CMAKE_OFF=		-DBUILD_QTHELP_DOCS:BOOL=OFF
 MANPAGES_CMAKE_ON=	-DBUILD_MAN_DOCS:BOOL=ON
 MANPAGES_CMAKE_OFF=	-DBUILD_MAN_DOCS:BOOL=OFF
+TEST_CMAKE_ON=		-DBUILD_TESTING:BOOL=ON
+TEST_CMAKE_OFF=		-DBUILD_TESTING:BOOL=OFF
+
+CONFIGURE_ENV+=		CMAKE_PROGRAM_PATH="${LOCALBASE}/bin:${LOCALBASE}/lib/qt5/bin"
+
 MANPAGES_PLIST_FILES=	\
 	man/man7/ecm-developer.7.gz \
 	man/man7/ecm-find-modules.7.gz \

Modified: head/devel/extra-cmake-modules/distinfo
==============================================================================
--- head/devel/extra-cmake-modules/distinfo	Wed Aug 31 19:25:30 2016	(r421184)
+++ head/devel/extra-cmake-modules/distinfo	Wed Aug 31 19:30:51 2016	(r421185)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468483157
-SHA256 (KDE-extra-cmake-modules-v5.24.0_GH0.tar.gz) = 7e254a3208da0a17bc37d0914993d5d16332681435e88652517681e62ada7537
-SIZE (KDE-extra-cmake-modules-v5.24.0_GH0.tar.gz) = 337129
+TIMESTAMP = 1471093039
+SHA256 (KDE-extra-cmake-modules-v5.25.0_GH0.tar.gz) = 5506d83d742b36f5e3bc536077cb8db7e41bfb7b92d55f42d91536d1214e1d0e
+SIZE (KDE-extra-cmake-modules-v5.25.0_GH0.tar.gz) = 337242

Modified: head/devel/extra-cmake-modules/pkg-plist
==============================================================================
--- head/devel/extra-cmake-modules/pkg-plist	Wed Aug 31 19:25:30 2016	(r421184)
+++ head/devel/extra-cmake-modules/pkg-plist	Wed Aug 31 19:30:51 2016	(r421185)
@@ -161,3 +161,4 @@ share/ECM/toolchain/specifydependencies.
 %%PORTDOCS%%%%DOCSDIR%%/html/search.html
 %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
 %%PORTDOCS%%%%DOCSDIR%%/html/toolchain/Android.html
+%%HELP%%%%DOCSDIR%%/ExtraCMakeModules.qch