Index: head/devel/cpp2py/Makefile
===================================================================
--- head/devel/cpp2py/Makefile	(revision 472574)
+++ head/devel/cpp2py/Makefile	(revision 472575)
@@ -1,36 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	cpp2py
 DISTVERSION=	1.5-19
 DISTVERSIONSUFFIX=	-g5fd079c
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Reflection tools based on clang
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		llvm${LLVM_VER}>0:devel/llvm${LLVM_VER}
 RUN_DEPENDS=	${PY_DEPENDS} \
 		llvm${LLVM_VER}>0:devel/llvm${LLVM_VER}
 
 USES=		cmake:outsource compiler:c++14-lang python:2.7 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	TRIQS
 SHEBANG_FILES=	bin/c*
 CMAKE_ARGS=	-DPYTHON_INTERPRETER:STRING=${PYTHON_CMD} \
 		-DFREEBSD_LLVM_VER:STRING=${LLVM_VER}
 USE_LDCONFIG=	yes
 
 LLVM_VER=	60
 
-post-install: # there's some kind of confusion between cmake's MODULE and CONFIG modes
-	@cd ${STAGEDIR}${PREFIX}/share/cmake/Modules && ${CP} Cpp2PyConfig.cmake FindCpp2Py.cmake # can't be found without this
+post-install: # remove unnecessary files
+	@cd ${STAGEDIR}${PREFIX} && ${RM} share/cpp2py.modulefile share/cpp2pyvars.sh
 
 .include <bsd.port.mk>
Index: head/devel/cpp2py/files/patch-cmake_CMakeLists.txt
===================================================================
--- head/devel/cpp2py/files/patch-cmake_CMakeLists.txt	(revision 472574)
+++ head/devel/cpp2py/files/patch-cmake_CMakeLists.txt	(revision 472575)
@@ -1,11 +1,11 @@
---- cmake/CMakeLists.txt.orig	2018-06-16 19:06:45 UTC
+--- cmake/CMakeLists.txt.orig	2018-06-04 12:58:14 UTC
 +++ cmake/CMakeLists.txt
 @@ -1,6 +1,6 @@
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Cpp2PyConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Cpp2PyConfig.cmake @ONLY)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Cpp2PyConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Cpp2PyConfigVersion.cmake @ONLY)
  
 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Cpp2PyConfig.cmake DESTINATION  ${CMAKE_INSTALL_PREFIX}/share/cmake)
 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Cpp2PyConfigVersion.cmake DESTINATION  ${CMAKE_INSTALL_PREFIX}/share/cmake)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Cpp2PyConfig.cmake DESTINATION  ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Cpp2PyConfigVersion.cmake DESTINATION  ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Cpp2PyConfig.cmake DESTINATION  ${CMAKE_INSTALL_PREFIX}/lib/cmake/cpp2py)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Cpp2PyConfigVersion.cmake DESTINATION  ${CMAKE_INSTALL_PREFIX}/lib/cmake/cpp2py)
  
