CVS commit: pkgsrc/misc

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Thu Apr 14 14:31:09 UTC 2022

Modified Files:
        pkgsrc/misc/bbdb: Makefile
        pkgsrc/misc/bbdb3: Makefile

Log Message:
bbdb, bbdb3: conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/misc/bbdb/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/bbdb3/Makefile

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

Modified files:

Index: pkgsrc/misc/bbdb/Makefile
diff -u pkgsrc/misc/bbdb/Makefile:1.34 pkgsrc/misc/bbdb/Makefile:1.35
--- pkgsrc/misc/bbdb/Makefile:1.34      Thu Sep 13 14:21:22 2018
+++ pkgsrc/misc/bbdb/Makefile   Thu Apr 14 14:31:09 2022
@@ -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=      emacs25 emacs25
 EMACS_VERSIONS_ACCEPTED+=      emacs26 emacs26nox
 
 CONFLICTS+=            xemacs-packages-[0-9]*
+CONFLICTS+=            bbdb3-[0-9]*
 
 USE_PKGLOCALEDIR=      yes
 CONFIGURE_ARGS+=       --enable-rmail

Index: pkgsrc/misc/bbdb3/Makefile
diff -u pkgsrc/misc/bbdb3/Makefile:1.1 pkgsrc/misc/bbdb3/Makefile:1.2
--- pkgsrc/misc/bbdb3/Makefile:1.1      Thu Apr 14 12:40:48 2022
+++ pkgsrc/misc/bbdb3/Makefile  Thu Apr 14 14:31:09 2022
@@ -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=      emacs25 emacs25
 EMACS_VERSIONS_ACCEPTED+=      emacs27 emacs27nox emacs28 emacs28nox
 
 CONFLICTS+=            xemacs-packages-[0-9]*
+CONFLICTS+=            bbdb-[0-9]*
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes