pkg/44963: [PATCH] misc/bbdb fails with emacs-snapshot

[makoto%ki.nu@localhost]

>Number:         44963
>Category:       pkg
>Synopsis:       misc/bbdb-2.34 fails with emacs-snapshot
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri May 13 14:10:00 +0000 2011
>Originator:     Makoto Fujiwara
>Release:        NetBSD 5.1
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD ml110-2 5.1 NetBSD 5.1 (GENERIC) #0: Sun Nov 7 14:39:56 UTC 2010 
builds%b6.netbsd.org@localhost:/home/builds/ab/netbsd-5-1-RELEASE/i386/201011061943Z-obj/home/builds/ab/netbsd-5-1-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386
Architecture: i386
Machine: i386
>Description:
        misc/bbdb-2.34 can not build with emacs-24.0.50 (emacs-snapshot)
        2.35 has the same problem
>How-To-Repeat:
(1) Install NetBSD/i386 5.1
(2) cvs co pkgsrc 
(3) pkg_add or make package-install to get following two
sudo-1.7.5          Allow others to run commands as root
zsh-4.3.11          The Z shell
(4) (cd pkgsrc/editors/emacs-snapshot; make package-install)
to get following package installed
emacs-24.0.50.20110505 GNU editing macros (development version)

(5) Have following line in /etc/mk.conf
EMACS_TYPE=emacs24

(6) cd misc/bbdb ; make package
will get following

ml110-2@makoto 22:01:47/110513(..misc/bbdb)% make package
ERROR: This package has set PKG_FAIL_REASON:
ERROR: Accepted versions are: emacs23 emacs22 emacs22nox emacs21 emacs21nox  
emacs20 emacs20nox
ERROR: No valid Emacs version installed found
*** Error code 1

Stop.
make: stopped in /export/pkgsrc/misc/bbdb

(7) Fix above problem with following line

| Index: Makefile
| ===================================================================
| RCS file: /cvsroot/pkgsrc/misc/bbdb/Makefile,v
| retrieving revision 1.22
| diff -u -u -r1.22 Makefile
| --- Makefile    6 May 2010 06:06:47 -0000       1.22
| +++ Makefile    13 May 2011 13:03:29 -0000
| @@ -12,8 +12,6 @@
|  COMMENT=               Insidious Big Brother DataBase, a rolodex-like 
database Emacs program
|  
|  # bbdb is included in xemacs-packages
| -EMACS_VERSIONS_ACCEPTED=       emacs23 emacs22 emacs22nox emacs21 emacs21nox 
\
| -                               emacs20 emacs20nox
|  CONFLICTS+=            xemacs-packages-[0-9]*
|  
|  PKG_DESTDIR_SUPPORT=   user-destdir

(8) make package-install again at misc/bbdb and
  getting following error
-----------
In bbdb/mh-cache-key:
bbdb-mhe.el:38:30:Warning: `(\` (let* ((attrs (file-attributes ((\,
    message)))) (status-time (nth 6 attrs)) (status-time-2 (cdr status-time))
    (inode (nth 10 attrs))) (logxor (if (integerp inode) inode (car inode))
    (car status-time) (if (integerp status-time-2) status-time-2 (car
    status-time-2)))))' is a malformed function
bbdb-mhe.el:56:1:Error: Invalid function: (\` (let* ((attrs (file-attributes 
((\, message)))) (status-time (nth 6 attrs)) (status-time-2 (cdr status-time)) 
(inode (nth 10 attrs))) (logxor (if (integerp inode) inode (car inode)) (car 
status-time) (if (integerp status-time-2) status-time-2 (car status-time-2)))))
*** Error code 1
-----------

>Fix:

Index: misc/bbdb/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/bbdb/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- misc/bbdb/Makefile  6 May 2010 06:06:47 -0000       1.22
+++ misc/bbdb/Makefile  13 May 2011 13:43:06 -0000
@@ -3,7 +3,7 @@
 
 DISTNAME=              bbdb-2.34
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            mail misc news
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=bbdb/}
 
@@ -12,8 +12,6 @@
 COMMENT=               Insidious Big Brother DataBase, a rolodex-like database 
Emacs program
 
 # bbdb is included in xemacs-packages
-EMACS_VERSIONS_ACCEPTED=       emacs23 emacs22 emacs22nox emacs21 emacs21nox \
-                               emacs20 emacs20nox
 CONFLICTS+=            xemacs-packages-[0-9]*
 
 PKG_DESTDIR_SUPPORT=   user-destdir
Index: misc/bbdb/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/misc/bbdb/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- misc/bbdb/distinfo  19 Nov 2008 13:03:37 -0000      1.3
+++ misc/bbdb/distinfo  13 May 2011 13:43:06 -0000
@@ -4,3 +4,4 @@
 RMD160 (bbdb-2.34.tar.gz) = 24e4606cb94b5c311139fab910af909f5b95e0fa
 Size (bbdb-2.34.tar.gz) = 363841 bytes
 SHA1 (patch-aa) = 4b9942a4b1f8e2675cdaca67777c80d6490d01ac
+SHA1 (patch-ab) = b98668b270174163452fb65dab46f4fc41895e61
Index: misc/bbdb/patches/patch-ab
===================================================================
RCS file: misc/bbdb/patches/patch-ab
diff -N misc/bbdb/patches/patch-ab
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ misc/bbdb/patches/patch-ab  13 May 2011 13:43:06 -0000
@@ -0,0 +1,19 @@
+$NetBSD$
+
+To avoid being flagged by emacs-24.0.50
+ bbdb-mhe.el:56:41:Error: Invalid function: 
+ bbdb-mhe.el:38:30:Warning: `(\` (let* ((attrs (file-attributes ((\,
+       ..... (ommitted)
+     status-time-2)))))' is a malformed function
+
+--- work/bbdb-2.34/lisp/bbdb-mhe.el.orig       2011-04-02 20:42:13.000000000 
+0900
++++ lisp/bbdb-mhe.el   2011-04-02 20:42:28.000000000 +0900
+@@ -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)))

>Unformatted: