Attachment #226061 for bug #256842




# Created by: Geoff Garside

PORTNAME=	rabbitmq-c
PORTVERSION=	0.10.0
DISTVERSIONPREFIX=	v
DISTVERSION=	0.11.0
CATEGORIES=	net

MAINTAINER=	dch@FreeBSD.org

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE-MIT

LIB_DEPENDS=	libpopt.so:devel/popt

USES=		cmake localbase ssl
USE_GITHUB=	yes
USE_LDCONFIG=	yes
GH_ACCOUNT=	alanxz
USE_LDCONFIG=	yes

CMAKE_OFF=	BUILD_EXAMPLES
TEST_TARGET=	test

OPTIONS_DEFINE=	STATIC TEST
OPTIONS_SUB=	yes

TEST_IMPLIES=		STATIC
TEST_CMAKE_BOOL=	BUILD_TESTS

STATIC_CMAKE_BOOL=	BUILD_STATIC_LIBS

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/net/rabbitmq-c/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1623921575	1	TIMESTAMP = 1624699278
2	SHA256 (alanxz-rabbitmq-c-v0.10.0_GH0.tar.gz) = 6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0	2	SHA256 (alanxz-rabbitmq-c-v0.11.0_GH0.tar.gz) = 437d45e0e35c18cf3e59bcfe5dfe37566547eb121e69fca64b98f5d2c1c2d424
3	SIZE (alanxz-rabbitmq-c-v0.10.0_GH0.tar.gz) = 145361	3	SIZE (alanxz-rabbitmq-c-v0.11.0_GH0.tar.gz) = 145638




--- CMakeLists.txt.orig	2021-06-26 16:16:31 UTC
+++ CMakeLists.txt
@@ -319,8 +319,8 @@ foreach (lib ${SOCKET_LIBRARIES})
 endforeach(lib)
 set(libs_private "${libs_private} -l${LIBRT}")
 if (ENABLE_SSL_SUPPORT)
-  set(requires_private "openssl")
-  set(libs_private "${libs_private} ${CMAKE_THREAD_LIBS_INIT}")
+#  set(requires_private "openssl")
+  set(libs_private "${libs_private} -lssl -lcrypto ${CMAKE_THREAD_LIBS_INIT}")
 endif()
 
 set(prefix ${CMAKE_INSTALL_PREFIX})




bin/amqp-consume
bin/amqp-declare-queue
bin/amqp-delete-queue
bin/amqp-get
bin/amqp-publish
include/amqp.h
include/amqp_framing.h
include/amqp_ssl_socket.h
include/amqp_tcp_socket.h
lib/cmake/rabbitmq-c/rabbitmq-c-config-version.cmake
lib/cmake/rabbitmq-c/rabbitmq-c-config.cmake
lib/cmake/rabbitmq-c/rabbitmq-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/rabbitmq-c/rabbitmq-targets.cmake
%%STATIC%%lib/librabbitmq.a
lib/librabbitmq.so
lib/librabbitmq.so.4
lib/librabbitmq.so.4.5.0
libdata/pkgconfig/librabbitmq.pc

Return to bug 256842

Lines 1-8 Link Here

(-)b/net/rabbitmq-c/Makefile (-9 / +13 lines)
1	# Created by: Geoff Garside	1	# Created by: Geoff Garside
2		2
3	PORTNAME= rabbitmq-c	3	PORTNAME= rabbitmq-c
4	PORTVERSION= 0.10.0
5	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
		5	DISTVERSION= 0.11.0
