From nobody Tue Jan 11 09:41:58 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 34A9F1935AF3; Tue, 11 Jan 2022 09:41:59 +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 4JY5Lt6tQZz4dqQ; Tue, 11 Jan 2022 09:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CD5611694C; Tue, 11 Jan 2022 09:41:58 +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 20B9fwaI017080; Tue, 11 Jan 2022 09:41:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20B9fwiI017079; Tue, 11 Jan 2022 09:41:58 GMT (envelope-from git) Date: Tue, 11 Jan 2022 09:41:58 GMT Message-Id: <202201110941.20B9fwiI017079@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 9bdd8f141ce7 - main - archivers/deco, misc/deco: remove CONFLICTS entry 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bdd8f141ce741acaf6280649243fffe3e8a0262 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641894119; 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=rsYKW8xfinNXU+AjLQtXQhBjfXf0Hlkmr7fOmvjedH0=; b=hA3tUS+hviK0utdTTM8WBVLm0M4xeqxJKoHHTJMdS0Ezsu1dY39R3qYhFZJ4KMt2L+5vuG FPlttdgd9SSzwG52L3GBXpzvWhKQVDDfCQ0+jGoz6R9ca2Tb2Yd7L/Ee5ILqZiS8S6uXAK K8DtXUWskh7F3SHZ/YSOC06HCdhAydat0visxzGeyGiOyJL1rGZkYCzCUuhGqqmLzx+smx vQv3JTWEypbmqpdM2+UIqCIDnf2pfHkRGmlTmFuutCNp3DduU5OGBQVJdYgONniiu47y5m Yc9Z4RTUhf6FexLJRep/UbsIvzIuacMjUjfmVv3oIEf2NkI9d2o8AiKND/nkZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641894119; a=rsa-sha256; cv=none; b=JJpHeKoeJjqD0DQM9e/ZiANb4YMDOt50XdFsgQ6oKFQDG3yB4AqXM9wt2UfyF3Qtxb6DE/ WgeYM4OSIEhxEjo9irvMxePPJ8rm+5LeY/MQa89DV+ApZk+As+H0TIhfdEjNLh2OYaJigm xxeW23m6gY/WkO9V5yKi++fdz+pYcfxu9yuGSukr6sgWJYV0iEQkCad32kJyzDOodJ7JOP RdU4j4zK+SymMzCTUwFETvSudjlVsWdlle0l+lDT4cM1PUpK830+wW8ueV5IkN1Kiio1TP xb62tl8y+53i0ctiQcLmGlEwWajuPyex2rn9S4ltaFP6gVdSMqRU1r7YSAyr3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=9bdd8f141ce741acaf6280649243fffe3e8a0262 commit 9bdd8f141ce741acaf6280649243fffe3e8a0262 Author: Stefan Eßer AuthorDate: 2022-01-11 09:41:13 +0000 Commit: Stefan Eßer CommitDate: 2022-01-11 09:41:13 +0000 archivers/deco, misc/deco: remove CONFLICTS entry Files installed by the archivers/deco port have been renamed by makc@ to no longer conflict with those from the misc/deco port. Reported by: makc --- archivers/deco/Makefile | 2 -- misc/deco/Makefile | 2 -- 2 files changed, 4 deletions(-) diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile index 3d50665310a6..392d995029eb 100644 --- a/archivers/deco/Makefile +++ b/archivers/deco/Makefile @@ -28,8 +28,6 @@ RUN_DEPENDS= arc:archivers/arc \ zoo:archivers/zoo \ flac:audio/flac -CONFLICTS= deco-misc # bin/deco - DARCHIVE_VER= 1.7 DARCHIVE= deco-archive-${DARCHIVE_VER} diff --git a/misc/deco/Makefile b/misc/deco/Makefile index e1d455c10353..d4b11db6be9b 100644 --- a/misc/deco/Makefile +++ b/misc/deco/Makefile @@ -15,6 +15,4 @@ USES= ncurses tar:tgz GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/share -CONFIGURE_INSTALL= deco # bin/deco - .include