CVS commit: pkgsrc/editors/xemacs-packages

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Jul 31 14:04:40 UTC 2019

Modified Files:
        pkgsrc/editors/xemacs-packages: Makefile distinfo
Added Files:
        pkgsrc/editors/xemacs-packages/patches: patch-lisp_w3_url.el

Log Message:
w3/url.el: Provide buffer-local-value for the sake of XEmacs 21.4
Minor pkglinting


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/editors/xemacs-packages/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/editors/xemacs-packages/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/xemacs-packages/Makefile
diff -u pkgsrc/editors/xemacs-packages/Makefile:1.71 pkgsrc/editors/xemacs-packages/Makefile:1.72
--- pkgsrc/editors/xemacs-packages/Makefile:1.71        Sat Jun  8 10:41:00 2019
+++ pkgsrc/editors/xemacs-packages/Makefile     Wed Jul 31 14:04:40 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2019/06/08 10:41:00 rillig Exp $
+# $NetBSD: Makefile,v 1.72 2019/07/31 14:04:40 hauke Exp $
 
 DISTNAME=      xemacs-packages
 PKGNAME=       xemacs-packages-1.18
-PKGREVISION=   2
+PKGREVISION=   3
 
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=${XEMACSPKG_PATH}/}
@@ -142,7 +142,7 @@ DISTFILES=  \
 #              leim-1.38-pkg.tar.gz \
 
 DISTFILES+=    leim-1.31-pkg.tar.gz
-SITES.leim-1.31-pkg.tar.gz= ${MASTER_SITE_XEMACS:="packages/"}
+SITES.leim-1.31-pkg.tar.gz= ${MASTER_SITE_XEMACS:=packages/}
 
 MAINTAINER=    hauke%NetBSD.org@localhost
 HOMEPAGE=      http://www.xemacs.org/
@@ -224,7 +224,7 @@ xemacs-merge-package-list:
 
 .PHONY: xemacs-update-package
 xemacs-update-package: xemacs-fetch-package-list xemacs-merge-package-list
-.endif # PKG_DEVELOPER && OPSYS == "NetBSD"
+.endif # defined(PKG_DEVELOPER) && ${OPSYS} == "NetBSD"
 
 pre-configure:
        @${ECHO_MSG} "Fixing file permissions ... "

Index: pkgsrc/editors/xemacs-packages/distinfo
diff -u pkgsrc/editors/xemacs-packages/distinfo:1.25 pkgsrc/editors/xemacs-packages/distinfo:1.26
--- pkgsrc/editors/xemacs-packages/distinfo:1.25        Thu Aug 10 12:02:08 2017
+++ pkgsrc/editors/xemacs-packages/distinfo     Wed Jul 31 14:04:40 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2017/08/10 12:02:08 hauke Exp $
+$NetBSD: distinfo,v 1.26 2019/07/31 14:04:40 hauke Exp $
 
 SHA1 (xemacs-packages/Sun-1.19-pkg.tar.gz) = de24d0bf78e753e733138c6a2bec0ecf414511e0
 RMD160 (xemacs-packages/Sun-1.19-pkg.tar.gz) = 5f6bec6276f8b5a59ea6532f12c06a474571a274
@@ -519,3 +519,4 @@ Size (xemacs-packages/zenirc-1.18-pkg.ta
 SHA1 (patch-lisp_guided-tour_guided-tour.el) = 28556cc7fbb9a18ba88d6e2cf23f3b517461f580
 SHA1 (patch-lisp_vc_vc-git.el) = 8b5aa902cc56a256c9c2210b49437bf7929f6e30
 SHA1 (patch-lisp_vc_vc.el) = ec13ecf02b41dca5bb80afc63ee4fb9f0b283a45
+SHA1 (patch-lisp_w3_url.el) = 551e11abffe6df7693003ca2aad5238fbd6c0116

Added files:

Index: pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el
diff -u /dev/null pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el:1.1
--- /dev/null   Wed Jul 31 14:04:40 2019
+++ pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el Wed Jul 31 14:04:40 2019
@@ -0,0 +1,36 @@
+$NetBSD: patch-lisp_w3_url.el,v 1.1 2019/07/31 14:04:40 hauke Exp $
+
+Provide buffer-local-value for the sake of XEmacs 21.4
+
+--- lisp/w3/url.el.orig        2015-12-14 21:38:21.000000000 +0000
++++ lisp/w3/url.el
+@@ -57,6 +57,16 @@
+   :type 'directory
+   :group 'url)
+ 
++(defun url-buffer-local-value (sym buffer)
++  "Get the buffer-local value of variable SYM in BUFFER. If there is no
++buffer-local value in BUFFER then the global value of SYM is used."
++  (if (fboundp 'buffer-local-value)
++      (buffer-local-value sym buffer)
++    (or (cdr (assoc sym (buffer-local-variables buffer)))
++        (save-excursion
++          (set-buffer buffer)
++          (symbol-value sym)))))
++
+ (defun url-do-setup ()
+   "Setup the URL package.
+ This is to avoid conflict with user settings if URL is dumped with
+@@ -256,10 +266,10 @@ no further processing).  URL is either a
+         (url-debug 'retrieval
+                    "Spinning in url-retrieve-synchronously: %S (%S)"
+                    retrieval-done asynch-buffer)
+-          (if (buffer-local-value 'url-redirect-buffer asynch-buffer)
++          (if (url-buffer-local-value 'url-redirect-buffer asynch-buffer)
+               (setq proc (get-buffer-process
+                           (setq asynch-buffer
+-                                (buffer-local-value 'url-redirect-buffer
++                                (url-buffer-local-value 'url-redirect-buffer
+                                                     asynch-buffer))))
+             (if (and proc (memq (process-status proc)
+                                 '(closed exit signal failed))