diff --git a/devel/cpp2py/Makefile b/devel/cpp2py/Makefile index 698f04c8cff8..0ea73bacd2ab 100644 --- a/devel/cpp2py/Makefile +++ b/devel/cpp2py/Makefile @@ -1,19 +1,14 @@ # $FreeBSD$ PORTNAME= cpp2py -DISTVERSION= 1.5-19 -DISTVERSIONSUFFIX= -g5fd079c -PORTREVISION= 3 +DISTVERSION= 1.5.20200812 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= Reflection tools based on clang -LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/COPYING.txt - -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-08-15 +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt PY_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ @@ -24,13 +19,13 @@ BUILD_DEPENDS= ${PY_DEPENDS} \ RUN_DEPENDS= ${PY_DEPENDS} \ llvm${LLVM_VER}>0:devel/llvm${LLVM_VER} -USES= cmake compiler:c++14-lang python:2.7 shebangfix +USES= cmake compiler:c++14-lang python shebangfix USE_GITHUB= yes GH_ACCOUNT= TRIQS +GH_TAGNAME= 10ab97d2e5e56656227a74118943de02e2265292 SHEBANG_FILES= bin/c* CMAKE_ARGS= -DPYTHON_INTERPRETER:STRING=${PYTHON_CMD} \ -DFREEBSD_LLVM_VER:STRING=${LLVM_VER} -USE_LDCONFIG= yes LLVM_VER= 60 diff --git a/devel/cpp2py/distinfo b/devel/cpp2py/distinfo index 155472324e0e..c82cd01e4c4e 100644 --- a/devel/cpp2py/distinfo +++ b/devel/cpp2py/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529178465 -SHA256 (TRIQS-cpp2py-1.5-19-g5fd079c_GH0.tar.gz) = d989a9a76ad8a326331705263021222e3adb1fd0c83ee1ce7e89bb220b00e2d7 -SIZE (TRIQS-cpp2py-1.5-19-g5fd079c_GH0.tar.gz) = 81459 +TIMESTAMP = 1597389977 +SHA256 (TRIQS-cpp2py-1.5.20200812-10ab97d2e5e56656227a74118943de02e2265292_GH0.tar.gz) = 009d0114688a763c98cf4a63eee3396426cde170306cb117fa61613b604d5223 +SIZE (TRIQS-cpp2py-1.5.20200812-10ab97d2e5e56656227a74118943de02e2265292_GH0.tar.gz) = 87916 diff --git a/devel/cpp2py/files/patch-CMakeLists.txt b/devel/cpp2py/files/patch-CMakeLists.txt index 868359c667ac..fa705c8a2643 100644 --- a/devel/cpp2py/files/patch-CMakeLists.txt +++ b/devel/cpp2py/files/patch-CMakeLists.txt @@ -1,23 +1,24 @@ ---- CMakeLists.txt.orig 2018-06-04 12:58:14 UTC +--- CMakeLists.txt.orig 2020-08-12 19:00:53 UTC +++ CMakeLists.txt -@@ -24,14 +24,14 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SO +@@ -27,14 +27,15 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cm # log info message( STATUS "-------- cpp2py version and git hash detection -------------") --find_package(Git) -+#find_package(Git) +-find_package(Git) ++#find_package(Git) - # Get the version number from the latest annotated git tag --execute_process(COMMAND bash "-c" "${GIT_EXECUTABLE} describe | sed \"s/-\\([0-9]*\\)-.*/.\\1/g\"" -- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" -- OUTPUT_VARIABLE CPP2PY_VERSION + # Get the Git Hash +-execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" +- OUTPUT_VARIABLE CPP2PY_GIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE -) -+#execute_process(COMMAND bash "-c" "${GIT_EXECUTABLE} describe | sed \"s/-\\([0-9]*\\)-.*/.\\1/g\"" -+# WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" -+# OUTPUT_VARIABLE CPP2PY_VERSION ++#execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD ++# WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" ++# OUTPUT_VARIABLE CPP2PY_GIT_HASH +# OUTPUT_STRIP_TRAILING_WHITESPACE +#) - if(NOT CPP2PY_VERSION) - set(CPP2PY_VERSION 1.5) - endif() ++set(CPP2PY_GIT_HASH "00000000") + + message(STATUS "Cpp2py version : ${CPP2PY_VERSION}") + message(STATUS "Git hash : ${CPP2PY_GIT_HASH}") diff --git a/devel/cpp2py/files/patch-cmake_CMakeLists.txt b/devel/cpp2py/files/patch-cmake_CMakeLists.txt deleted file mode 100644 index 7f6ab7b1c5ec..000000000000 --- a/devel/cpp2py/files/patch-cmake_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- 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}/lib/cmake/cpp2py) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Cpp2PyConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/cpp2py) - diff --git a/devel/cpp2py/files/patch-cmake_Cpp2PyConfig.cmake.in b/devel/cpp2py/files/patch-cmake_Cpp2PyConfig.cmake.in deleted file mode 100644 index 926f9a4a173a..000000000000 --- a/devel/cpp2py/files/patch-cmake_Cpp2PyConfig.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 ? diff --git a/devel/cpp2py/files/patch-cmake_FindLibClang.cmake b/devel/cpp2py/files/patch-cmake_FindLibClang.cmake deleted file mode 100644 index 9c7921df919f..000000000000 --- a/devel/cpp2py/files/patch-cmake_FindLibClang.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake/FindLibClang.cmake.orig 2018-06-04 12:58:14 UTC -+++ cmake/FindLibClang.cmake -@@ -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-6.0/lib diff --git a/devel/cpp2py/files/patch-lib_CMakeLists.txt b/devel/cpp2py/files/patch-lib_CMakeLists.txt deleted file mode 100644 index cbc287e6a155..000000000000 --- a/devel/cpp2py/files/patch-lib_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- 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) diff --git a/devel/cpp2py/pkg-plist b/devel/cpp2py/pkg-plist index 383efce4b415..ee4f1b029925 100644 --- a/devel/cpp2py/pkg-plist +++ b/devel/cpp2py/pkg-plist @@ -2,7 +2,6 @@ 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 @@ -15,17 +14,22 @@ include/cpp2py/converters/string.hpp include/cpp2py/converters/tuple.hpp include/cpp2py/converters/variant.hpp include/cpp2py/converters/vector.hpp +include/cpp2py/cpp2py.hpp include/cpp2py/exceptions.hpp +include/cpp2py/get_module.hpp +include/cpp2py/macros.hpp include/cpp2py/misc.hpp +include/cpp2py/numpy_proxy.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 +include/cpp2py/traits.hpp +lib/cmake/Cpp2Py/Cpp2PyConfig.cmake +lib/cmake/Cpp2Py/Cpp2PyConfigVersion.cmake +lib/cmake/Cpp2Py/Cpp2PyTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Cpp2Py/Cpp2PyTargets.cmake +lib/libcpp2py.a %%PYTHON_SITELIBDIR%%/cpp2cxx/__init__.py %%PYTHON_SITELIBDIR%%/cpp2cxx/cpp2cxx.py %%PYTHON_SITELIBDIR%%/cpp2py/__init__.py @@ -41,11 +45,15 @@ lib/libcpp2py.so %%PYTHON_SITELIBDIR%%/cpp2py/mako/desc.py %%PYTHON_SITELIBDIR%%/cpp2py/mako/parameters.rst %%PYTHON_SITELIBDIR%%/cpp2py/mako/wrap.cxx +%%PYTHON_SITELIBDIR%%/cpp2py/processed_doc.py %%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/global_vars.py +%%PYTHON_SITELIBDIR%%/cpp2rst/processed_doc.py %%PYTHON_SITELIBDIR%%/cpp2rst/render_fnt.py +%%PYTHON_SITELIBDIR%%/cpp2rst/renderers.py %%PYTHON_SITELIBDIR%%/cpp2rst/synopsis.py