From nobody Tue Feb 20 16:57:38 2024 X-Original-To: dev-commits-ports-branches@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 4TfQZB4HCXz540Nb; Tue, 20 Feb 2024 16:57:38 +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 4TfQZB3H0Vz4CB3; Tue, 20 Feb 2024 16:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708448258; 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=0RV2w+k9Mwd0mw0gH2wZxpaY4cylr/cK3vfS54YTlVw=; b=pifKctzV12tSe5rgSfBJtbtlkUPnSsVGKciZJc1H2QEIDyHlOH5ZlVQdBAfv/2/DaYquc/ +ViQSuvqPYbR13YkEZrMelMRQ7FjZLrxUUM3zTb1ig32mo1EFeAu83+Svb4mSe5UG947gM Baqiyv8Mk+z/Ejy+bdfFqqf1RWJzMwJmDV6n1MegA+nAcT/QSVwAmbnJIzSuDgP34lC4DT t8a9PziA0hsV/EsPQgiKI+VfYOIMexULQYq+yPf0yecAt2Zqi2dJzR6eNUckpep3vEm7+9 f1JHN0+HUYpVJ28TbaCzZ05dIVN8wGtJEw5RkcRqZM6yOTJIcNdojL9VYxgIIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708448258; 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=0RV2w+k9Mwd0mw0gH2wZxpaY4cylr/cK3vfS54YTlVw=; b=koRDF9QHXDmuTMDivcwXi6m+ErnIrCZyta3tOg2jYXO3V5K4+KQJZyFw64sM81dwQjZaeL EvE35tf/Gzi9PKO36OwSFzqBqCpV8srj9y9sVXvYFKTNYiMRk0674s+Q5xx9XpUeHk/whV Zs+4le6GGTUS/Bdn85wlr+IqIK7Ff7LytlqrBrkzP8ZtQejO+Iekl8DfpWFn9P6dXxOYBy HC6JeCJGoI2fa5+fJbe/MtJhegz4uP8dspkiKsVTxKhgiPVAoME6StUjMUnDiXrtMTU6R2 khZtvbKyuI40AaYTSFR/FDSrzMuFCXUzveKZ2S0y2U2nSNXOgItdM93x2L0ENw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708448258; a=rsa-sha256; cv=none; b=XWnGB99SJzqmBqHYFC+fFjzyMEIr7nq9F0L5DM1fj2WNLVeOe71udrEV/28CO6MDEJlFvq 5RYEJBfwH+fLnPVd7AmtDnF0Aue6JOLbyCDv6PZk/2C2HCWjtXciWpBvlNKCu7o4tT9Od+ tKdGCPGE3r20CxJWZMjyju7g/9xDhMRc8AtlQ65TwNy4bNXUMRd2DcihTroRpJHH6okG6Y 2L5l12WwWr9nIuRZ7GxVx5t+A6vX2u1NQslhB8A1NyODwlbTX/JmlQQgB3bmjtQx48tdol ABiCuR+NzDziNugEYX+4/nQfGC7P2vactdz192kpb4GUUZ8MymNZEgPL2JP/yA== 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 4TfQZB2MCDzQwX; Tue, 20 Feb 2024 16:57:38 +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 41KGvc4r039610; Tue, 20 Feb 2024 16:57:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KGvcnr039607; Tue, 20 Feb 2024 16:57:38 GMT (envelope-from git) Date: Tue, 20 Feb 2024 16:57:38 GMT Message-Id: <202402201657.41KGvcnr039607@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 4ed86fa6c8af - 2024Q1 - sysutils/nut*: Fix arm build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 4ed86fa6c8af2ea3d5ea8cecd86a7a211c22ddb5 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ed86fa6c8af2ea3d5ea8cecd86a7a211c22ddb5 commit 4ed86fa6c8af2ea3d5ea8cecd86a7a211c22ddb5 Author: Cy Schubert AuthorDate: 2024-02-16 13:43:46 +0000 Commit: Cy Schubert CommitDate: 2024-02-20 16:57:04 +0000 sysutils/nut*: Fix arm build Fix arm build by removing FREEIPMI from arm PR: 277089 MFH: 2024Q1 (cherry picked from commit 24114c15d5e7e3c9d1428460ca05a7067afa09d6) --- sysutils/nut-devel/Makefile | 12 ++++++++---- sysutils/nut/Makefile | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index ab3b818ea46d..74c13b164fd9 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -38,10 +38,14 @@ CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,} PLIST_SUB+= CGIDIR="${CGIDIR_REL}" PLIST_SUB+= CGIETCDIR="etc/nut/" -OPTIONS_DEFAULT= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI FREEIPMI DOCS MANPAGES OPENSSL -OPTIONS_DEFAULT_armv6= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL -OPTIONS_DEFAULT_armv7= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL -OPTIONS_DEFAULT_armv64= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL +OPTIONS_DEFAULT= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL +OPTIONS_DEFAULT_amd64= FREEIPMI +OPTIONS_DEFAULT_i386= FREEIPMI +OPTIONS_DEFAULT_powerpc= FREEIPMI +OPTIONS_DEFAULT_powerpc64= FREEIPMI +OPTIONS_DEFAULT_powerpc64le= FREEIPMI +OPTIONS_DEFAULT_riscv64= FREEIPMI +OPTIONS_DEFAULT_riscv64sf= FREEIPMI OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES DEV OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index d179892a49e1..5d0e54b392f5 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -30,10 +30,14 @@ CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,} PLIST_SUB+= CGIDIR="${CGIDIR_REL}" PLIST_SUB+= CGIETCDIR="etc/nut/" -OPTIONS_DEFAULT=SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI FREEIPMI DOCS MANPAGES OPENSSL -OPTIONS_DEFAULT_armv6= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL -OPTIONS_DEFAULT_armv7= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL -OPTIONS_DEFAULT_armv64= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL +OPTIONS_DEFAULT=SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL +OPTIONS_DEFAULT_amd64= FREEIPMI +OPTIONS_DEFAULT_i386= FREEIPMI +OPTIONS_DEFAULT_powerpc= FREEIPMI +OPTIONS_DEFAULT_powerpc64= FREEIPMI +OPTIONS_DEFAULT_powerpc64le= FREEIPMI +OPTIONS_DEFAULT_riscv64= FREEIPMI +OPTIONS_DEFAULT_riscv64sf= FREEIPMI OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES DEV OPTIONS_SINGLE= IPMI SSL OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS