Date: Fri, 13 Nov 2020 15:57:20 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555029 - in head: deskutils/cal devel/util-linux Message-ID: <202011131557.0ADFvK7v020691@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011131557.0ADFvK7v020691>