Date: Wed, 1 Jul 2015 16:20:21 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391078 - in head/net/libcapn: . files Message-ID: <201507011620.t61GKLC8012807@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Jul 1 16:20:20 2015 New Revision: 391078 URL: https://svnweb.freebsd.org/changeset/ports/391078 Log: - Update to 1.0.0 - Refresh patch files - Add LICENSE_FILE PR: 201206 Submitted by: gasol.wu@gmail.com (maintainer) Deleted: head/net/libcapn/files/patch-libcapn.pc.cmake Modified: head/net/libcapn/Makefile head/net/libcapn/distinfo head/net/libcapn/files/patch-CMakeLists.txt Modified: head/net/libcapn/Makefile ============================================================================== --- head/net/libcapn/Makefile Wed Jul 1 16:17:29 2015 (r391077) +++ head/net/libcapn/Makefile Wed Jul 1 16:20:20 2015 (r391078) @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= libcapn -DISTVERSION= 1.0.0beta3 -PORTREVISION= 2 +PORTVERSION= 1.0.0 CATEGORIES= net MAINTAINER= gasol.wu@gmail.com COMMENT= C Library to interact with Apple Push Notification Service LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson @@ -18,6 +18,7 @@ GH_ACCOUNT= adobkin USES= cmake USE_LDCONFIG= yes -CMAKE_ARGS= -DOS_FREEBSD=yes +CMAKE_ARGS= -DOS_FREEBSD=yes \ + -DCAPN_INSTALL_PATH_PKGCONFIG=${PREFIX}/libdata/pkgconfig .include <bsd.port.mk> Modified: head/net/libcapn/distinfo ============================================================================== --- head/net/libcapn/distinfo Wed Jul 1 16:17:29 2015 (r391077) +++ head/net/libcapn/distinfo Wed Jul 1 16:20:20 2015 (r391078) @@ -1,2 +1,2 @@ -SHA256 (adobkin-libcapn-1.0.0beta3_GH0.tar.gz) = e075f391b6040ba7e2436a93b1dce26bc2825b7e5eb8299d0f1fadf003a129c4 -SIZE (adobkin-libcapn-1.0.0beta3_GH0.tar.gz) = 348313 +SHA256 (adobkin-libcapn-1.0.0_GH0.tar.gz) = 03929c13847b059e701edd06c83ff7d024e0aabdf73b684297b65dc717ed8cb9 +SIZE (adobkin-libcapn-1.0.0_GH0.tar.gz) = 1694326 Modified: head/net/libcapn/files/patch-CMakeLists.txt ============================================================================== --- head/net/libcapn/files/patch-CMakeLists.txt Wed Jul 1 16:17:29 2015 (r391077) +++ head/net/libcapn/files/patch-CMakeLists.txt Wed Jul 1 16:20:20 2015 (r391078) @@ -1,6 +1,6 @@ ---- ./CMakeLists.txt.orig 2013-04-27 14:08:27.000000000 +0800 -+++ ./CMakeLists.txt 2014-02-21 08:53:47.000000000 +0800 -@@ -48,20 +48,6 @@ +--- CMakeLists.txt.orig 2014-02-27 11:34:53 UTC ++++ CMakeLists.txt +@@ -65,19 +65,9 @@ ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8) INCLUDE(ExternalProject) @@ -17,44 +17,39 @@ - -INCLUDE_DIRECTORIES ("${CMAKE_CURRENT_SOURCE_DIR}/jansson") -INCLUDE_DIRECTORIES ("${CMAKE_CURRENT_SOURCE_DIR}/jansson/include") -- - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/platform.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/platform.h") - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/version.h") ++FIND_PATH(JANSSON_INCLUDES jansson.h) ++INCLUDE_DIRECTORIES(${JANSSON_INCLUDES}) ++FIND_LIBRARY(JANSSON_LIBRARIES jansson) -@@ -86,7 +72,7 @@ - ENDIF(APN_ARCH_X86_64 AND OS_LINUX) + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/platform.h.cmake" "${PROJECT_BINARY_DIR}/src/platform.h") + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake" "${PROJECT_BINARY_DIR}/src/version.h") +@@ -123,7 +113,7 @@ IF(UNIX) + ENDIF(CAPN_ARCH_X86_64 AND OS_LINUX) ENDIF(LIB_SUFFIX) -- SET(APN_INSTALL_PATH_LIB "${APN_INSTALL_PATH_LIB}/${APN_LIB_NAME}") -+ SET(APN_INSTALL_PATH_LIB "${APN_INSTALL_PATH_LIB}") - SET(APN_INSTALL_PATH_HEADERS "include/${APN_LIB_NAME}") - SET(APN_INSTALL_PATH_BIN "bin") - -@@ -126,12 +112,9 @@ - SET(APN_INSTALL_FULL_PATH_LIB ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}) - MARK_AS_ADVANCED(APN_INSTALL_FULL_PATH_LIB) +- SET(CAPN_INSTALL_PATH_LIB "${CAPN_INSTALL_PATH_LIB}/${CAPN_LIB_NAME}") ++ SET(CAPN_INSTALL_PATH_LIB "${CAPN_INSTALL_PATH_LIB}") + SET(CAPN_PKGCONF_FILE_NAME "libcapn.pc") + CONFIGURE_FILE("${CAPN_PKGCONF_FILE_NAME}.cmake" ${PROJECT_BINARY_DIR}/${CAPN_PKGCONF_FILE_NAME}) + +@@ -142,12 +132,9 @@ IF(UNIX) + + ENDIF(UNIX) -FILE (GLOB JANSSON_SOURCE_FILES jansson/src/*.c) - - SET(APN_SOURCE_FILES + SET(CAPN_SOURCE_FILES src/apn.c src/apn_strings.c - ${JANSSON_SOURCE_FILES} ) - SET(APN_PUBLIC_HEADER_FILES -@@ -175,8 +158,14 @@ - ADD_CUSTOM_TARGET(zip COMMAND ${PROJECT_BINARY_DIR}/win/createpkg.bat) - ENDIF(DEFINED WIN32) - -+ - ADD_LIBRARY(${APN_LIB_NAME} SHARED ${APN_SOURCE_FILES}) - TARGET_LINK_LIBRARIES(${APN_LIB_NAME} ${OPENSSL_LIBRARIES}) -+FIND_PATH(JANSSON_INCLUDES jansson.h) -+INCLUDE_DIRECTORIES(${JANSSON_INCLUDES}) -+FIND_LIBRARY(JANSSON_LIBRARIES jansson) -+TARGET_LINK_LIBRARIES(${APN_LIB_NAME} ${JANSSON_LIBRARIES}) -+ + SET(CAPN_PUBLIC_HEADER_FILES +@@ -199,6 +186,7 @@ ENDIF(DEFINED WIN32) + + ADD_LIBRARY(${CAPN_LIB_NAME} SHARED ${CAPN_SOURCE_FILES}) + TARGET_LINK_LIBRARIES(${CAPN_LIB_NAME} ${OPENSSL_LIBRARIES}) ++TARGET_LINK_LIBRARIES(${CAPN_LIB_NAME} ${JANSSON_LIBRARIES}) IF(DEFINED WIN32) - TARGET_LINK_LIBRARIES(${APN_LIB_NAME} Ws2_32.lib) + TARGET_LINK_LIBRARIES(${CAPN_LIB_NAME} Ws2_32.lib)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507011620.t61GKLC8012807>