[pkgsrc/trunk]: pkgsrc/devel autoconf-archive & gnome-common: these conflict ...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b4fd5775377
branches:  trunk
changeset: 442959:4b4fd5775377
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Thu Dec 03 23:01:27 2020 +0000

description:
autoconf-archive & gnome-common: these conflict with each other

Both install the file share/aclocal/ax_check_enable_debug.m4.

diffstat:

 devel/autoconf-archive/Makefile |  5 ++++-
 devel/gnome-common/Makefile     |  5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 1422ae4d2c94 -r 4b4fd5775377 devel/autoconf-archive/Makefile
--- a/devel/autoconf-archive/Makefile   Thu Dec 03 22:56:00 2020 +0000
+++ b/devel/autoconf-archive/Makefile   Thu Dec 03 23:01:27 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/18 23:30:23 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/12/03 23:01:27 gutteridge Exp $
 
 DISTNAME=      autoconf-archive-2019.01.06
 CATEGORIES=    devel
@@ -10,6 +10,9 @@
 COMMENT=       Collection of macros for GNU Autoconf
 LICENSE=       gnu-gpl-v3
 
+# The file share/aclocal/ax_check_enable_debug.m4 conflicts
+CONFLICTS=     gnome-common>=3.14.0
+
 GNU_CONFIGURE= yes
 USE_LANGUAGES= # none
 USE_TOOLS+=    makeinfo
diff -r 1422ae4d2c94 -r 4b4fd5775377 devel/gnome-common/Makefile
--- a/devel/gnome-common/Makefile       Thu Dec 03 22:56:00 2020 +0000
+++ b/devel/gnome-common/Makefile       Thu Dec 03 23:01:27 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/07/30 22:47:49 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2020/12/03 23:01:27 gutteridge Exp $
 
 DISTNAME=      gnome-common-3.18.0
 CATEGORIES=    devel gnome
@@ -10,6 +10,9 @@
 COMMENT=       Generic M4 macros for GNOME development
 LICENSE=       gnu-gpl-v3
 
+# The file share/aclocal/ax_check_enable_debug.m4 conflicts
+CONFLICTS=     autoconf-archive>=2014.10.15
+
 GNU_CONFIGURE=         YES
 
 .include "../../mk/bsd.pkg.mk"