From nobody Mon Jul 31 17:48:01 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RF5Ld17rzz4pMhh; Mon, 31 Jul 2023 17:48:04 +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 4RF5LV24NWz3l4n; Mon, 31 Jul 2023 17:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690825682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysa925x9QUPcNv3ljfBz2ZQ9DYEGgFClpTBc0UzLqd0=; b=s2jDHUVMcLjPC4u7LgHDDonBCLowI/B/IxO4TBVP3ygUfMhIOPDcAAH2yjKRIcylX7lJU0 sAKmlz1ExiZ5GQDd9zH50VFZl9FpSU6ZS8jQmQ2c4a/HzOCixwRaVLjOjYdSN6XXWwVdI5 MEHQBO8qICHkeR4KEcKSULITbi3IKSk7gj25W0YGZpSRA+0sbReAwylosDWREA1eJeOe1C 9OjX2mweTFOV3H0V++2jiGW7QuRC4w+8KKsV4iGtKuWQAW+iqWVpaqu9n/VtQ5BlSjVgjf jkZeV/kqavU34hD5GIU0eCBA85yeqAUXwjexyPVdnGwA9Vq0hPHkyDSLfz8Q/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690825682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysa925x9QUPcNv3ljfBz2ZQ9DYEGgFClpTBc0UzLqd0=; b=UsS8FVl10quFyTsgWZNEIdsmZu6evOl7hs2ONHDZgtVAJzIjyziamy5nDs/bUSHyp4hKtn QAu8XmUFqCjXM9fy4YRuipt+DqsLnEEqFpO7EFtc5weRmE8Ih7vLMJoV5DDzylQQKL7aYg 0pyT7XAE5jHbvYNA7/gB/D9uvWGVSj2+pUis9gc2AgCAfSlyD9tmigiwlnjJlfwD7+iIt+ veJYs1De/8zPGbYr5prI014c3iYXCZlNe0NLdkUI0PrjIAgTsa1nzaLE1d+DbvH6ld42t9 0tmUJgQKkwb7h9Y6gS7TGm3FxcAkiW3GY74AW6HNA1mV3kDSig5a+RTkcEDoTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690825682; a=rsa-sha256; cv=none; b=DxG3JRJGbvOV57p/QbrdnQ5PWA8u4EVwxPd9cFp/bcVpI2vYQE49iaTZQc8klEd3PxJfv8 /CoRi11YTmqCCObTgWhaYIt9b2ptnhXrrqboCLk69n0svz5teEBiPHkWKxncU0VqqVbE1P 0NSD9DQdZfNuFMkDc+qne0FADuG47pmTtUUDkfp6l+7v5+HJZuAI0mGhCTLd7I7nrM55Aw DLM43GVOl7BsvdjgnbYZa2+1xvBL85edm+7UI4QQhWGV/uSykdgHiHvYoYVs/4+/pjGpgD gfaV8wVisL90TYsMRSjNlh12qn+iNaBroTRFKwUpfVV/tERPj+8QZTZAP/pzyA== 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 4RF5LT6dCxz14qM; Mon, 31 Jul 2023 17:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VHm1Gi091152; Mon, 31 Jul 2023 17:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VHm1iO091151; Mon, 31 Jul 2023 17:48:01 GMT (envelope-from git) Date: Mon, 31 Jul 2023 17:48:01 GMT Message-Id: <202307311748.36VHm1iO091151@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: f32bf28fa273 - 2023Q3 - databases/libmemcached: Skip libcrypto.pc when using SSL from base system List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: f32bf28fa27305b8f16a44c8f3f58aedc1394fbf Auto-Submitted: auto-generated The branch 2023Q3 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f32bf28fa27305b8f16a44c8f3f58aedc1394fbf commit f32bf28fa27305b8f16a44c8f3f58aedc1394fbf Author: Po-Chuan Hsieh AuthorDate: 2023-07-09 10:17:04 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-07-31 17:47:57 +0000 databases/libmemcached: Skip libcrypto.pc when using SSL from base system - Bump PORTREVISION for package change (cherry picked from commit c25f0c013e88d84c620b2bb8c56158e9ca7f8bef) --- databases/libmemcached/Makefile | 10 +++++++++- databases/libmemcached/files/extra-patch-openssl | 11 +++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile index e044f28499fd..71f031d3014f 100644 --- a/databases/libmemcached/Makefile +++ b/databases/libmemcached/Makefile @@ -1,5 +1,6 @@ PORTNAME= libmemcached PORTVERSION= 1.1.4 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org @@ -44,4 +45,11 @@ MURMUR_CMAKE_BOOL= ENABLE_HASH_MURMUR SASL_CMAKE_BOOL= ENABLE_SASL SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -.include +.include + +# Skip libcrypto.pc while using OpenSSL from base system on older FreeBSD versions which does not skip this file +.if ${SSL_DEFAULT} == base && !exists(/usr/libdata/pkgconfig/libcrypto.pc) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl +.endif + +.include diff --git a/databases/libmemcached/files/extra-patch-openssl b/databases/libmemcached/files/extra-patch-openssl new file mode 100644 index 000000000000..bf65fa7f4ece --- /dev/null +++ b/databases/libmemcached/files/extra-patch-openssl @@ -0,0 +1,11 @@ +--- src/libhashkit/CMakeLists.txt.orig 2023-03-06 08:47:30 UTC ++++ src/libhashkit/CMakeLists.txt +@@ -45,7 +45,7 @@ if(ENABLE_OPENSSL_CRYPTO) + if(OPENSSL_CRYPTO_LIBRARY) + target_compile_definitions(libhashkit PRIVATE HAVE_OPENSSL_CRYPTO) + target_link_libraries(libhashkit PUBLIC OpenSSL::Crypto) +- pkgconfig_export(REQUIRES_PRIVATE libcrypto) ++ pkgconfig_export(REQUIRES_PRIVATE "") + else() + message(WARNING "Could not find OpenSSL::Crypto") + endif()