Thu Apr 14 14:31:09 2022 UTC ()
bbdb, bbdb3: conflicts.


(nikita)
diff -r1.34 -r1.35 pkgsrc/misc/bbdb/Makefile
diff -r1.1 -r1.2 pkgsrc/misc/bbdb3/Makefile
cvs diff -r1.34 -r1.35 pkgsrc/misc/bbdb/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/bbdb/Attic/Makefile 2018/09/13 14:21:22 1.34
+++ pkgsrc/misc/bbdb/Attic/Makefile 2022/04/14 14:31:09 1.35
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile,v 1.34 2018/09/13 14:21:22 jperkin Exp $ 1# $NetBSD: Makefile,v 1.35 2022/04/14 14:31:09 nikita Exp $
2 2
3DISTNAME= bbdb-2.35 3DISTNAME= bbdb-2.35
4PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} 4PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= mail misc news 6CATEGORIES= mail misc news
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbdb/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbdb/}
8 8
9MAINTAINER= minoura@NetBSD.org 9MAINTAINER= minoura@NetBSD.org
10HOMEPAGE= https://sourceforge.net/projects/bbdb/ 10HOMEPAGE= https://sourceforge.net/projects/bbdb/
11COMMENT= Insidious Big Brother DataBase, a rolodex-like database Emacs program 11COMMENT= Insidious Big Brother DataBase, a rolodex-like database Emacs program
12 12
13# bbdb is included in xemacs-packages 13# bbdb is included in xemacs-packages
14EMACS_VERSIONS_ACCEPTED= emacs25 emacs25nox emacs21 emacs21nox 14EMACS_VERSIONS_ACCEPTED= emacs25 emacs25nox emacs21 emacs21nox
15EMACS_VERSIONS_ACCEPTED+= emacs26 emacs26nox 15EMACS_VERSIONS_ACCEPTED+= emacs26 emacs26nox
16 16
17CONFLICTS+= xemacs-packages-[0-9]* 17CONFLICTS+= xemacs-packages-[0-9]*
 18CONFLICTS+= bbdb3-[0-9]*
18 19
19USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
20CONFIGURE_ARGS+= --enable-rmail 21CONFIGURE_ARGS+= --enable-rmail
21GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
22BUILD_TARGET= all mhe 23BUILD_TARGET= all mhe
23USE_TOOLS+= makeinfo 24USE_TOOLS+= makeinfo
24INFO_FILES= yes 25INFO_FILES= yes
25LISPDIR= ${EMACS_LISPPREFIX}/bbdb 26LISPDIR= ${EMACS_LISPPREFIX}/bbdb
26INSTALLATION_DIRS= ${EMACS_INFOPREFIX} 27INSTALLATION_DIRS= ${EMACS_INFOPREFIX}
27MAKE_JOBS_SAFE= no 28MAKE_JOBS_SAFE= no
28 29
29.include "../../editors/emacs/modules.mk" 30.include "../../editors/emacs/modules.mk"
30 31
cvs diff -r1.1 -r1.2 pkgsrc/misc/bbdb3/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/bbdb3/Makefile 2022/04/14 12:40:48 1.1
+++ pkgsrc/misc/bbdb3/Makefile 2022/04/14 14:31:09 1.2
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.1 2022/04/14 12:40:48 nikita Exp $ 1# $NetBSD: Makefile,v 1.2 2022/04/14 14:31:09 nikita Exp $
2 2
3DISTNAME= bbdb-3.2.2a 3DISTNAME= bbdb-3.2.2a
4PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} 4PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
5CATEGORIES= misc mail news 5CATEGORIES= misc mail news
6MASTER_SITES= http://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/ 6MASTER_SITES= http://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://elpa.gnu.org/packages/bbdb.html 9HOMEPAGE= https://elpa.gnu.org/packages/bbdb.html
10COMMENT= Insidious Big Brother DataBase (version 3) 10COMMENT= Insidious Big Brother DataBase (version 3)
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13# bbdb is included in xemacs-packages 13# bbdb is included in xemacs-packages
14# emacs 24 or newer 14# emacs 24 or newer
15EMACS_VERSIONS_ACCEPTED= emacs25 emacs25nox emacs26 emacs26nox 15EMACS_VERSIONS_ACCEPTED= emacs25 emacs25nox emacs26 emacs26nox
16EMACS_VERSIONS_ACCEPTED+= emacs27 emacs27nox emacs28 emacs28nox 16EMACS_VERSIONS_ACCEPTED+= emacs27 emacs27nox emacs28 emacs28nox
17 17
18CONFLICTS+= xemacs-packages-[0-9]* 18CONFLICTS+= xemacs-packages-[0-9]*
 19CONFLICTS+= bbdb-[0-9]*
19 20
20USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
21GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
22USE_TOOLS+= makeinfo autoconf automake autoreconf 23USE_TOOLS+= makeinfo autoconf automake autoreconf
23INFO_FILES= yes 24INFO_FILES= yes
24LISPDIR= ${EMACS_LISPPREFIX}/bbdb 25LISPDIR= ${EMACS_LISPPREFIX}/bbdb
25INSTALLATION_DIRS= ${EMACS_INFOPREFIX} 26INSTALLATION_DIRS= ${EMACS_INFOPREFIX}
26 27
27pre-configure: 28pre-configure:
28 cd ${WRKSRC} && autoreconf --verbose --install 29 cd ${WRKSRC} && autoreconf --verbose --install
29 30
30do-install: 31do-install:
31 ${MKDIR} ${DESTDIR}${LISPDIR} 32 ${MKDIR} ${DESTDIR}${LISPDIR}