From nobody Sun Jul 09 10:33:52 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 4QzNlh5Xnqz4ljwl; Sun, 9 Jul 2023 10:33:52 +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 4QzNlh52jYz3w4w; Sun, 9 Jul 2023 10:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688898832; 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=dt1EnTc87LhKL8BYCH5R4iNFXLr/Io36wtnjvhdGEIA=; b=r2uPAi74T7wisClrUCiNb4+/wiF0EKO66EjW2UIvo1NdEHKqnNmvmC4SFU1hsxXkv/EvVp X0w6BiRf8acfDB1CURwsaOf75qE0g9gmPgCgdpdyedhsa2lHCdMtPwzfdFILZ3Fzjcv+lv dG3976PbZhGwTVJNCExdwhVY5/WnFc9aYd14HGDrbIcjKtIq9KKfwsZ33asbvEH/TBrZ45 +ZxxVvUVaHxbev/OEdDHfxpPGDxx4mmfuVRHWx7cE7Q7ahKcTowROxQn65ycnL/gUCLSoq /dkXbHGko2sXfG2ANZ+IrtljhpuZ6sykzBOqZLpaZpd+eEo7QM0wdXz097TO0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688898832; 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=dt1EnTc87LhKL8BYCH5R4iNFXLr/Io36wtnjvhdGEIA=; b=xjPk2E2Np+73t5j9lgGksiAu2PKrJtig7lXTJ799ArdRvUfRJ3c2EeAkUmGJef8JIFxW2v Ajhv5dVsQfzZnyZaY7xbgML2SjVczMmSq0aZgVlVZyxVRZn7l3ArPNJu+fBQ1joUcYSff7 Wr1eADNEXwmWz+6LPgk2V+xY25Ta0hA4SzGQ3DebRd2VBOFaudpzJhz2fLWh99hsDxODI8 KyNwRe35dQHrtmeZeZv0kaYv9akhchR0CyjDJrCbAQiejUgjB3o6ix1WQVmwFdOpEhvudJ dIHwQH0k6UQvVcZ4woEttQ1qNCzjLmQ8XSQlB9G6H76IHHOdwMX3+aKL7LpObQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688898832; a=rsa-sha256; cv=none; b=WBrdvIxMa/Fu1xegFtin9hZO9/RC0X65qkZHJVKr9OKwKqObzXHMhSHGFaLH16Drh1EjmZ KXerf4l80dGQyJHgLLMLYRguG/EiEeLFOMdW9zr7qWB3ntsYrcebctBm/GxelMDkSDbQPw oEqvr0vKe1toOEUhh4U1pIfilgMji1JVMY0yygGLxjBB8A8sn+t/aaT9iMwVj6MDkHmfQ5 921CXgyCDV6pphAUI4ipFiSri9pHzfzARveHQeV4R0gPUbB5sIL+aije9OouKXTp9Gbn/g oQKcTYyR1qHH0vcdmAMqhyraYKdM1CywM7LKo20jQfV2DOiy/nQqlsW2Cgg5oQ== 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 4QzNlh3sfNz10MB; Sun, 9 Jul 2023 10:33:52 +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 369AXqaD055563; Sun, 9 Jul 2023 10:33:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369AXqZ7055562; Sun, 9 Jul 2023 10:33:52 GMT (envelope-from git) Date: Sun, 9 Jul 2023 10:33:52 GMT Message-Id: <202307091033.369AXqZ7055562@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: c25f0c013e88 - main - 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/main X-Git-Reftype: branch X-Git-Commit: c25f0c013e88d84c620b2bb8c56158e9ca7f8bef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c25f0c013e88d84c620b2bb8c56158e9ca7f8bef commit c25f0c013e88d84c620b2bb8c56158e9ca7f8bef Author: Po-Chuan Hsieh AuthorDate: 2023-07-09 10:17:04 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-07-09 10:17:04 +0000 databases/libmemcached: Skip libcrypto.pc when using SSL from base system - Bump PORTREVISION for package change --- 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()