From nobody Sun Aug 18 15:04:40 2024 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 4WmzXm4n9Kz5TGMP; Sun, 18 Aug 2024 15:04:40 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WmzXm2PBLz4gmj; Sun, 18 Aug 2024 15:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723993480; 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=H5veSqFZgV+p4ESWp/Z4ONNBb0+IvDw+zbWRflMUoH4=; b=x5/NLIahYPb7m5EvucSA5r3sitSm+vP2EI0zRP1OdOv1wlGuJamTARaVzeNjUAMc51caVw tRhMtX1R+wGHBPilPSDX+rpo5LyL76pA2k7reOLtuVGYmFTh/v81VB5VL5Ba1ny3nd3klK Av/qZvtKLRtHsL3CTuFme31mFmsiBeZJRp/M/edUgqip38wF/C59iwIkcB5vnVR8ZXoCHV ihFsOHZ8/d8JkghSxBdssZHZN6xtkvxbK71o+7suoVzUPkiFveSbN7ZiODMAaO/hJqmYTn wE1/AP4HaAbvgEJaZb5w3pAvlz0MPSA2NlaICU+GsxWp0NkzIWhmJ7pDUb++Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723993480; a=rsa-sha256; cv=none; b=RzEgShaYmqSLQ9gu10H0U5vg+sBAOgw6Sg5GG9ZbcUSWCl0CQ42vUGMJ8t3dTg49d+Gasn ouM5EPxR9k02BUjgkVq2Hsoai4ySywG8jrtghUKoW3vMWG/go6PqPFP7snGjyih1hne5jY f7M7vQkNW4qSSCaLU3QXpZFgC1WpMKlQmC60fHjimjUVUrS4uhCYGMhZv4sxa4DcbDh3yU 1bMrMwDMZjKhACLbeSKE8Wp1h5VxnUCtyejL/BhcvBwmAda9CBK6A+8ZoEkft5QFiiuPsz bHZh2X4vQ88XqjKXuG7OXeuckL7WNZXKLTYt+SjriOiRUom34NKQYcc44lX91Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723993480; 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=H5veSqFZgV+p4ESWp/Z4ONNBb0+IvDw+zbWRflMUoH4=; b=FWKUxTEdrnuF+7RxUPdCJDbElO566wXS22DIJNCU1Qqjtr6poyL3rokZoaq+1vqa9dxJ8P VwEuWrg4fNXxJ9OdD9dtDj6YU45AeiPm9PMIptwXXpZDqWhRskHif3sM1WqWkksZy1REFq 68yxfoK/PCnXm8K0Z8ZiMj23PQC9/m49s+UKHmMtqiULVhHZ6LKfMd3l+uOv8hRoFScicW vV72AoWxSmR0b/2IbFKQwRX3bpYvE3bKwmPkwQYtS7jgjRlqmqgIyxq/OUEHRRxldyaH/b qz2DDwlSLE40SwZlu80UdjodwCxVTKwP0brUowbFUlLYKObttO6/jYfg1O0t3g== 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 4WmzXm1JlvzctX; Sun, 18 Aug 2024 15:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47IF4eRd009604; Sun, 18 Aug 2024 15:04:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47IF4e9e009601; Sun, 18 Aug 2024 15:04:40 GMT (envelope-from git) Date: Sun, 18 Aug 2024 15:04:40 GMT Message-Id: <202408181504.47IF4e9e009601@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: a26eec01a598 - main - devel/objfw: Improve Makefile 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a26eec01a598c88de2c1ec39ea7b2c011d78dc5f Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a26eec01a598c88de2c1ec39ea7b2c011d78dc5f commit a26eec01a598c88de2c1ec39ea7b2c011d78dc5f Author: Vladimir Druzenko AuthorDate: 2024-08-18 14:55:43 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-18 14:55:43 +0000 devel/objfw: Improve Makefile - Sort options to pet portclippy. - Rename option SSL to TLS: TLS used in PLIST_SUB and in name of the so library installed with this option - libobjfwtls.so.1. - Add strip libobjfwtls.so.1 to TLS option MBEDTLS too. PR: 280876 Approved by: Jonathan Schleifer (maintainer) --- devel/objfw/Makefile | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/devel/objfw/Makefile b/devel/objfw/Makefile index 6d31fb006cf3..ac030937496a 100644 --- a/devel/objfw/Makefile +++ b/devel/objfw/Makefile @@ -18,32 +18,32 @@ GNU_CONFIGURE= yes TEST_TARGET= check OPTIONS_DEFINE= DOCS -OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MBEDTLS NOSSL OPTIONS_DEFAULT= OPENSSL -NOSSL_DESC= no SSL/TLS support +OPTIONS_SINGLE= TLS +OPTIONS_SINGLE_TLS= OPENSSL GNUTLS MBEDTLS NOTLS +NOTLS_DESC= no SSL/TLS support DOCS_BUILD_DEPENDS= doxygen:devel/doxygen -OPENSSL_CONFIGURE_ON= --with-tls=openssl -OPENSSL_PLIST_SUB= TLS="" -OPENSSL_CPPFLAGS= -I${OPENSSLINC} -OPENSSL_LDFLAGS= -L${OPENSSLLIB} -OPENSSL_USES= ssl - -GNUTLS_CONFIGURE_ON= --with-tls=gnutls -GNUTLS_PLIST_SUB= TLS="" GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig +GNUTLS_CONFIGURE_ON= --with-tls=gnutls +GNUTLS_PLIST_SUB= TLS="" -MBEDTLS_CONFIGURE_ON= --with-tls=mbedtls -MBEDTLS_PLIST_SUB= TLS="" MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls +MBEDTLS_CONFIGURE_ON= --with-tls=mbedtls MBEDTLS_CPPFLAGS= -I${PREFIX}/include MBEDTLS_LDFLAGS= -L${PREFIX}/lib +MBEDTLS_PLIST_SUB= TLS="" -NOSSL_CONFIGURE_ON= --without-tls -NOSSL_PLIST_SUB= TLS="@comment " +NOTLS_CONFIGURE_ON= --without-tls +NOTLS_PLIST_SUB= TLS="@comment " + +OPENSSL_USES= ssl +OPENSSL_CONFIGURE_ON= --with-tls=openssl +OPENSSL_CPPFLAGS= -I${OPENSSLINC} +OPENSSL_LDFLAGS= -L${OPENSSLLIB} +OPENSSL_PLIST_SUB= TLS="" do-build-DOCS-on: cd ${WRKSRC} && ${DO_MAKE_BUILD} docs @@ -54,16 +54,15 @@ do-install-DOCS-on: post-install: .for i in objfw-new ofarc ofdns ofhash ofhttp - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$i + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor .for i in libobjfw.so.1 libobjfwrt.so.1 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/$i + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${i} .endfor -post-install-OPENSSL-on: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libobjfwtls.so.1 - -post-install-GNUTLS-on: +.for tls in GNUTLS MBEDTLS OPENSSL +post-install-${tls}-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libobjfwtls.so.1 +.endfor .include