svn commit: r555029 - in head: deskutils/cal devel/util-linux
Mateusz Piotrowski
0mp at FreeBSD.org
Fri Nov 13 15:57:21 UTC 2020
Author: 0mp
Date: Fri Nov 13 15:57:20 2020
New Revision: 555029
URL: https://svnweb.freebsd.org/changeset/ports/555029
Log:
Acknowledge a conflict between deskutils/cal and devel/util-linux
Reported by: http://pkgtool.osorio.me/
Approved by: portmgr blanket
Modified:
head/deskutils/cal/Makefile
head/devel/util-linux/Makefile
Modified: head/deskutils/cal/Makefile
==============================================================================
--- head/deskutils/cal/Makefile Fri Nov 13 15:52:53 2020 (r555028)
+++ head/deskutils/cal/Makefile Fri Nov 13 15:57:20 2020 (r555029)
@@ -19,6 +19,8 @@ CFLAGS+= -DPREFIX='"${ETCDIR}"' -DUSE_REMINDER
PORTDOCS= readme.cal
+CONFLICTS_INSTALL= util-linux
+
OPTIONS_DEFINE= DOCS
do-build:
Modified: head/devel/util-linux/Makefile
==============================================================================
--- head/devel/util-linux/Makefile Fri Nov 13 15:52:53 2020 (r555028)
+++ head/devel/util-linux/Makefile Fri Nov 13 15:57:20 2020 (r555029)
@@ -28,6 +28,8 @@ CONFIGURE_ARGS= --disable-ipcmk --disable-ipcrm --disa
INSTALL_TARGET= install-strip
+CONFLICTS_INSTALL= cal
+
OPTIONS_DEFINE= UUID
OPTIONS_SUB= yes
More information about the svn-ports-head
mailing list