From nobody Mon Aug 21 17:13:23 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 4RTzZr1dRJz4r2lt; Mon, 21 Aug 2023 17:13:24 +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 4RTzZq5Kvwz4Wqb; Mon, 21 Aug 2023 17:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692638003; 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=RMxR5aco7ysMOwtm3gUwSV+J34VTHX7IB9m3zRzIQOE=; b=n8/wG6mzjlNyPv2MpxCVirHYLbDc5OH9iP2GbZZb+QKgsrUXhQ3kMFWMnsmB8ls5b4pEkW Ot6OmaHu/c7gbQrvFFPmMq5E+Al31oSUFW/o/HqlJSZ+vf9+fDRk3rmbg1soOfBhDh4yvk hLLUyxUC73C5l6wN3mhPdZU2kaLw4aQlB6CJeSwpIJGdBFlrmvLj0FQ2WTTyMZgv/yDVDL kLs3yrQKXu2HNIyrmkKawU0ryGHri8VwH9IQj7uIDQaigMzzDsG55O8Mca/bO7wiSXMSw8 FU4ryebtrF5QwQ/mdxkfm4ojS84vABQq/vde587+F5A0NJox0FlQvpLKJVBBKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692638003; 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=RMxR5aco7ysMOwtm3gUwSV+J34VTHX7IB9m3zRzIQOE=; b=AmgyQPXNeDdbeFCJW6KpvFNTGdzzhXIu1VQzd+xvDw0mGJAPTP+dRyk/EyXIvO6UA3qGV5 OTTrkYef/nfp6p6nfvXvlbEMCnsWk4nmhW/6qstuN87hTs1BNrOj4+Z0XTiJzJ4rGhR3J3 SUB9lflCFeJxKqYZZUeu+iMYJ92IKnzsFdqHHDJTPy/5y5fN9aamQPMNlawk0qF6zMl57z 85dTNjJyyu4IxGraO46PPoGc4ZzVTyeVYI20a7Gzputk/5IuMXh7V0GLxgLo4/vmQdXEKh G7/k5EiImitcKFhd+QBZL8MfL24G0vTnn3W2NClDAfSq5On+NfqsJIpnL8v5pQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692638003; a=rsa-sha256; cv=none; b=FBZ4K1os6mGxuaYW5oUX29X1Jc3ZT9+fmxo+CouySh8qr2e71ugpqj7cGYvIuFSFKtBH5Y ajV5CbVqjPDTGS4eNK9x8Jn+cmxm8tDHxIpJq5dfzO3xO9S2K7U4TCtlwFePiz9PdBfikB Vj5ySRrKbFL3Nxprnpio2wbLNmvGGsdK3whY+l9YYMY/CpISI0F34SF08iHZmuhgK+VYqH hP7fADPYmYaymuCY4XAdRR0ll7bXmlNBkH2xeVUG8lYgdprjFgeEJlm7/roWkUbWAyyHeO eCdNZipPVq0licxpmmKdh4jA+iAovxgNFUt8vrswS9XYGmzpPSbvRl0OIKLx6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTzZq4Rq6zTp0; Mon, 21 Aug 2023 17:13:23 +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 37LHDNGP098376; Mon, 21 Aug 2023 17:13:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LHDN4r098373; Mon, 21 Aug 2023 17:13:23 GMT (envelope-from git) Date: Mon, 21 Aug 2023 17:13:23 GMT Message-Id: <202308211713.37LHDN4r098373@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 6e12a6be3e42 - main - sysutils/ncdu: Remove CONFLICTS_INSTALL after sysutils/ncdu2 installs ncdu2 instead 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e12a6be3e427b2c077bb7e0f2329bba922fbdbf Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e12a6be3e427b2c077bb7e0f2329bba922fbdbf commit 6e12a6be3e427b2c077bb7e0f2329bba922fbdbf Author: Po-Chuan Hsieh AuthorDate: 2023-08-21 17:03:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-08-21 17:03:07 +0000 sysutils/ncdu: Remove CONFLICTS_INSTALL after sysutils/ncdu2 installs ncdu2 instead - Update WWW --- sysutils/ncdu/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sysutils/ncdu/Makefile b/sysutils/ncdu/Makefile index 58c1bbcbc229..df349e009cfa 100644 --- a/sysutils/ncdu/Makefile +++ b/sysutils/ncdu/Makefile @@ -5,7 +5,8 @@ MASTER_SITES= https://dev.yorhel.nl/download/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= NCurses Disk Usage (LTS version written in C) -WWW= https://dev.yorhel.nl/ncdu +WWW= https://dev.yorhel.nl/ncdu \ + https://code.blicky.net/yorhel/ncdu LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING @@ -17,8 +18,6 @@ GNU_CONFIGURE= yes PLIST_FILES= bin/ncdu \ man/man1/ncdu.1.gz -CONFLICTS_INSTALL= ncdu2 - # ncdu 1.* (LTS) is written in C. # ncdu 2.* (stable) is written in Zig which only works with specific version. PORTSCOUT= limit:^1\.