From owner-dev-commits-ports-all@freebsd.org Wed Jun 30 20:13:00 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A842364C014; Wed, 30 Jun 2021 20:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GFXb04Qp7z3rNf; Wed, 30 Jun 2021 20:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8017F131EE; Wed, 30 Jun 2021 20:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15UKD0Xw011423; Wed, 30 Jun 2021 20:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15UKD07t011422; Wed, 30 Jun 2021 20:13:00 GMT (envelope-from git) Date: Wed, 30 Jun 2021 20:13:00 GMT Message-Id: <202106302013.15UKD07t011422@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Juraj Lutter Subject: git: bf299f1b74f5 - 2021Q2 - net/rabbitmq-c: Update to 0.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: bf299f1b74f55645289b5cf199d7272c1fe8bf30 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2021 20:13:00 -0000 The branch 2021Q2 has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf299f1b74f55645289b5cf199d7272c1fe8bf30 commit bf299f1b74f55645289b5cf199d7272c1fe8bf30 Author: Daniel Engberg AuthorDate: 2021-06-30 20:04:48 +0000 Commit: Juraj Lutter CommitDate: 2021-06-30 20:12:24 +0000 net/rabbitmq-c: Update to 0.11.0 - Update to 0.11.0 And while here, also: - Rearrage Makefile to Porter's Handbooks guidelines - Remove unneeded Python dependency - Make static library options - Add support for "make test" PR: 256842 Approved by: dch (maintainer) (cherry picked from commit c67a6464ada6bdb6ec5c247ce95330450baed48e) --- net/rabbitmq-c/Makefile | 23 ++++++++++++----------- net/rabbitmq-c/distinfo | 6 +++--- net/rabbitmq-c/files/patch-CMakeLists.txt | 13 +++++++++++++ net/rabbitmq-c/pkg-plist | 18 +++++++++++------- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile index 99692569cc01..631bb381e215 100644 --- a/net/rabbitmq-c/Makefile +++ b/net/rabbitmq-c/Makefile @@ -1,8 +1,8 @@ # Created by: Geoff Garside PORTNAME= rabbitmq-c -PORTVERSION= 0.8.0 DISTVERSIONPREFIX= v +DISTVERSION= 0.11.0 CATEGORIES= net MAINTAINER= dch@FreeBSD.org @@ -11,20 +11,21 @@ COMMENT= RabbitMQ C AMQP client library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE-MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} +LIB_DEPENDS= libpopt.so:devel/popt -CONFLICTS= rabbitmq-c-devel-[0-9]* - -USES= cmake pathfix python tar:bzip2 +USES= cmake localbase ssl USE_GITHUB= yes -USE_LDCONFIG= yes GH_ACCOUNT= alanxz +USE_LDCONFIG= yes -OPTIONS_DEFINE= POPT +CMAKE_OFF= BUILD_EXAMPLES +TEST_TARGET= test + +OPTIONS_DEFINE= STATIC TEST OPTIONS_SUB= yes -POPT_DESC= Popt support in tools -POPT_LIB_DEPENDS= libpopt.so:devel/popt -POPT_CFLAGS= -I${LOCALBASE}/include -POPT_LDFLAGS= -L${LOCALBASE}/lib + +STATIC_CMAKE_BOOL= BUILD_STATIC_LIBS +TEST_IMPLIES= STATIC +TEST_CMAKE_BOOL= BUILD_TESTS .include diff --git a/net/rabbitmq-c/distinfo b/net/rabbitmq-c/distinfo index 9a4b48abf5bf..7e4754df70c0 100644 --- a/net/rabbitmq-c/distinfo +++ b/net/rabbitmq-c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510178940 -SHA256 (alanxz-rabbitmq-c-v0.8.0_GH0.tar.gz) = d8ed9dcb49903d83d79d7b227da35ef68c60e5e0b08d0fc1fb4e4dc577b8802b -SIZE (alanxz-rabbitmq-c-v0.8.0_GH0.tar.gz) = 149150 +TIMESTAMP = 1624699278 +SHA256 (alanxz-rabbitmq-c-v0.11.0_GH0.tar.gz) = 437d45e0e35c18cf3e59bcfe5dfe37566547eb121e69fca64b98f5d2c1c2d424 +SIZE (alanxz-rabbitmq-c-v0.11.0_GH0.tar.gz) = 145638 diff --git a/net/rabbitmq-c/files/patch-CMakeLists.txt b/net/rabbitmq-c/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..4a45c9ad5b6e --- /dev/null +++ b/net/rabbitmq-c/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- 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}) diff --git a/net/rabbitmq-c/pkg-plist b/net/rabbitmq-c/pkg-plist index cc4e6be6c726..db0e02d7fa1b 100644 --- a/net/rabbitmq-c/pkg-plist +++ b/net/rabbitmq-c/pkg-plist @@ -1,14 +1,18 @@ -%%POPT%%bin/amqp-consume -%%POPT%%bin/amqp-declare-queue -%%POPT%%bin/amqp-delete-queue -%%POPT%%bin/amqp-get -%%POPT%%bin/amqp-publish +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/librabbitmq.a +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.2.0 +lib/librabbitmq.so.4.5.0 libdata/pkgconfig/librabbitmq.pc