Index: net/cppzmq/Makefile =================================================================== --- net/cppzmq/Makefile +++ net/cppzmq/Makefile @@ -4,23 +4,24 @@ PORTNAME= cppzmq PORTVERSION= 4.2.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net MAINTAINER= vd@FreeBSD.org COMMENT= C++ bindings for 0MQ LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libzmq.so:net/libzmq4 -USES= cmake pkgconfig -CMAKE_ARGS= --no-warn-unused-cli -Wno-dev - -# cppzmq is included in libzmq2 -CONFLICTS_INSTALL= libzmq2 +CONFLICTS_INSTALL= libzmq2 # cppzmq is included in libzmq2 +USES= cmake:outsource pkgconfig USE_GITHUB= yes GH_ACCOUNT= zeromq +CMAKE_ARGS= --no-warn-unused-cli -Wno-dev +NO_ARCH= yes PLIST_FILES= \ include/zmq.hpp \ @@ -30,10 +31,4 @@ share/cmake/Modules/cppzmqTargets.cmake \ share/cmake/Modules/libzmqPkgConfigFallback.cmake -post-patch: - ${SED} -i '.orig' \ - -e 's|find_package(ZeroMQ)|find_package(ZeroMQ QUIET)|' \ - -e 's|share/cmake/$${PROJECT_NAME}|share/cmake/Modules|' \ - ${WRKSRC}/CMakeLists.txt - .include Index: net/cppzmq/files/patch-CMakeLists.txt =================================================================== --- /dev/null +++ net/cppzmq/files/patch-CMakeLists.txt @@ -0,0 +1,51 @@ +--- CMakeLists.txt.orig 2017-07-31 13:30:55 UTC ++++ CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0.0) + project(cppzmq) + +-find_package(ZeroMQ) ++find_package(ZeroMQ QUIET) + + # libzmq autotools install: fallback to pkg-config + if(NOT ZeroMQ_FOUND) +@@ -12,7 +12,7 @@ if(NOT ZeroMQ_FOUND) + message(FATAL_ERROR "ZeroMQ was NOT found!") + endif() + +-if (ZeroMQ_FOUND AND (NOT TARGET libzmq OR NOT TARGET libzmq-static)) ++if (ZeroMQ_FOUND AND (NOT TARGET libzmq)) + message(FATAL_ERROR "ZeroMQ version not supported!") + endif() + +@@ -24,26 +24,26 @@ set(CPPZMQ_HEADERS + zmq_addon.hpp + ) + +-foreach (target cppzmq cppzmq-static) ++foreach (target cppzmq) + add_library(${target} INTERFACE) + target_include_directories(${target} INTERFACE $ + $) + endforeach() + + target_link_libraries(cppzmq INTERFACE libzmq) +-target_link_libraries(cppzmq-static INTERFACE libzmq-static) ++#target_link_libraries(cppzmq-static INTERFACE libzmq-static) + + include(GNUInstallDirs) + include(CMakePackageConfigHelpers) + +-install(TARGETS cppzmq cppzmq-static ++install(TARGETS cppzmq + EXPORT ${PROJECT_NAME}-targets) + + install(FILES ${CPPZMQ_HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + # GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share". +-set(CPPZMQ_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}" CACHE STRING "install path for cppzmqConfig.cmake") ++set(CPPZMQ_CMAKECONFIG_INSTALL_DIR "share/cmake/Modules" CACHE STRING "install path for cppzmqConfig.cmake") + + if (NOT CMAKE_VERSION VERSION_LESS 3.0) + export(EXPORT ${PROJECT_NAME}-targets Index: net/cppzmq/files/patch-cppzmqConfig.cmake.in =================================================================== --- /dev/null +++ net/cppzmq/files/patch-cppzmqConfig.cmake.in @@ -0,0 +1,9 @@ +--- cppzmqConfig.cmake.in.orig 2018-02-11 22:56:16 UTC ++++ cppzmqConfig.cmake.in +@@ -33,5 +33,5 @@ if(NOT TARGET @PROJECT_NAME@) + + get_target_property(@PROJECT_NAME@_INCLUDE_DIR cppzmq INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(@PROJECT_NAME@_LIBRARY libzmq LOCATION) +- get_target_property(@PROJECT_NAME@_STATIC_LIBRARY libzmq-static LOCATION) ++ #get_target_property(@PROJECT_NAME@_STATIC_LIBRARY libzmq-static LOCATION) + endif() Index: net/cppzmq/files/patch-libzmqPkgConfigFallback.cmake =================================================================== --- /dev/null +++ net/cppzmq/files/patch-libzmqPkgConfigFallback.cmake @@ -0,0 +1,26 @@ +--- libzmqPkgConfigFallback.cmake.orig 2018-02-11 22:48:06 UTC ++++ libzmqPkgConfigFallback.cmake +@@ -4,17 +4,17 @@ pkg_check_modules(PC_LIBZMQ QUIET libzmq + set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION}) + find_library(ZeroMQ_LIBRARY NAMES libzmq.so + PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS}) +-find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq.a +- PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS}) ++#find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq.a ++# PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS}) + + add_library(libzmq SHARED IMPORTED) + set_property(TARGET libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS}) + set_property(TARGET libzmq PROPERTY IMPORTED_LOCATION ${ZeroMQ_LIBRARY}) + +-add_library(libzmq-static STATIC IMPORTED ${PC_LIBZMQ_INCLUDE_DIRS}) +-set_property(TARGET libzmq-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS}) +-set_property(TARGET libzmq-static PROPERTY IMPORTED_LOCATION ${ZeroMQ_STATIC_LIBRARY}) ++#add_library(libzmq-static STATIC IMPORTED ${PC_LIBZMQ_INCLUDE_DIRS}) ++#set_property(TARGET libzmq-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${PC_LIBZMQ_INCLUDE_DIRS}) ++#set_property(TARGET libzmq-static PROPERTY IMPORTED_LOCATION ${ZeroMQ_STATIC_LIBRARY}) + +-if(ZeroMQ_LIBRARY AND ZeroMQ_STATIC_LIBRARY) ++if(ZeroMQ_LIBRARY) + set(ZeroMQ_FOUND ON) + endif()