Attachment #158165 for bug #201206

View | Details | Raw Unified | Return to bug 201206
Collapse All | Expand All




# $FreeBSD: head/net/libcapn/Makefile 385640 2015-05-07 17:26:05Z mat $

PORTNAME=	libcapn
PORTVERSION=	1.0.0
PORTREVISION=	2
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



USES=		cmake
USE_LDCONFIG=	yes
CMAKE_ARGS=	-DOS_FREEBSD=yes \
		-DCAPN_INSTALL_PATH_PKGCONFIG=${PREFIX}/libdata/pkgconfig

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (adobkin-libcapn-1.0.0beta3_GH0.tar.gz) = e075f391b6040ba7e2436a93b1dce26bc2825b7e5eb8299d0f1fadf003a129c4	1	SHA256 (adobkin-libcapn-1.0.0_GH0.tar.gz) = 03929c13847b059e701edd06c83ff7d024e0aabdf73b684297b65dc717ed8cb9
2	SIZE (adobkin-libcapn-1.0.0beta3_GH0.tar.gz) = 348313	2	SIZE (adobkin-libcapn-1.0.0_GH0.tar.gz) = 1694326




--- 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)
 

-
-INCLUDE_DIRECTORIES ("${CMAKE_CURRENT_SOURCE_DIR}/jansson")
-INCLUDE_DIRECTORIES ("${CMAKE_CURRENT_SOURCE_DIR}/jansson/include")
+FIND_PATH(JANSSON_INCLUDES jansson.h)
+INCLUDE_DIRECTORIES(${JANSSON_INCLUDES})
+FIND_LIBRARY(JANSSON_LIBRARIES jansson)
 
 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(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(CAPN_SOURCE_FILES
     src/apn.c
     src/apn_strings.c
-    ${JANSSON_SOURCE_FILES}
 )
 
 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})
 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})
+
 
 IF(DEFINED WIN32)
 TARGET_LINK_LIBRARIES(${CAPN_LIB_NAME} Ws2_32.lib)

Lines 1-8 Link Here

(-)./files/patch-libcapn.pc.cmake (-8 lines)
1	--- ./libcapn.pc.cmake.orig 2013-04-27 14:08:27.000000000 +0800
2	+++ ./libcapn.pc.cmake 2014-02-21 08:53:31.000000000 +0800
3	@@ -3,4 +3,4 @@
4	Version: ${APN_VERSION}
5	Libs: -L${CMAKE_INSTALL_PREFIX}/${APN_INSTALL_PATH_LIB} -l${APN_LIB_NAME}
6	Libs.private: -lopenssl
7	-Cflags: -I${CMAKE_INSTALL_PREFIX}/${APN_INSTALL_PATH_HEADERS}
8	+Cflags: -I${CMAKE_INSTALL_PREFIX}

Return to bug 201206

Lines 2-15 Link Here

(-)./Makefile (-3 / +4 lines)
2	# $FreeBSD: head/net/libcapn/Makefile 385640 2015-05-07 17:26:05Z mat $	2	# $FreeBSD: head/net/libcapn/Makefile 385640 2015-05-07 17:26:05Z mat $
3		3
4	PORTNAME= libcapn	4	PORTNAME= libcapn
5	DISTVERSION= 1.0.0beta3	5	PORTVERSION= 1.0.0
6	PORTREVISION= 2
7	CATEGORIES= net	6	CATEGORIES= net
8		7
9	MAINTAINER= gasol.wu@gmail.com	8	MAINTAINER= gasol.wu@gmail.com
10	COMMENT= C Library to interact with Apple Push Notification Service	9	COMMENT= C Library to interact with Apple Push Notification Service
11		10
12	LICENSE= MIT	11	LICENSE= MIT
		12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson	14	LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson
15		15
Lines 18-23 Link Here
18		18
19	USES= cmake	19	USES= cmake
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21	CMAKE_ARGS= -DOS_FREEBSD=yes	21	CMAKE_ARGS= -DOS_FREEBSD=yes \
		22	-DCAPN_INSTALL_PATH_PKGCONFIG=${PREFIX}/libdata/pkgconfig
