From nobody Wed Nov 10 10:29:24 2021 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 8CA85185C939; Wed, 10 Nov 2021 10:29: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 4Hq1LD3YB5z3H0S; Wed, 10 Nov 2021 10:29:24 +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 59D291709D; Wed, 10 Nov 2021 10:29:24 +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 1AAATOox006840; Wed, 10 Nov 2021 10:29:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AAATOLP006839; Wed, 10 Nov 2021 10:29:24 GMT (envelope-from git) Date: Wed, 10 Nov 2021 10:29:24 GMT Message-Id: <202111101029.1AAATOLP006839@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: fdf15484210d - main - net/dhcpcd: Remove stale CONFLICTS_INSTALL line 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: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdf15484210d144e5fda9d58266360a50b49ffc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdf15484210d144e5fda9d58266360a50b49ffc4 commit fdf15484210d144e5fda9d58266360a50b49ffc4 Author: Dries Michiels AuthorDate: 2021-11-09 16:05:11 +0000 Commit: Dries Michiels CommitDate: 2021-11-10 10:28:54 +0000 net/dhcpcd: Remove stale CONFLICTS_INSTALL line net/dhcpcd-devel which conflicted was removed from the tree in f043c1154abf. Approved by: philip (mentor), 0mp (mentor) Differential Revision: https://reviews.freebsd.org/D32909 --- net/dhcpcd/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile index 833fffcfcbfb..7afc86f15b6c 100644 --- a/net/dhcpcd/Makefile +++ b/net/dhcpcd/Makefile @@ -20,8 +20,6 @@ CONFIGURE_ARGS= --datadir=${PREFIX}/share/examples \ --privsepuser="_dhcp" \ --without-udev -CONFLICTS_INSTALL= dhcpcd-devel - post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf \ ${STAGEDIR}${PREFIX}/share/examples/dhcpcd