CVS commit: pkgsrc/devel

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Dec  3 23:01:27 UTC 2020

Modified Files:
        pkgsrc/devel/autoconf-archive: Makefile
        pkgsrc/devel/gnome-common: Makefile

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/autoconf-archive/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/gnome-common/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/autoconf-archive/Makefile
diff -u pkgsrc/devel/autoconf-archive/Makefile:1.11 pkgsrc/devel/autoconf-archive/Makefile:1.12
--- pkgsrc/devel/autoconf-archive/Makefile:1.11 Sat Jan 18 23:30:23 2020
+++ pkgsrc/devel/autoconf-archive/Makefile      Thu Dec  3 23:01:27 2020
@@ -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 @@ HOMEPAGE=     https://savannah.gnu.org/proje
 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

Index: pkgsrc/devel/gnome-common/Makefile
diff -u pkgsrc/devel/gnome-common/Makefile:1.22 pkgsrc/devel/gnome-common/Makefile:1.23
--- pkgsrc/devel/gnome-common/Makefile:1.22     Sun Jul 30 22:47:49 2017
+++ pkgsrc/devel/gnome-common/Makefile  Thu Dec  3 23:01:27 2020
@@ -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 @@ HOMEPAGE=     https://www.gnome.org/
 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"