git: fdf15484210d - main - net/dhcpcd: Remove stale CONFLICTS_INSTALL line
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Nov 2021 10:29:24 UTC
The branch main has been updated by driesm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fdf15484210d144e5fda9d58266360a50b49ffc4
commit fdf15484210d144e5fda9d58266360a50b49ffc4
Author: Dries Michiels <driesm@FreeBSD.org>
AuthorDate: 2021-11-09 16:05:11 +0000
Commit: Dries Michiels <driesm@FreeBSD.org>
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