[pkgsrc/trunk]: pkgsrc/misc bbdb, bbdb3: conflicts.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3606dcb31c7e
branches:  trunk
changeset: 376910:3606dcb31c7e
user:      nikita <nikita%pkgsrc.org@localhost>
date:      Thu Apr 14 14:31:09 2022 +0000

description:
bbdb, bbdb3: conflicts.

diffstat:

 misc/bbdb/Makefile  |  3 ++-
 misc/bbdb3/Makefile |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 6c1ae8df4ac1 -r 3606dcb31c7e misc/bbdb/Makefile
--- a/misc/bbdb/Makefile        Thu Apr 14 13:54:08 2022 +0000
+++ b/misc/bbdb/Makefile        Thu Apr 14 14:31:09 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/09/13 14:21:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2022/04/14 14:31:09 nikita Exp $
 
 DISTNAME=              bbdb-2.35
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -15,6 +15,7 @@
 EMACS_VERSIONS_ACCEPTED+=      emacs26 emacs26nox
 
 CONFLICTS+=            xemacs-packages-[0-9]*
+CONFLICTS+=            bbdb3-[0-9]*
 
 USE_PKGLOCALEDIR=      yes
 CONFIGURE_ARGS+=       --enable-rmail
diff -r 6c1ae8df4ac1 -r 3606dcb31c7e misc/bbdb3/Makefile
--- a/misc/bbdb3/Makefile       Thu Apr 14 13:54:08 2022 +0000
+++ b/misc/bbdb3/Makefile       Thu Apr 14 14:31:09 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/04/14 12:40:48 nikita Exp $
+# $NetBSD: Makefile,v 1.2 2022/04/14 14:31:09 nikita Exp $
 
 DISTNAME=              bbdb-3.2.2a
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -16,6 +16,7 @@
 EMACS_VERSIONS_ACCEPTED+=      emacs27 emacs27nox emacs28 emacs28nox
 
 CONFLICTS+=            xemacs-packages-[0-9]*
+CONFLICTS+=            bbdb-[0-9]*
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes