From nobody Sat Feb 11 12:46:02 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 4PDVhV633Mz3qMZP; Sat, 11 Feb 2023 12:46:02 +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 4PDVhV5Xv0z3NHh; Sat, 11 Feb 2023 12:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676119562; 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=JOKvj3krExPk8hdtQqamL+WxR6a4azUh61iowHodUiw=; b=snBAKsPmPQSf0LNXYcTZ75TVSUrMh6ZqNgsffPYx0CIKNBDe+vuMiYEsAQvVKEvbGXTRzN h9E3hyV/AVchS1Zf4W1suLNhchTVxYiJOGcB6Od/ubsT+vJx6/bzX/W+epwoB90boz33DM tg2EoRUomzQwE7pFMD1nkDEqEicRcmnxuaXS1CyH0Ev7/09YiVTKf64ysDpjSeqfZC+QJS GM/BIpUiEwCJxYTrfuYlfm3XbPk4yUrlwzfAUv46D3HEM0Rfx7ON4gJj3C9X0bvXbfY0S3 rCgf359I06E/UwrHsj7VrOGvNhDOrtkyGF5sEwPq4KsC8LV8+IAazRfg0aIgfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676119562; 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=JOKvj3krExPk8hdtQqamL+WxR6a4azUh61iowHodUiw=; b=Bv0yMz9ReNeWgcTXaqbuAsjegjlO9ea5f+gfFFCrW21umhCv8iGs64DrsEto1O7tLNWzgv +aL4KeQyyLXHR3qLXdENh9azxGYT+oxMZWk08CyrYm8t9/ZSYN4q8psCsd4ZhSrEA3urZs 9cN6oKEx/UB7MtszowiRWXPIn4TkxHhVUMNk/7hGZZocRqwZc0g5nKATzhobyQv3Ia1zaZ RKJit9338wudY2eqbiy1p7ZOg5eXaOaGJ7OWHjW7P4awX2Oq1QQoBHI4Tn2f1Ya3cVY26C F5tL4thyuUQVI1Uvi7tWWsxeukAFffGWkRzP7wEjxEmJNNzlaKQmnWW/a1vw2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676119562; a=rsa-sha256; cv=none; b=RIAdw7LlpDwsJEjAgY5g6foUf7Y9oyz7djHGMwFt9Q4QPKQR+BU66pPnXXnOj8i8kLHcXH ET0zukz3En4snNvKdrN93ZkB1/nssBBa9u/ObBUJWmHB7gvXibFOVMIs3M4uu8i0vH/nA5 0DioWA9Da1yVQsFTa9LhAHKlIYxUQ5FzOw4uT+LYWTOT9d5erusTmBpEwnJ8iCJAwkZJ0X vmHIh77Bp6Zlm75Mpnwv4D/wNxQ7BJFW7oEzalb9WtohSylhfmrqPUhM8L+NWwDkwQxNLf 84lxt+IjS73gb5kQsFsiyQ6izXO2hvhJG0w1F6pgYyGgalkn/G2g3qtuqpVrtA== 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 4PDVhV4bF5zyw7; Sat, 11 Feb 2023 12:46:02 +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 31BCk2PS031494; Sat, 11 Feb 2023 12:46:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31BCk2jG031493; Sat, 11 Feb 2023 12:46:02 GMT (envelope-from git) Date: Sat, 11 Feb 2023 12:46:02 GMT Message-Id: <202302111246.31BCk2jG031493@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 5d3023c9a23a - main - net-mgmt/xymon-server: Fix BUILD with LDAP option 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d3023c9a23a14e9bbbe74da4ca3ffb3077a1196 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d3023c9a23a14e9bbbe74da4ca3ffb3077a1196 commit 5d3023c9a23a14e9bbbe74da4ca3ffb3077a1196 Author: Muhammad Moinur Rahman AuthorDate: 2023-02-11 12:43:52 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-02-11 12:43:52 +0000 net-mgmt/xymon-server: Fix BUILD with LDAP option - While converting USE_LDAP=yes to USES=ldap this port was missed. Fix this. - Utilize OPTIONS framework PR: 269486 Reported by: dinoex Approved by: portmgr (just-fix-it) Fixes: 6e1233b Mk/**ldap.mk: Convert USE_LDAP to USES=ldap --- net-mgmt/xymon-server/Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile index 7710f884a484..7dfd772b6907 100644 --- a/net-mgmt/xymon-server/Makefile +++ b/net-mgmt/xymon-server/Makefile @@ -52,17 +52,10 @@ FIXME2= analysis.cfg combo.cfg holidays.cfg rrddefinitions.cfg \ OPTIONS_DEFINE=DEBUG LDAP NETSNMP NETSNMP_DESC=Enable Net-SNMP support -.include - -.if ${PORT_OPTIONS:MLDAP} -MAKE_ENV+= WITH_LDAP=1 -USE+= ldap -.endif - -.if ${PORT_OPTIONS:MNETSNMP} -MAKE_ENV+= WITH_NETSNMP=1 -LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp -.endif +LDAP_USES= ldap +LDAP_MAKE_ENV= WITH_LDAP=1 +NETSNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp +NETSNMP_MAKE_ENV= WITH_NETSNMP=1 post-patch: ${REINPLACE_CMD} -e 's|web-build client|web-build|' ${WRKSRC}/build/Makefile.rules