22		23
23	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)./files/patch-CMakeLists.txt (-31 / +26 lines)
1	--- ./CMakeLists.txt.orig 2013-04-27 14:08:27.000000000 +0800	1	--- CMakeLists.txt.orig 2014-02-27 11:34:53 UTC
2	+++ ./CMakeLists.txt 2014-02-21 08:53:47.000000000 +0800	2	+++ CMakeLists.txt
3	@@ -48,20 +48,6 @@	3	@@ -65,19 +65,9 @@ ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
4		4
5	INCLUDE(ExternalProject)	5	INCLUDE(ExternalProject)
6		6
Lines 17-60 Link Here
17	-	17	-
18	-INCLUDE_DIRECTORIES ("${CMAKE_CURRENT_SOURCE_DIR}/jansson")	18	-INCLUDE_DIRECTORIES ("${CMAKE_CURRENT_SOURCE_DIR}/jansson")
19	-INCLUDE_DIRECTORIES ("${CMAKE_CURRENT_SOURCE_DIR}/jansson/include")	19	-INCLUDE_DIRECTORIES ("${CMAKE_CURRENT_SOURCE_DIR}/jansson/include")
20	-	20	+FIND_PATH(JANSSON_INCLUDES jansson.h)
21	CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/platform.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/platform.h")	21	+INCLUDE_DIRECTORIES(${JANSSON_INCLUDES})
22	CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/version.h")	22	+FIND_LIBRARY(JANSSON_LIBRARIES jansson)
23		23
24	@@ -86,7 +72,7 @@	24	CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/platform.h.cmake" "${PROJECT_BINARY_DIR}/src/platform.h")
25	ENDIF(APN_ARCH_X86_64 AND OS_LINUX)	25	CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake" "${PROJECT_BINARY_DIR}/src/version.h")
		26	@@ -123,7 +113,7 @@ IF(UNIX)
		27	ENDIF(CAPN_ARCH_X86_64 AND OS_LINUX)
26	ENDIF(LIB_SUFFIX)	28	ENDIF(LIB_SUFFIX)
27		29
28	- SET(APN_INSTALL_PATH_LIB "${APN_INSTALL_PATH_LIB}/${APN_LIB_NAME}")	30	- SET(CAPN_INSTALL_PATH_LIB "${CAPN_INSTALL_PATH_LIB}/${CAPN_LIB_NAME}")
29	+ SET(APN_INSTALL_PATH_LIB "${APN_INSTALL_PATH_LIB}")	31	+ SET(CAPN_INSTALL_PATH_LIB "${CAPN_INSTALL_PATH_LIB}")
30	SET(APN_INSTALL_PATH_HEADERS "include/${APN_LIB_NAME}")	32	SET(CAPN_PKGCONF_FILE_NAME "libcapn.pc")
31	SET(APN_INSTALL_PATH_BIN "bin")	33	CONFIGURE_FILE("${CAPN_PKGCONF_FILE_NAME}.cmake" ${PROJECT_BINARY_DIR}/${CAPN_PKGCONF_FILE_NAME})
32		34
33	@@ -126,12 +112,9 @@	35	@@ -142,12 +132,9 @@ IF(UNIX)
34	SET(APN_INSTALL_FULL_PATH_LIB ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR})	36
35	MARK_AS_ADVANCED(APN_INSTALL_FULL_PATH_LIB)	37	ENDIF(UNIX)
36		38
37	-FILE (GLOB JANSSON_SOURCE_FILES jansson/src/*.c)	39	-FILE (GLOB JANSSON_SOURCE_FILES jansson/src/*.c)
38	-	40	-
39	SET(APN_SOURCE_FILES	41	SET(CAPN_SOURCE_FILES
40	src/apn.c	42	src/apn.c
41	src/apn_strings.c	43	src/apn_strings.c
42	- ${JANSSON_SOURCE_FILES}	44	- ${JANSSON_SOURCE_FILES}
43	)	45	)
44		46
45	SET(APN_PUBLIC_HEADER_FILES	47	SET(CAPN_PUBLIC_HEADER_FILES
46	@@ -175,8 +158,14 @@	48	@@ -199,6 +186,7 @@ ENDIF(DEFINED WIN32)
47	ADD_CUSTOM_TARGET(zip COMMAND ${PROJECT_BINARY_DIR}/win/createpkg.bat)	49
48	ENDIF(DEFINED WIN32)	50	ADD_LIBRARY(${CAPN_LIB_NAME} SHARED ${CAPN_SOURCE_FILES})
49		51	TARGET_LINK_LIBRARIES(${CAPN_LIB_NAME} ${OPENSSL_LIBRARIES})
50	+	52	+TARGET_LINK_LIBRARIES(${CAPN_LIB_NAME} ${JANSSON_LIBRARIES})
51	ADD_LIBRARY(${APN_LIB_NAME} SHARED ${APN_SOURCE_FILES})
52	TARGET_LINK_LIBRARIES(${APN_LIB_NAME} ${OPENSSL_LIBRARIES})
53	+FIND_PATH(JANSSON_INCLUDES jansson.h)
54	+INCLUDE_DIRECTORIES(${JANSSON_INCLUDES})
55	+FIND_LIBRARY(JANSSON_LIBRARIES jansson)
56	+TARGET_LINK_LIBRARIES(${APN_LIB_NAME} ${JANSSON_LIBRARIES})
57	+
58		53
59	IF(DEFINED WIN32)	54	IF(DEFINED WIN32)
60	TARGET_LINK_LIBRARIES(${APN_LIB_NAME} Ws2_32.lib)	55	TARGET_LINK_LIBRARIES(${CAPN_LIB_NAME} Ws2_32.lib)