svn commit: r464246 - in head/math/kig-kde4: . files

[Adriaan de Groot]

Author: adridg
Date: Mon Mar 12 11:10:47 2018
New Revision: 464246
URL: https://svnweb.freebsd.org/changeset/ports/464246

Log:
  Prepare for CMake 3.11; avoid a linker error while looking for a header file.
  While here, pet portlint / stage-qa.
  
  Approved by:	tcberner (mentor, implicit)

Added:
  head/math/kig-kde4/files/
  head/math/kig-kde4/files/patch-cmake_modules_FindBoostPython.cmake   (contents, props changed)
Modified:
  head/math/kig-kde4/Makefile

Modified: head/math/kig-kde4/Makefile
==============================================================================
--- head/math/kig-kde4/Makefile	Mon Mar 12 10:44:21 2018	(r464245)
+++ head/math/kig-kde4/Makefile	Mon Mar 12 11:10:47 2018	(r464246)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kig
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde at FreeBSD.org
@@ -12,8 +12,9 @@ LIB_DEPENDS=	${PY_BOOST}
 
 USES=		cmake:outsource compiler:c++11-lib kde:4 python:run \
 		shebangfix tar:xz
-USE_KDE=	kdelibs automoc4
-USE_QT4=	gui xml moc_build qmake_build rcc_build uic_build
+USE_KDE=	kdelibs soprano automoc4
+USE_QT4=	corelib dbus gui network svg xml \
+		moc_build qmake_build rcc_build uic_build
 
 SHEBANG_FILES=	pykig/pykig.py
 

Added: head/math/kig-kde4/files/patch-cmake_modules_FindBoostPython.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/kig-kde4/files/patch-cmake_modules_FindBoostPython.cmake	Mon Mar 12 11:10:47 2018	(r464246)
@@ -0,0 +1,21 @@
+Requiring Boost::Python in the libraries means that the test for the header
+file links to that library -- which in turn needs Python libraryes. Those
+have not been searched for, yet, so the header search fails with linker
+errors. The Python libraries are searched for later in this module.
+
+--- cmake/modules/FindBoostPython.cmake.orig	2018-03-11 22:44:22 UTC
++++ cmake/modules/FindBoostPython.cmake
+@@ -36,10 +36,12 @@ find_package(Boost QUIET COMPONENTS pyth
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_FLAGS     ${CMAKE_REQUIRED_FLAGS}     ${KDE4_ENABLE_EXCEPTIONS})
+ set(CMAKE_REQUIRED_INCLUDES  ${CMAKE_REQUIRED_INCLUDES}  ${Boost_INCLUDE_DIRS})
+-set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${Boost_PYTHON_LIBRARY})
+ 
+ check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
+ 
++# Don't want to try linking with Python libraries while checking the existence of shared_ptr.hpp
++set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${Boost_PYTHON_LIBRARY})
++
+ # This variable is not checked/used when user provide both
+ # BoostPython_INCLUDE_DIRS and BoostPython_LIBRARIES, by design.
+ # If user wants to speed up configure stage, he's allowed to do this.