6	CATEGORIES= net	6	CATEGORIES= net
7		7
8	MAINTAINER= dch@FreeBSD.org	8	MAINTAINER= dch@FreeBSD.org
Lines 11-28 COMMENT= RabbitMQ C AMQP client library Link Here
11	LICENSE= MIT	11	LICENSE= MIT
12	LICENSE_FILE= ${WRKSRC}/LICENSE-MIT	12	LICENSE_FILE= ${WRKSRC}/LICENSE-MIT
13		13
14	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR}	14	LIB_DEPENDS= libpopt.so:devel/popt
15		15
16	USES= cmake pathfix python tar:bzip2	16	USES= cmake localbase ssl
17	USE_GITHUB= yes	17	USE_GITHUB= yes
18	USE_LDCONFIG= yes
19	GH_ACCOUNT= alanxz	18	GH_ACCOUNT= alanxz
		19	USE_LDCONFIG= yes
		20
		21	CMAKE_OFF= BUILD_EXAMPLES
		22	TEST_TARGET= test
20		23
21	OPTIONS_DEFINE= POPT	24	OPTIONS_DEFINE= STATIC TEST
22	OPTIONS_SUB= yes	25	OPTIONS_SUB= yes
23	POPT_DESC= Popt support in tools	26
24	POPT_LIB_DEPENDS= libpopt.so:devel/popt	27	TEST_IMPLIES= STATIC
25	POPT_CFLAGS= -I${LOCALBASE}/include	28	TEST_CMAKE_BOOL= BUILD_TESTS
26	POPT_LDFLAGS= -L${LOCALBASE}/lib	29
		30	STATIC_CMAKE_BOOL= BUILD_STATIC_LIBS
27		31
28	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Added Link Here

(-)b/net/rabbitmq-c/files/patch-CMakeLists.txt (+13 lines)
1	--- CMakeLists.txt.orig 2021-06-26 16:16:31 UTC
2	+++ CMakeLists.txt
3	@@ -319,8 +319,8 @@ foreach (lib ${SOCKET_LIBRARIES})
4	endforeach(lib)
5	set(libs_private "${libs_private} -l${LIBRT}")
6	if (ENABLE_SSL_SUPPORT)
7	- set(requires_private "openssl")
8	- set(libs_private "${libs_private} ${CMAKE_THREAD_LIBS_INIT}")
9	+# set(requires_private "openssl")
10	+ set(libs_private "${libs_private} -lssl -lcrypto ${CMAKE_THREAD_LIBS_INIT}")
11	endif()
12
13	set(prefix ${CMAKE_INSTALL_PREFIX})

Lines 1-14 Link Here

(-)b/net/rabbitmq-c/pkg-plist (-7 / +11 lines)
1	%%POPT%%bin/amqp-consume	1	bin/amqp-consume
2	%%POPT%%bin/amqp-declare-queue	2	bin/amqp-declare-queue
3	%%POPT%%bin/amqp-delete-queue	3	bin/amqp-delete-queue
4	%%POPT%%bin/amqp-get	4	bin/amqp-get
5	%%POPT%%bin/amqp-publish	5	bin/amqp-publish
6	include/amqp.h	6	include/amqp.h
7	include/amqp_framing.h	7	include/amqp_framing.h
8	include/amqp_ssl_socket.h	8	include/amqp_ssl_socket.h
9	include/amqp_tcp_socket.h	9	include/amqp_tcp_socket.h
10	lib/librabbitmq.a	10	lib/cmake/rabbitmq-c/rabbitmq-c-config-version.cmake
		11	lib/cmake/rabbitmq-c/rabbitmq-c-config.cmake
		12	lib/cmake/rabbitmq-c/rabbitmq-targets-%%CMAKE_BUILD_TYPE%%.cmake
		13	lib/cmake/rabbitmq-c/rabbitmq-targets.cmake
		14	%%STATIC%%lib/librabbitmq.a
11	lib/librabbitmq.so	15	lib/librabbitmq.so
12	lib/librabbitmq.so.4	16	lib/librabbitmq.so.4
13	lib/librabbitmq.so.4.4.0	17	lib/librabbitmq.so.4.5.0
14	libdata/pkgconfig/librabbitmq.pc	18	libdata/pkgconfig/librabbitmq.pc