Index: head/devel/cpp2py/files/patch-cmake_Cpp2PyConfig.cmake.in
===================================================================
--- head/devel/cpp2py/files/patch-cmake_Cpp2PyConfig.cmake.in	(nonexistent)
+++ head/devel/cpp2py/files/patch-cmake_Cpp2PyConfig.cmake.in	(revision 472575)
@@ -0,0 +1,11 @@
+--- cmake/Cpp2PyConfig.cmake.in.orig	2018-06-16 22:36:50 UTC
++++ cmake/Cpp2PyConfig.cmake.in
+@@ -47,7 +47,7 @@ add_executable(c++2rst IMPORTED)        
+ set_property(TARGET c++2rst PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_PREFIX@/bin/c++2rst")
+ 
+ # include the exported targets of this project 
+-include(@CMAKE_INSTALL_PREFIX@/share/cmake/cpp2py-targets.cmake)
++include(@CMAKE_INSTALL_PREFIX@/lib/cmake/cpp2py/cpp2py-targets.cmake)
+ 
+ # FIXME : should we just put the rpath in the cpp2y
+ # FIXME : who needs the rpath ?

Property changes on: head/devel/cpp2py/files/patch-cmake_Cpp2PyConfig.cmake.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/cpp2py/files/patch-cmake_FindLibClang.cmake
===================================================================
--- head/devel/cpp2py/files/patch-cmake_FindLibClang.cmake	(revision 472574)
+++ head/devel/cpp2py/files/patch-cmake_FindLibClang.cmake	(revision 472575)
@@ -1,10 +1,10 @@
---- cmake/FindLibClang.cmake.orig	2018-06-16 18:48:36 UTC
+--- cmake/FindLibClang.cmake.orig	2018-06-04 12:58:14 UTC
 +++ cmake/FindLibClang.cmake
-@@ -30,6 +30,7 @@ else()
+@@ -32,6 +32,7 @@ else()
  SET(TRIAL_LIBRARY_PATHS
   ENV LIBRARY_PATH
   ENV LD_INCLUDE_PATH
 + ${CMAKE_INSTALL_PREFIX}/llvm${FREEBSD_LLVM_VER}/lib
   /usr/lib 
   /usr/lib/x86_64-linux-gnu
-  /usr/lib/llvm-5.0/lib
+  /usr/lib/llvm-6.0/lib
Index: head/devel/cpp2py/files/patch-lib_CMakeLists.txt
===================================================================
--- head/devel/cpp2py/files/patch-lib_CMakeLists.txt	(nonexistent)
+++ head/devel/cpp2py/files/patch-lib_CMakeLists.txt	(revision 472575)
@@ -0,0 +1,8 @@
+--- lib/CMakeLists.txt.orig	2018-06-16 22:38:48 UTC
++++ lib/CMakeLists.txt
+@@ -26,4 +26,4 @@ target_include_directories(cpp2py SYSTEM
+ 
+ # Install the library in lib and prepare an exported cmake file to reimport it
+ install(TARGETS cpp2py DESTINATION lib EXPORT cpp2py-targets)
+-install(EXPORT cpp2py-targets DESTINATION share/cmake)
++install(EXPORT cpp2py-targets DESTINATION lib/cmake/cpp2py)

Property changes on: head/devel/cpp2py/files/patch-lib_CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/cpp2py/pkg-plist
===================================================================
--- head/devel/cpp2py/pkg-plist	(revision 472574)
+++ head/devel/cpp2py/pkg-plist	(revision 472575)
@@ -1,54 +1,51 @@
 bin/c++2cxx
 bin/c++2py
 bin/c++2rst
 bin/cp_rs
 include/cpp2py.hpp
 include/cpp2py/converters/basic_types.hpp
 include/cpp2py/converters/complex.hpp
 include/cpp2py/converters/function.hpp
 include/cpp2py/converters/map.hpp
 include/cpp2py/converters/optional.hpp
 include/cpp2py/converters/pair.hpp
 include/cpp2py/converters/set.hpp
 include/cpp2py/converters/std_array.hpp
 include/cpp2py/converters/string.hpp
 include/cpp2py/converters/tuple.hpp
 include/cpp2py/converters/variant.hpp
 include/cpp2py/converters/vector.hpp
 include/cpp2py/exceptions.hpp
 include/cpp2py/misc.hpp
 include/cpp2py/py_converter.hpp
 include/cpp2py/py_stream.hpp
 include/cpp2py/pyref.hpp
 include/cpp2py/signal_handler.hpp
+lib/cmake/cpp2py/Cpp2PyConfig.cmake
+lib/cmake/cpp2py/Cpp2PyConfigVersion.cmake
+lib/cmake/cpp2py/cpp2py-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/cpp2py/cpp2py-targets.cmake
 lib/libcpp2py.so
 %%PYTHON_SITELIBDIR%%/cpp2cxx/__init__.py
 %%PYTHON_SITELIBDIR%%/cpp2cxx/cpp2cxx.py
 %%PYTHON_SITELIBDIR%%/cpp2py/__init__.py
 %%PYTHON_SITELIBDIR%%/cpp2py/clang_parser.py
 %%PYTHON_SITELIBDIR%%/cpp2py/compiler.py
 %%PYTHON_SITELIBDIR%%/cpp2py/cpp2desc.py
 %%PYTHON_SITELIBDIR%%/cpp2py/cpp2py_info_base.py
 %%PYTHON_SITELIBDIR%%/cpp2py/dependency_analyzer.py
 %%PYTHON_SITELIBDIR%%/cpp2py/doc.py
 %%PYTHON_SITELIBDIR%%/cpp2py/libclang_config.py
 %%PYTHON_SITELIBDIR%%/cpp2py/magic.py
 %%PYTHON_SITELIBDIR%%/cpp2py/mako/converters.cxx
 %%PYTHON_SITELIBDIR%%/cpp2py/mako/desc.py
 %%PYTHON_SITELIBDIR%%/cpp2py/mako/parameters.rst
 %%PYTHON_SITELIBDIR%%/cpp2py/mako/wrap.cxx
 %%PYTHON_SITELIBDIR%%/cpp2py/util.py
 %%PYTHON_SITELIBDIR%%/cpp2py/wrap_generator.py
 %%PYTHON_SITELIBDIR%%/cpp2rst/__init__.py
 %%PYTHON_SITELIBDIR%%/cpp2rst/cpp2rst.py
 %%PYTHON_SITELIBDIR%%/cpp2rst/doc.py
 %%PYTHON_SITELIBDIR%%/cpp2rst/example.py
 %%PYTHON_SITELIBDIR%%/cpp2rst/render_fnt.py
 %%PYTHON_SITELIBDIR%%/cpp2rst/synopsis.py
-share/cmake/Modules/Cpp2PyConfig.cmake
-share/cmake/Modules/Cpp2PyConfigVersion.cmake
-share/cmake/Modules/FindCpp2Py.cmake
-share/cmake/cpp2py-targets-%%CMAKE_BUILD_TYPE%%.cmake
-share/cmake/cpp2py-targets.cmake
-%%DATADIR%%.modulefile
-%%DATADIR%%vars.sh