From nobody Mon May 09 18:11:25 2022 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 419111ADD1DE; Mon, 9 May 2022 18:11:27 +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 4Kxq4G1fjGz3FBv; Mon, 9 May 2022 18:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652119886; 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=YmcliYQDvepXRcb0rTNjKDLmoXazSlM7e2u02wIppjw=; b=sKnC/1esgTmHDgOp6IekVbO1OAQajWtoayYrMS40gkUw5YtMOSl0yviueQrUBl46rYBfMC O1FcSjePE3XRYncwiqs5gwPU9eEVp7OdDnXHefABhmEd5Y/equffag3wl1TyYF3cWk0Y8L xcCaBoyATbLrl7hAX5Oz7sdBHc1UrxUfUnZsXbFxqM5YfuwcdqFP9sjuwoMuzcIJq6TPNt KRV26Tlgcnau6of1LeNsymZ9pkYSrl686Gn8OgE/6eCHUPkQh5gFjDIGUwsV/3VH8ZsXeG n+V9tgB+YX3/lSZmNHgxS2GRWu3KwpxBgS100lzfH3wIH/2nD0k1JCJ6yvxxRQ== 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 1124F15BEC; Mon, 9 May 2022 18:11:26 +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 249IBPmj086316; Mon, 9 May 2022 18:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249IBPpD086315; Mon, 9 May 2022 18:11:25 GMT (envelope-from git) Date: Mon, 9 May 2022 18:11:25 GMT Message-Id: <202205091811.249IBPpD086315@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: a28f05fb2d27 - main - sysutils/nut*: Register conflicts 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a28f05fb2d27823de942563b5a31888d545e08e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652119886; 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=YmcliYQDvepXRcb0rTNjKDLmoXazSlM7e2u02wIppjw=; b=ed+TQ5Viu/fjVjw4c1dDebLqyftpX9FXsQjtu0RoZKG5hsGiXos6FiZjrnietYBjuSGHVC 4SVnweExvTvIeMIL/tmWiuRFumSKT/2wM1GcZ9r3gl2+Q44UNunuGfvk2OVioxlXQBr91j 0ab9yGqUkkIFBxjBE6NY6Qm59WowKG0yZnjbS30GrvgUcapwfcxgZ1lHeWZ1jPLqKF/o0y VFk5PJAUkdUNedtsqBeohlbvrsjsUOrmTtxNNYHuPkaM7km6k20MxVVjbu16+NRUT/zsI6 3WQcT6df5crMa0zfTnuKQl9E1H6gKzmAMIAaoF42ofwRV0+CPgOwAFiqixBCQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652119886; a=rsa-sha256; cv=none; b=vEuvoNs4aPm1Q5sPopphnTQ82DxUantyfAZ5y93zE304bEmaS+JSe9V//Qr1o3fHagVana rqgotjXdxAg93C2gCCD83jUWilN3eAHRBDvLgm52kgLlus5KS8J557OjAqDLS75G1/W5q6 APEm4D/Zz94vaJqRykD8xIuLZ44e94Pw8Foaowc9jVhwtHmNBYtJM+qXeFH/GXTSJw6W59 MWoFGveZ/P5eibsCRunqMvmwFIMRiEM10a0D83afr70+fb2S8/zynUNNNhpFjXJyF3j/A2 XhUMUK7IbYEw8KP+OBnu5JSJwcGwiQeVmc/zi0udDtqO1X+iKXfktMtV1fKuCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a28f05fb2d27823de942563b5a31888d545e08e5 commit a28f05fb2d27823de942563b5a31888d545e08e5 Author: Cy Schubert AuthorDate: 2022-05-04 04:47:27 +0000 Commit: Cy Schubert CommitDate: 2022-05-09 17:49:28 +0000 sysutils/nut*: Register conflicts sysutils/nut and sysutils/nut-devel conflict with each other. --- sysutils/nut-devel/Makefile | 2 ++ sysutils/nut/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index b6bd0978997d..9bafcd1fd295 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -16,6 +16,8 @@ LICENSE= GPLv2+ GPLv3+ ART10 GPLv1+ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS= nut-[0-9]* + USE_GITHUB= yes GH_ACCOUNT= networkupstools GH_TAGNAME= 9cb8de681 diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 4ba9a55ed23d..4bec09e14685 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -13,6 +13,8 @@ LICENSE= GPLv2+ GPLv3+ ART10 GPLv1+ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS= nut-devel-* + GNU_CONFIGURE= yes USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build USE_LDCONFIG= yes