diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2020-12-03 23:01:27 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2020-12-03 23:01:27 +0000 |
| commit | db3768c8a2009455a8df68f5c09730ff821c999a (patch) | |
| tree | 54e6ef8cf772f40fd8cf24cc95e9ea3c903bd678 | |
| parent | 77b4816c24419e7553eaf235333808eb7ea650c8 (diff) | |
| download | pkgsrc-db3768c8a2009455a8df68f5c09730ff821c999a.tar.gz | |
autoconf-archive & gnome-common: these conflict with each other
Both install the file share/aclocal/ax_check_enable_debug.m4.
| -rw-r--r-- | devel/autoconf-archive/Makefile | 5 | ||||
| -rw-r--r-- | devel/gnome-common/Makefile | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/devel/autoconf-archive/Makefile b/devel/autoconf-archive/Makefile index ae57a2cdc2f..970dda9088e 100644 --- a/devel/autoconf-archive/Makefile +++ b/devel/autoconf-archive/Makefile @@ -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/projects/autoconf-archive/ 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 --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile index 8fb8a15df7b..0bd540d23ac 100644 --- a/devel/gnome-common/Makefile +++ b/devel/gnome-common/Makefile @@ -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" |