Tue Oct 11 19:30:41 2011 UTC ()
Make bbdb build with emacs-24.

Without this patch, build fails with the following error:

 bbdb-mhe.el:56:1:Error: Invalid function: ...

Emacs is partially responsible for this, but the upstream won't fix it
since the cause of this (old-style backquote) will be removed in
emacs-25.

Patch provided by Makoto Fujiwara in PR 44963.


(minskim)
diff -r1.24 -r1.25 pkgsrc/misc/bbdb/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/bbdb/distinfo
diff -r0 -r1.1 pkgsrc/misc/bbdb/patches/patch-lisp_bbdb-mhe.el
cvs diff -r1.24 -r1.25 pkgsrc/misc/bbdb/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/bbdb/Attic/Makefile 2011/08/29 02:55:30 1.24
+++ pkgsrc/misc/bbdb/Attic/Makefile 2011/10/11 19:30:40 1.25
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.24 2011/08/29 02:55:30 hiramatsu Exp $ 1# $NetBSD: Makefile,v 1.25 2011/10/11 19:30:40 minskim Exp $
2# 2#
3 3
4DISTNAME= bbdb-2.34 4DISTNAME= bbdb-2.34
5PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} 5PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= mail misc news 7CATEGORIES= mail misc news
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbdb/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbdb/}
9 9
10MAINTAINER= minoura@NetBSD.org 10MAINTAINER= minoura@NetBSD.org
11HOMEPAGE= http://sourceforge.net/projects/bbdb/ 11HOMEPAGE= http://sourceforge.net/projects/bbdb/
12COMMENT= Insidious Big Brother DataBase, a rolodex-like database Emacs program 12COMMENT= Insidious Big Brother DataBase, a rolodex-like database Emacs program
13 13
14# bbdb is included in xemacs-packages 14# bbdb is included in xemacs-packages
15EMACS_VERSIONS_ACCEPTED= emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox \ 15EMACS_VERSIONS_ACCEPTED= emacs24 emacs24nox emacs23 emacs23nox \
 16 emacs22 emacs22nox emacs21 emacs21nox \
16 emacs20 17 emacs20
17CONFLICTS+= xemacs-packages-[0-9]* 18CONFLICTS+= xemacs-packages-[0-9]*
18 19
19PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
20 21
21USE_PKGLOCALEDIR= yes 22USE_PKGLOCALEDIR= yes
22GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
23BUILD_TARGET= all mhe 24BUILD_TARGET= all mhe
24USE_TOOLS+= makeinfo 25USE_TOOLS+= makeinfo
25INFO_FILES= # PLIST 26INFO_FILES= # PLIST
26LISPDIR= ${EMACS_LISPPREFIX}/bbdb 27LISPDIR= ${EMACS_LISPPREFIX}/bbdb
27INSTALLATION_DIRS= ${EMACS_INFOPREFIX} 28INSTALLATION_DIRS= ${EMACS_INFOPREFIX}
28MAKE_JOBS_SAFE= no 29MAKE_JOBS_SAFE= no
cvs diff -r1.3 -r1.4 pkgsrc/misc/bbdb/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/bbdb/Attic/distinfo 2008/11/19 13:03:37 1.3
+++ pkgsrc/misc/bbdb/Attic/distinfo 2011/10/11 19:30:40 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.3 2008/11/19 13:03:37 obache Exp $ 1$NetBSD: distinfo,v 1.4 2011/10/11 19:30:40 minskim Exp $
2 2
3SHA1 (bbdb-2.34.tar.gz) = f5664a86a28ba4bc52b78a0ad19441d2efe8e28b 3SHA1 (bbdb-2.34.tar.gz) = f5664a86a28ba4bc52b78a0ad19441d2efe8e28b
4RMD160 (bbdb-2.34.tar.gz) = 24e4606cb94b5c311139fab910af909f5b95e0fa 4RMD160 (bbdb-2.34.tar.gz) = 24e4606cb94b5c311139fab910af909f5b95e0fa
5Size (bbdb-2.34.tar.gz) = 363841 bytes 5Size (bbdb-2.34.tar.gz) = 363841 bytes
6SHA1 (patch-aa) = 4b9942a4b1f8e2675cdaca67777c80d6490d01ac 6SHA1 (patch-aa) = 4b9942a4b1f8e2675cdaca67777c80d6490d01ac
 7SHA1 (patch-lisp_bbdb-mhe.el) = c5b83ce06528db10d0f468d2d10d73ccb6dc453e
File Added: pkgsrc/misc/bbdb/patches/Attic/patch-lisp_bbdb-mhe.el
$NetBSD: patch-lisp_bbdb-mhe.el,v 1.1 2011/10/11 19:30:40 minskim Exp $

Make bbdb build with emacs-24.

--- lisp/bbdb-mhe.el.orig	2001-08-31 15:07:47.000000000 +0000
+++ lisp/bbdb-mhe.el
@@ -37,7 +37,7 @@
 
 (defmacro bbdb/mh-cache-key (message)
   "Return a (numeric) key for MESSAGE"
-  (`(let* ((attrs (file-attributes (, message)))
+  ( ` (let* ((attrs (file-attributes (, message)))
            (status-time (nth 6 attrs))
            (status-time-2 (cdr status-time))
            (inode (nth 10 attrs)))