Wed Jul 31 14:04:40 2019 UTC ()
w3/url.el: Provide buffer-local-value for the sake of XEmacs 21.4
Minor pkglinting


(hauke)
diff -r1.71 -r1.72 pkgsrc/editors/xemacs-packages/Makefile
diff -r1.25 -r1.26 pkgsrc/editors/xemacs-packages/distinfo
diff -r0 -r1.1 pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el
cvs diff -r1.71 -r1.72 pkgsrc/editors/xemacs-packages/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/xemacs-packages/Makefile 2019/06/08 10:41:00 1.71
+++ pkgsrc/editors/xemacs-packages/Makefile 2019/07/31 14:04:40 1.72
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.71 2019/06/08 10:41:00 rillig Exp $ 1# $NetBSD: Makefile,v 1.72 2019/07/31 14:04:40 hauke Exp $
2 2
3DISTNAME= xemacs-packages 3DISTNAME= xemacs-packages
4PKGNAME= xemacs-packages-1.18 4PKGNAME= xemacs-packages-1.18
5PKGREVISION= 2 5PKGREVISION= 3
6 6
7CATEGORIES= editors 7CATEGORIES= editors
8MASTER_SITES= ${MASTER_SITE_XEMACS:=${XEMACSPKG_PATH}/} 8MASTER_SITES= ${MASTER_SITE_XEMACS:=${XEMACSPKG_PATH}/}
9XEMACSPKG_PATH= beta/experimental/packages 9XEMACSPKG_PATH= beta/experimental/packages
10DISTFILES= \ 10DISTFILES= \
11 Sun-1.19-pkg.tar.gz \ 11 Sun-1.19-pkg.tar.gz \
12 ada-1.16-pkg.tar.gz \ 12 ada-1.16-pkg.tar.gz \
13 apel-1.36-pkg.tar.gz \ 13 apel-1.36-pkg.tar.gz \
14 auctex-1.56-pkg.tar.gz \ 14 auctex-1.56-pkg.tar.gz \
15 bbdb-1.34-pkg.tar.gz \ 15 bbdb-1.34-pkg.tar.gz \
16 build-1.18-pkg.tar.gz \ 16 build-1.18-pkg.tar.gz \
17 c-support-1.24-pkg.tar.gz \ 17 c-support-1.24-pkg.tar.gz \
18 calc-1.28-pkg.tar.gz \ 18 calc-1.28-pkg.tar.gz \
@@ -132,27 +132,27 @@ DISTFILES= \ @@ -132,27 +132,27 @@ DISTFILES= \
132 xemacs-devel-1.84-pkg.tar.gz \ 132 xemacs-devel-1.84-pkg.tar.gz \
133 xetla-1.04-pkg.tar.gz \ 133 xetla-1.04-pkg.tar.gz \
134 xlib-1.16-pkg.tar.gz \ 134 xlib-1.16-pkg.tar.gz \
135 xslide-1.11-pkg.tar.gz \ 135 xslide-1.11-pkg.tar.gz \
136 xslt-process-1.14-pkg.tar.gz \ 136 xslt-process-1.14-pkg.tar.gz \
137 xwem-1.25-pkg.tar.gz \ 137 xwem-1.25-pkg.tar.gz \
138 zenirc-1.18-pkg.tar.gz 138 zenirc-1.18-pkg.tar.gz
139### DISTFILES 139### DISTFILES
140 140
141# leim/hebrew.el causes build problems, we use stable package instead 141# leim/hebrew.el causes build problems, we use stable package instead
142# leim-1.38-pkg.tar.gz \ 142# leim-1.38-pkg.tar.gz \
143 143
144DISTFILES+= leim-1.31-pkg.tar.gz 144DISTFILES+= leim-1.31-pkg.tar.gz
145SITES.leim-1.31-pkg.tar.gz= ${MASTER_SITE_XEMACS:="packages/"} 145SITES.leim-1.31-pkg.tar.gz= ${MASTER_SITE_XEMACS:=packages/}
146 146
147MAINTAINER= hauke@NetBSD.org 147MAINTAINER= hauke@NetBSD.org
148HOMEPAGE= http://www.xemacs.org/ 148HOMEPAGE= http://www.xemacs.org/
149COMMENT= Common elisp packages for xemacs 21 149COMMENT= Common elisp packages for xemacs 21
150 150
151DEPENDS+= xemacs{,-nox11}>=21.1.14:../../editors/xemacs 151DEPENDS+= xemacs{,-nox11}>=21.1.14:../../editors/xemacs
152 152
153DIST_SUBDIR= ${PKGBASE} 153DIST_SUBDIR= ${PKGBASE}
154EXTRACT_DIR= ${WRKDIR}/${PKGBASE} 154EXTRACT_DIR= ${WRKDIR}/${PKGBASE}
155 155
156# cedet-common-1.03-pkg.tar.gz hard-links two files to themselves, 156# cedet-common-1.03-pkg.tar.gz hard-links two files to themselves,
157# which the default nbtar does not take well 157# which the default nbtar does not take well
158EXTRACT_USING= gtar 158EXTRACT_USING= gtar
@@ -214,27 +214,27 @@ xemacs-fetch-package-list: @@ -214,27 +214,27 @@ xemacs-fetch-package-list:
214xemacs-merge-package-list: 214xemacs-merge-package-list:
215 { \ 215 { \
216 ${SED} '/^DISTFILES/q' ${PKGDIR}/Makefile; \ 216 ${SED} '/^DISTFILES/q' ${PKGDIR}/Makefile; \
217 ${SED} 's|^| |' ${PKGDIR}/packages.list; \ 217 ${SED} 's|^| |' ${PKGDIR}/packages.list; \
218 ${SED} -n '/^### DISTFILES/,$$p' ${PKGDIR}/Makefile; \ 218 ${SED} -n '/^### DISTFILES/,$$p' ${PKGDIR}/Makefile; \
219 } >${PKGDIR}/Makefile.work 219 } >${PKGDIR}/Makefile.work
220 { \ 220 { \
221 ${PRINTF} '/^DISTFILES\n+1\nka\n/^### DISTFILES\n-2\nkb\n'; \ 221 ${PRINTF} '/^DISTFILES\n+1\nka\n/^### DISTFILES\n-2\nkb\n'; \
222 ${PRINTF} "'a,'b"'s/$$/ \\\\/\nw\nq\n'; \ 222 ${PRINTF} "'a,'b"'s/$$/ \\\\/\nw\nq\n'; \
223 } | ${ED} - ${PKGDIR}/Makefile.work 223 } | ${ED} - ${PKGDIR}/Makefile.work
224 224
225.PHONY: xemacs-update-package 225.PHONY: xemacs-update-package
226xemacs-update-package: xemacs-fetch-package-list xemacs-merge-package-list 226xemacs-update-package: xemacs-fetch-package-list xemacs-merge-package-list
227.endif # PKG_DEVELOPER && OPSYS == "NetBSD" 227.endif # defined(PKG_DEVELOPER) && ${OPSYS} == "NetBSD"
228 228
229pre-configure: 229pre-configure:
230 @${ECHO_MSG} "Fixing file permissions ... " 230 @${ECHO_MSG} "Fixing file permissions ... "
231 ${CHMOD} -R u+w,go-w ${WRKSRC} 231 ${CHMOD} -R u+w,go-w ${WRKSRC}
232 ${CHMOD} g+r,o+r ${WRKSRC}/lisp/auctex/ChangeLog 232 ${CHMOD} g+r,o+r ${WRKSRC}/lisp/auctex/ChangeLog
233 ${CHMOD} ugo-x ${WRKSRC}/lisp/erc/ChangeLog.2005.upstream 233 ${CHMOD} ugo-x ${WRKSRC}/lisp/erc/ChangeLog.2005.upstream
234 ${FIND} ${WRKSRC} -type f -and -perm -100 \ 234 ${FIND} ${WRKSRC} -type f -and -perm -100 \
235 -and \( -name "*.el" -or -name "*.gif" -or -name "*.jar" \) \ 235 -and \( -name "*.el" -or -name "*.gif" -or -name "*.jar" \) \
236 -exec ${CHMOD} ugo-x \{\} \; 236 -exec ${CHMOD} ugo-x \{\} \;
237 @${ECHO_MSG} "done" 237 @${ECHO_MSG} "done"
238 @${ECHO_MSG} "Re-compiling patched elisp files ... " 238 @${ECHO_MSG} "Re-compiling patched elisp files ... "
239 for ff in `cat ${PATCHDIR}/*.el | awk '/^\\+\\+\\+/ { print $$2 }'` ; do \ 239 for ff in `cat ${PATCHDIR}/*.el | awk '/^\\+\\+\\+/ { print $$2 }'` ; do \
240 ${RM} -f ${WRKSRC}/$${ff}.orig ; \ 240 ${RM} -f ${WRKSRC}/$${ff}.orig ; \
cvs diff -r1.25 -r1.26 pkgsrc/editors/xemacs-packages/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/xemacs-packages/distinfo 2017/08/10 12:02:08 1.25
+++ pkgsrc/editors/xemacs-packages/distinfo 2019/07/31 14:04:40 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.25 2017/08/10 12:02:08 hauke Exp $ 1$NetBSD: distinfo,v 1.26 2019/07/31 14:04:40 hauke Exp $
2 2
3SHA1 (xemacs-packages/Sun-1.19-pkg.tar.gz) = de24d0bf78e753e733138c6a2bec0ecf414511e0 3SHA1 (xemacs-packages/Sun-1.19-pkg.tar.gz) = de24d0bf78e753e733138c6a2bec0ecf414511e0
4RMD160 (xemacs-packages/Sun-1.19-pkg.tar.gz) = 5f6bec6276f8b5a59ea6532f12c06a474571a274 4RMD160 (xemacs-packages/Sun-1.19-pkg.tar.gz) = 5f6bec6276f8b5a59ea6532f12c06a474571a274
5SHA512 (xemacs-packages/Sun-1.19-pkg.tar.gz) = d8d96149040ab8afaca79149a4233e46aa032ac95e93b42e11c05fba466acca3b8d709664c2ba1cc9a9b416095e017a1064c76a169031aa88256d768677e7ada 5SHA512 (xemacs-packages/Sun-1.19-pkg.tar.gz) = d8d96149040ab8afaca79149a4233e46aa032ac95e93b42e11c05fba466acca3b8d709664c2ba1cc9a9b416095e017a1064c76a169031aa88256d768677e7ada
6Size (xemacs-packages/Sun-1.19-pkg.tar.gz) = 64399 bytes 6Size (xemacs-packages/Sun-1.19-pkg.tar.gz) = 64399 bytes
7SHA1 (xemacs-packages/ada-1.16-pkg.tar.gz) = cfbae4bc7bed5083a48e57904b5ff754db89f8c3 7SHA1 (xemacs-packages/ada-1.16-pkg.tar.gz) = cfbae4bc7bed5083a48e57904b5ff754db89f8c3
8RMD160 (xemacs-packages/ada-1.16-pkg.tar.gz) = 9cfc4c13c6f1eba0770bb17ef658884dfeb4d87e 8RMD160 (xemacs-packages/ada-1.16-pkg.tar.gz) = 9cfc4c13c6f1eba0770bb17ef658884dfeb4d87e
9SHA512 (xemacs-packages/ada-1.16-pkg.tar.gz) = 7319536283c0a24c3cea6818bc9db45fe04889b6458277f0434701aeacc8d09ff08424fdb341ea6d4ba0d885f9df638a0ac7f00a2239358c97c5aa3e838d6472 9SHA512 (xemacs-packages/ada-1.16-pkg.tar.gz) = 7319536283c0a24c3cea6818bc9db45fe04889b6458277f0434701aeacc8d09ff08424fdb341ea6d4ba0d885f9df638a0ac7f00a2239358c97c5aa3e838d6472
10Size (xemacs-packages/ada-1.16-pkg.tar.gz) = 55840 bytes 10Size (xemacs-packages/ada-1.16-pkg.tar.gz) = 55840 bytes
11SHA1 (xemacs-packages/apel-1.36-pkg.tar.gz) = 990590133817b69a8af29ad49da9b029f8d24576 11SHA1 (xemacs-packages/apel-1.36-pkg.tar.gz) = 990590133817b69a8af29ad49da9b029f8d24576
12RMD160 (xemacs-packages/apel-1.36-pkg.tar.gz) = b43b51de62c6878ea2c4d075c2726b5192456066 12RMD160 (xemacs-packages/apel-1.36-pkg.tar.gz) = b43b51de62c6878ea2c4d075c2726b5192456066
13SHA512 (xemacs-packages/apel-1.36-pkg.tar.gz) = 378ca9bd3eb1b482cfe402f0c4310cf1058626ced013ce1487f79f34e7767e80a858fe104416693253f770e7a5e0d097a0a4b182303db571bcaa1cc8117706d4 13SHA512 (xemacs-packages/apel-1.36-pkg.tar.gz) = 378ca9bd3eb1b482cfe402f0c4310cf1058626ced013ce1487f79f34e7767e80a858fe104416693253f770e7a5e0d097a0a4b182303db571bcaa1cc8117706d4
14Size (xemacs-packages/apel-1.36-pkg.tar.gz) = 127236 bytes 14Size (xemacs-packages/apel-1.36-pkg.tar.gz) = 127236 bytes
@@ -509,13 +509,14 @@ RMD160 (xemacs-packages/xslt-process-1.1 @@ -509,13 +509,14 @@ RMD160 (xemacs-packages/xslt-process-1.1
509SHA512 (xemacs-packages/xslt-process-1.14-pkg.tar.gz) = f2bf57849230a3500ae599a7cf152d370ea7990c30762ee8f4a9adc07bf85b3289ab6aa0fbf37c747a1bd04292e5ccc41c1064daafc67a0a77f54bed7997e580 509SHA512 (xemacs-packages/xslt-process-1.14-pkg.tar.gz) = f2bf57849230a3500ae599a7cf152d370ea7990c30762ee8f4a9adc07bf85b3289ab6aa0fbf37c747a1bd04292e5ccc41c1064daafc67a0a77f54bed7997e580
510Size (xemacs-packages/xslt-process-1.14-pkg.tar.gz) = 60585 bytes 510Size (xemacs-packages/xslt-process-1.14-pkg.tar.gz) = 60585 bytes
511SHA1 (xemacs-packages/xwem-1.25-pkg.tar.gz) = 4e1b52f103c8d8277ae02b0d59bee91f031cd647 511SHA1 (xemacs-packages/xwem-1.25-pkg.tar.gz) = 4e1b52f103c8d8277ae02b0d59bee91f031cd647
512RMD160 (xemacs-packages/xwem-1.25-pkg.tar.gz) = a4b13e1b313aec0b7c44b2772e5181f6b6127335 512RMD160 (xemacs-packages/xwem-1.25-pkg.tar.gz) = a4b13e1b313aec0b7c44b2772e5181f6b6127335
513SHA512 (xemacs-packages/xwem-1.25-pkg.tar.gz) = c26684fe869bf69e61ad21e71a21fe45c55c07f1467b6810ffd528b5394bdb7b6316fd2d3bbacce8278025d2670106e491f7137d5bdb766a6093ff11d5a9c5db 513SHA512 (xemacs-packages/xwem-1.25-pkg.tar.gz) = c26684fe869bf69e61ad21e71a21fe45c55c07f1467b6810ffd528b5394bdb7b6316fd2d3bbacce8278025d2670106e491f7137d5bdb766a6093ff11d5a9c5db
514Size (xemacs-packages/xwem-1.25-pkg.tar.gz) = 649034 bytes 514Size (xemacs-packages/xwem-1.25-pkg.tar.gz) = 649034 bytes
515SHA1 (xemacs-packages/zenirc-1.18-pkg.tar.gz) = f9c76c2092c1c0cc97df064c394c7480b2ea214e 515SHA1 (xemacs-packages/zenirc-1.18-pkg.tar.gz) = f9c76c2092c1c0cc97df064c394c7480b2ea214e
516RMD160 (xemacs-packages/zenirc-1.18-pkg.tar.gz) = 907d8eb2d1b5a8ba0437f45a62168450b84fd803 516RMD160 (xemacs-packages/zenirc-1.18-pkg.tar.gz) = 907d8eb2d1b5a8ba0437f45a62168450b84fd803
517SHA512 (xemacs-packages/zenirc-1.18-pkg.tar.gz) = 152a3a4d9aaa2e38af62db13c222d9d127e720a82e9759036d64af7ab9f21712a4efb02a1371fc7869dc227bbda7a13470641a964f341f69e5884768082f84b5 517SHA512 (xemacs-packages/zenirc-1.18-pkg.tar.gz) = 152a3a4d9aaa2e38af62db13c222d9d127e720a82e9759036d64af7ab9f21712a4efb02a1371fc7869dc227bbda7a13470641a964f341f69e5884768082f84b5
518Size (xemacs-packages/zenirc-1.18-pkg.tar.gz) = 278677 bytes 518Size (xemacs-packages/zenirc-1.18-pkg.tar.gz) = 278677 bytes
519SHA1 (patch-lisp_guided-tour_guided-tour.el) = 28556cc7fbb9a18ba88d6e2cf23f3b517461f580 519SHA1 (patch-lisp_guided-tour_guided-tour.el) = 28556cc7fbb9a18ba88d6e2cf23f3b517461f580
520SHA1 (patch-lisp_vc_vc-git.el) = 8b5aa902cc56a256c9c2210b49437bf7929f6e30 520SHA1 (patch-lisp_vc_vc-git.el) = 8b5aa902cc56a256c9c2210b49437bf7929f6e30
521SHA1 (patch-lisp_vc_vc.el) = ec13ecf02b41dca5bb80afc63ee4fb9f0b283a45 521SHA1 (patch-lisp_vc_vc.el) = ec13ecf02b41dca5bb80afc63ee4fb9f0b283a45
 522SHA1 (patch-lisp_w3_url.el) = 551e11abffe6df7693003ca2aad5238fbd6c0116
File Added: pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el
$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))