From nobody Fri Sep 29 19:05:21 2023 X-Original-To: dev-commits-ports-main@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 4Ry0D12vVbz4vXbW; Fri, 29 Sep 2023 19:05:21 +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 4Ry0D12VB5z3HyV; Fri, 29 Sep 2023 19:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696014321; 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=xcFAtHdEq0QDqRTWl+S/Xl2+YAcbigBmC/p1k5Aa1jE=; b=A1a4RMyFlgRJIRIv+8xb6qDETwEsDnicIzAihLi8HRm/tI2wkf2C7WxP3o+UG4ZC0LD3/V ScMQZQ4F+r9OuZKuhMPSIUnfmL9iw8kCGmgxh5tu/L3t3+IHRJGXFGt5LDjjzoBlr6RnZt 7ohhDHGxyUsBjfzPSDw7eig2bkA6zpvLc+0N+BSc4Gkbq+cFAPlbvZ5KkWoi3/XiL0JJIt Moxp5gVIom5+P+uT9PVzRfAOhijofF05//rVwpI0icE68iNyDtysIL0VF3pPpSKfW8WOpt bzcdhF4mfzzbtSrDhvuxRnTsN7CPr86hsTzXG/Cv0NAHuJMiO6Nno13NIVUksg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696014321; a=rsa-sha256; cv=none; b=dYDE/Gq56EB4VC6cdh9/OdVUGQaZb5G8nFhaV5oLiYpuJ12QD9sSldp1ELLnjEtNBXGbcO bZbvKzu2cpaKFKDpylVse6G5FrBxQ9QwsSqq86Nq4cq+JIALenTkZEOFpHeMFOkPI0aUW0 8TvGa6gjQ5jWWo9LNco6PhGfUZ8Z0rtWWaEtldDfliuRDQE8HULf9p0mpVqop4KjTLSte/ Oa8s+jU0oyuyNd4NrcI2NBo2Jgbneg4jISTV6ALNT469Y1tbbk8PLf/6AgLlJnvjiWVw8J S1wY7G1b+jLjPtB466EjKJwWmwr0gNGAQ7OPhVXl/Bd4Q65m5fmCyaIbQTTPfw== 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=1696014321; 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=xcFAtHdEq0QDqRTWl+S/Xl2+YAcbigBmC/p1k5Aa1jE=; b=Tcu3LgJbjisX90Ag0YG0ceVyRnvx4d/veUd24phJKgH/CD6TuZUVbjs1gMtAJqdXUH9hMO C9K9dsXY1KILCzEOpoD4fyoxT7BT8x2jIVkkF9H3ILKyhvdXhSTyMMMfVI5zsmZq3E/DES PwOiQk+Q/I2N3gYZqS9V8M0Qo7APFChHVz1LjztvXIg33NPSPig+7bB9RIFW8JZAmawKfG YS0BSq4l5LO0M3WoYvblaxDmGz/+j5EYL5lJSWYrEPp771MpQmU25qhD0jgN9Reh8bSPK0 J58p24lBh4BSMIhmY0YFzBkB3X4j8aOrFAKng92x66WZYUQQrYtgI1ZGEsnW1g== 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 4Ry0D11MdRz1yR; Fri, 29 Sep 2023 19:05:21 +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 38TJ5Lvo035133; Fri, 29 Sep 2023 19:05:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38TJ5Lur035130; Fri, 29 Sep 2023 19:05:21 GMT (envelope-from git) Date: Fri, 29 Sep 2023 19:05:21 GMT Message-Id: <202309291905.38TJ5Lur035130@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: 747e2e324cb9 - main - net-mgmt/mk-livestatus: Remove OSVERSION conditionals List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 747e2e324cb9f8c96514c37f59934c771bd0ae71 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=747e2e324cb9f8c96514c37f59934c771bd0ae71 commit 747e2e324cb9f8c96514c37f59934c771bd0ae71 Author: Muhammad Moinur Rahman AuthorDate: 2023-09-29 18:55:57 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-09-29 19:05:07 +0000 net-mgmt/mk-livestatus: Remove OSVERSION conditionals Minimum supported OSVERSION is 120400 by the port infrastructure so no need for additional conditions. Approved by: portmgr (blanket) --- net-mgmt/mk-livestatus/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/net-mgmt/mk-livestatus/Makefile b/net-mgmt/mk-livestatus/Makefile index dcb1a6aa7330..97f7d340cefd 100644 --- a/net-mgmt/mk-livestatus/Makefile +++ b/net-mgmt/mk-livestatus/Makefile @@ -29,6 +29,8 @@ EXAMPLE_FILES= example_multisite.py example.py \ # parameter "command_file" from nagios.cfg COMMAND_FILE?= /var/spool/nagios/rw/live +CFLAGS+= -fcommon + OPTIONS_DEFINE= EXAMPLES PERL OPTIONS_SINGLE= NAGIOS OPTIONS_SINGLE_NAGIOS= NAGIOS3 NAGIOS4 @@ -59,11 +61,4 @@ post-install-EXAMPLES-on: ${PORTEXAMPLES:S|^|${WRKSRC}/api/python/|} ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/api/python/|} ${STAGEDIR}${EXAMPLESDIR} -.include - -# Fix building with clang 11 ("ld: error: duplicate symbol: g_mainthread_id") -.if ${OSVERSION} >= 1204000 -CFLAGS+= -fcommon -.endif - -.include +.include