From 8541b6df9d6d525fb58ac07581eeb82bc19a2713 Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Tue, 11 Oct 2011 19:30:40 +0000
Subject: 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.
---
 misc/bbdb/Makefile                       |  5 +++--
 misc/bbdb/distinfo                       |  3 ++-
 misc/bbdb/patches/patch-lisp_bbdb-mhe.el | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 misc/bbdb/patches/patch-lisp_bbdb-mhe.el

(limited to 'misc/bbdb')

diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile
index 13ffb1f848f..d75a4ae3db8 100644
--- a/misc/bbdb/Makefile
+++ b/misc/bbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/08/29 02:55:30 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.25 2011/10/11 19:30:40 minskim Exp $
 #
 
 DISTNAME=		bbdb-2.34
@@ -12,7 +12,8 @@ HOMEPAGE=		http://sourceforge.net/projects/bbdb/
 COMMENT=		Insidious Big Brother DataBase, a rolodex-like database Emacs program
 
 # bbdb is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=	emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox \
+EMACS_VERSIONS_ACCEPTED=	emacs24 emacs24nox emacs23 emacs23nox \
+				emacs22 emacs22nox emacs21 emacs21nox \
 				emacs20
 CONFLICTS+=		xemacs-packages-[0-9]*
 
diff --git a/misc/bbdb/distinfo b/misc/bbdb/distinfo
index 22789f7eb69..1eeba251df3 100644
--- a/misc/bbdb/distinfo
+++ b/misc/bbdb/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2008/11/19 13:03:37 obache Exp $
+$NetBSD: distinfo,v 1.4 2011/10/11 19:30:40 minskim Exp $
 
 SHA1 (bbdb-2.34.tar.gz) = f5664a86a28ba4bc52b78a0ad19441d2efe8e28b
 RMD160 (bbdb-2.34.tar.gz) = 24e4606cb94b5c311139fab910af909f5b95e0fa
 Size (bbdb-2.34.tar.gz) = 363841 bytes
 SHA1 (patch-aa) = 4b9942a4b1f8e2675cdaca67777c80d6490d01ac
+SHA1 (patch-lisp_bbdb-mhe.el) = c5b83ce06528db10d0f468d2d10d73ccb6dc453e
diff --git a/misc/bbdb/patches/patch-lisp_bbdb-mhe.el b/misc/bbdb/patches/patch-lisp_bbdb-mhe.el
new file mode 100644
index 00000000000..31042fcd2cb
--- /dev/null
+++ b/misc/bbdb/patches/patch-lisp_bbdb-mhe.el
@@ -0,0 +1,15 @@
+$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)))
-- 
cgit v1.2.3