Add/Modify patches for building with emacs-27

4 files changed, 64 insertions, 6 deletions

diff --git a/misc/bbdb/distinfo b/misc/bbdb/distinfo
index 7a1f2514410..bfcf73fd03e 100644
--- a/misc/bbdb/distinfo
+++ b/misc/bbdb/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 23:49:31 agc Exp $
+$NetBSD: distinfo,v 1.7 2018/02/01 11:21:58 mef Exp $
 
 SHA1 (bbdb-2.35.tar.gz) = 5fc27ed404e7de1628494a706da96504398ffd20
 RMD160 (bbdb-2.35.tar.gz) = ea212acd00c18b9a8c3a8b1aa4b1c5727ea3a55c
 SHA512 (bbdb-2.35.tar.gz) = 28a7dcf8521e78621aad9369d346d942fe5b08d868f2286b12921e0d6924f9d9495066223b1aa71862a71558d0f85dca40fbe0ce8880844fb2be5ccb931fd60c
 Size (bbdb-2.35.tar.gz) = 767464 bytes
 SHA1 (patch-aa) = 4b9942a4b1f8e2675cdaca67777c80d6490d01ac
-SHA1 (patch-lisp_bbdb-mhe.el) = c5b83ce06528db10d0f468d2d10d73ccb6dc453e
+SHA1 (patch-lisp_bbdb-com.el) = 1f6af496f53636da2d4fc893f033fda820bec07c
+SHA1 (patch-lisp_bbdb-mhe.el) = f78ad5d1fb5a2ee00040d7975ff9bc6b1d1cac24
+SHA1 (patch-lisp_bbdb-whois.el) = 4af0259e5cce56780405f42eb55c4ebf942097ac
diff --git a/misc/bbdb/patches/patch-lisp_bbdb-com.el b/misc/bbdb/patches/patch-lisp_bbdb-com.el
new file mode 100644
index 00000000000..45ab86a020d
--- /dev/null
+++ b/misc/bbdb/patches/patch-lisp_bbdb-com.el
@@ -0,0 +1,25 @@
+$NetBSD: patch-lisp_bbdb-com.el,v 1.1 2018/02/01 11:21:58 mef Exp $
+
+:Warning: !! The file uses old-style backquotes !!
+This functionality has been obsolete for more than 10 years already
+
+--- lisp/bbdb-com.el~	2007-01-31 07:09:25.000000000 +0900
++++ lisp/bbdb-com.el	2018-02-01 12:57:45.799555302 +0900
+@@ -124,7 +124,7 @@ If you want to reverse the search, bind 
+     (if phone
+         (setq clauses
+               (cons
+-               (` (let ((rest-of-phones (bbdb-record-phones record))
++                `(let ((rest-of-phones (bbdb-record-phones record))
+                         (done nil))
+                     (if rest-of-phones
+                         (while (and rest-of-phones (not done))
+@@ -136,7 +136,7 @@ If you want to reverse the search, bind 
+                       ;; so that "^$" can be used to find entries that
+                       ;; have no phones
+                       (setq done (string-match (, phone) "")))
+-                    done))
++                    done)
+                clauses)))
+     (if notes
+         (setq clauses
diff --git a/misc/bbdb/patches/patch-lisp_bbdb-mhe.el b/misc/bbdb/patches/patch-lisp_bbdb-mhe.el
index 31042fcd2cb..7e5df6980f6 100644
--- a/misc/bbdb/patches/patch-lisp_bbdb-mhe.el
+++ b/misc/bbdb/patches/patch-lisp_bbdb-mhe.el
@@ -1,15 +1,26 @@
-$NetBSD: patch-lisp_bbdb-mhe.el,v 1.1 2011/10/11 19:30:40 minskim Exp $
+$NetBSD: patch-lisp_bbdb-mhe.el,v 1.2 2018/02/01 11:21:58 mef Exp $
 
 Make bbdb build with emacs-24.
+(emacs-27):Warning: !! The file uses old-style backquotes !!
+This functionality has been obsolete for more than 10 years already
 
---- lisp/bbdb-mhe.el.orig	2001-08-31 15:07:47.000000000 +0000
-+++ lisp/bbdb-mhe.el
+--- lisp/bbdb-mhe.el.orig	2007-01-31 07:08:33.000000000 +0900
++++ lisp/bbdb-mhe.el	2018-02-01 13:22:21.336378903 +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)))
++   `(let* ((attrs (file-attributes (, message)))
             (status-time (nth 6 attrs))
             (status-time-2 (cdr status-time))
             (inode (nth 10 attrs)))
+@@ -50,7 +50,7 @@
+               ;; return it as list.
+               (if (integerp status-time-2)
+                   status-time-2
+-                (car status-time-2))))))
++                (car status-time-2)))))
+ 
+ ;;;###autoload
+ (defun bbdb/mh-update-record (&optional offer-to-create)
diff --git a/misc/bbdb/patches/patch-lisp_bbdb-whois.el b/misc/bbdb/patches/patch-lisp_bbdb-whois.el
new file mode 100644
index 00000000000..8cbd8ee767a
--- /dev/null
+++ b/misc/bbdb/patches/patch-lisp_bbdb-whois.el
@@ -0,0 +1,20 @@
+$NetBSD: patch-lisp_bbdb-whois.el,v 1.1 2018/02/01 11:21:58 mef Exp $
+
+:Warning: !! The file uses old-style backquotes !!
+This functionality has been obsolete for more than 10 years already
+
+--- lisp/bbdb-whois.el~	2007-01-31 07:08:33.000000000 +0900
++++ lisp/bbdb-whois.el	2018-02-01 12:58:26.952751936 +0900
+@@ -25,10 +25,10 @@
+ (defmacro bbdb-add-to-field (record field text)
+   (let ((get (intern (concat "bbdb-record-" (symbol-name field))))
+     (set (intern (concat "bbdb-record-set-" (symbol-name field)))))
+-    (` (let ((old ((, get) (, record)))
++      `(let ((old ((, get) (, record)))
+          (text (, text)))
+      (or (member text old)
+-         ((, set) (, record) (nconc old (list text))))))))
++         ((, set) (, record) (nconc old (list text)))))))
+ 
+ (defcustom bbdb-whois-server (or (and (boundp 'whois-server) whois-server)
+                                  "whois.geektools.com")