kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update emacs to 22.3.

Browse source 
Below is a simplified etc/NEWS; see the real file for full detail!

----
* Changes in Emacs 22.3

** Support for several obsolete platforms will be removed in the next
major version of Emacs.

*** Support for systems without alloca will be removed.

*** Support for Sun windows will be removed.

*** Support for VMS will be removed.

* Incompatible Editing Changes in Emacs 22.3

** The following input methods were removed in Emacs 22.2, but this was
not advertised: danish-alt-postfix, esperanto-alt-postfix,
finnish-alt-postfix, german-alt-postfix, icelandic-alt-postfix,
norwegian-alt-postfix, scandinavian-alt-postfix, spanish-alt-postfix,
and swedish-alt-postfix.  Use the versions without "alt-", which are
identical.

* Installation Changes in Emacs 22.2

** Emacs is now licensed under the GNU GPL version 3 (or later).

** Support for GNU/kFreeBSD (GNU userland and FreeBSD kernel) was added.

** Deprecated machine types and operating systems

(snip)

* Changes in Emacs 22.2

** `describe-project' is renamed to `describe-gnu-project'.

** `view-todo' is renamed to `view-emacs-todo'.

** `find-name-dired' now uses -iname rather than -name
for case-insensitive filesystems.

** In Image mode, whenever the displayed image is wider and/or higher
than the window, the usual keys for moving the cursor cause the image
to be scrolled horizontally or vertically instead.

** Emacs can use stock icons in the tool bar when compiled with Gtk+.

** Scrollbars follow the system theme on Windows XP and later.

** focus-follows-mouse defaults to nil on MS Windows.

** `bad-packages-alist' will warn about external packages that are known
to cause problems in this version of Emacs.

** The values of `dired-recursive-deletes' and `dired-recursive-copies'
have been changed to `top'.

** `browse-url-emacs' loads a URL into an Emacs buffer.  Handy for *.el URLs.

** The command gdba has been removed as gdb works now for those cases where it
was needed.

** desktop.el now detects conflicting uses of the desktop file.

** Compilation mode now correctly respects the value of
`compilation-scroll-output' between invocations.

** `font-lock-comment-face' no longer differs from the default on
displays with fewer than 16 colors and dark background (e.g. older
xterms and the Linux console).

* New Modes and Packages in Emacs 22.2

** bibtex-style-mode helps you write BibTeX's *.bst files.

** The new package css-mode.el provides a major mode for editing CSS files.

** The new package vera-mode.el provides a major mode for editing Vera files.

** The new package verilog-mode.el provides a major mode for editing Verilog files.

** The new package socks.el implements the SOCKS v5 protocol.

** VC

*** VC backends can provide completion of revision names.

*** VC backends can provide extra menu entries to the "Version Control" menu.
This can be used to add menu entries for backend specific functions.

*** VC has some support for Mercurial (Hg).

*** VC has some support for Monotone (Mtn).

*** VC has some support for Bazaar (Bzr).

*** VC has some support for Git.

* Incompatible Lisp Changes in Emacs 22.2

** shell.el no longer defines the aliases `dirtrack-toggle' and
`dirtrack-mode' for `shell-dirtrack-mode'.

* Lisp Changes in Emacs 22.2.

** Frame-local variables are deprecated and are slated for removal.

** The function invisible-p returns non-nil if the character
after a specified position is invisible.

** inhibit-modification-hooks is bound to t while running modification hooks.

** New function `window-full-width-p' returns t if a window is as wide
as its frame.

** The new function `image-refresh' refreshes all images associated
with a given image specification.

** The new function `combine-and-quote-strings' concatenates a list of strings
using a specified separator.  If a string contains double quotes, they
are escaped in the output.

** The new function `split-string-and-unquote' performs the inverse operation to
`combine-and-quote-strings', i.e. splits a single string into a list
of strings, undoing any quoting added by `combine-and-quote-strings'.
(For some separator/string combinations, the original strings cannot
be recovered.)
This commit is contained in:
uebayasi 2008-10-11 09:56:38 +00:00
parent 34004f51e0
commit b025a518d0
25 changed files with 110 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editors/emacs-nox11/version.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
# $NetBSD: version.mk,v 1.2 2008/10/11 09:56:38 uebayasi Exp $
_EMACS_FLAVOR= emacs
_EMACS_REQD= emacs-nox11>=22<23
@ -6,4 +6,4 @@ _EMACS_PKGDEP.base=
_EMACS_PKGDEP.leim=
_EMACS_VERSION_MAJOR= 22
_EMACS_VERSION_MINOR= 1
_EMACS_VERSION_MINOR= 3

5
editors/emacs/Makefile
View file

@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.114 2008/09/25 14:02:09 wiz Exp $
# $NetBSD: Makefile,v 1.115 2008/10/11 09:56:38 uebayasi Exp $
PKGNAME?= ${DISTNAME}
COMMENT?= GNU editing macros (editor)
DISTNAME= emacs-22.1
PKGREVISION= 6
DISTNAME= emacs-22.3
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}

34
editors/emacs/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.19 2008/05/09 17:01:58 jwise Exp $
@comment $NetBSD: PLIST,v 1.20 2008/10/11 09:56:38 uebayasi Exp $
bin/emacs-b2m
bin/emacs-ctags
bin/emacs-ebrowse
@ -281,6 +281,7 @@ share/emacs/${PKGVERSION}/etc/images/gnus/kill-group.pbm
share/emacs/${PKGVERSION}/etc/images/gnus/kill-group.xpm
share/emacs/${PKGVERSION}/etc/images/gnus/mail-reply.pbm
share/emacs/${PKGVERSION}/etc/images/gnus/mail-reply.xpm
share/emacs/${PKGVERSION}/etc/images/gnus/mail-send.xpm
share/emacs/${PKGVERSION}/etc/images/gnus/next-ur.pbm
share/emacs/${PKGVERSION}/etc/images/gnus/next-ur.xpm
share/emacs/${PKGVERSION}/etc/images/gnus/post.pbm
@ -983,6 +984,7 @@ share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-extra.el.gz
share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-extra.elc
share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-indent.el.gz
share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-indent.elc
share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-loaddefs.el
share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-macs.el.gz
share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-macs.elc
share/emacs/${PKGVERSION}/lisp/emacs-lisp/cl-seq.el.gz
@ -1178,8 +1180,6 @@ share/emacs/${PKGVERSION}/lisp/erc/erc-netsplit.el.gz
share/emacs/${PKGVERSION}/lisp/erc/erc-netsplit.elc
share/emacs/${PKGVERSION}/lisp/erc/erc-networks.el.gz
share/emacs/${PKGVERSION}/lisp/erc/erc-networks.elc
share/emacs/${PKGVERSION}/lisp/erc/erc-nicklist.el.gz
share/emacs/${PKGVERSION}/lisp/erc/erc-nicklist.elc
share/emacs/${PKGVERSION}/lisp/erc/erc-notify.el.gz
share/emacs/${PKGVERSION}/lisp/erc/erc-notify.elc
share/emacs/${PKGVERSION}/lisp/erc/erc-page.el.gz
@ -1987,6 +1987,8 @@ share/emacs/${PKGVERSION}/lisp/net/rlogin.el.gz
share/emacs/${PKGVERSION}/lisp/net/rlogin.elc
share/emacs/${PKGVERSION}/lisp/net/snmp-mode.el.gz
share/emacs/${PKGVERSION}/lisp/net/snmp-mode.elc
share/emacs/${PKGVERSION}/lisp/net/socks.el.gz
share/emacs/${PKGVERSION}/lisp/net/socks.elc
share/emacs/${PKGVERSION}/lisp/net/telnet.el.gz
share/emacs/${PKGVERSION}/lisp/net/telnet.elc
share/emacs/${PKGVERSION}/lisp/net/tls.el.gz
@ -2313,6 +2315,10 @@ share/emacs/${PKGVERSION}/lisp/progmodes/sql.el.gz
share/emacs/${PKGVERSION}/lisp/progmodes/sql.elc
share/emacs/${PKGVERSION}/lisp/progmodes/tcl.el.gz
share/emacs/${PKGVERSION}/lisp/progmodes/tcl.elc
share/emacs/${PKGVERSION}/lisp/progmodes/vera-mode.el.gz
share/emacs/${PKGVERSION}/lisp/progmodes/vera-mode.elc
share/emacs/${PKGVERSION}/lisp/progmodes/verilog-mode.el.gz
share/emacs/${PKGVERSION}/lisp/progmodes/verilog-mode.elc
share/emacs/${PKGVERSION}/lisp/progmodes/vhdl-mode.el.gz
share/emacs/${PKGVERSION}/lisp/progmodes/vhdl-mode.elc
share/emacs/${PKGVERSION}/lisp/progmodes/which-func.el.gz
@ -2454,10 +2460,14 @@ share/emacs/${PKGVERSION}/lisp/textmodes/artist.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/artist.elc
share/emacs/${PKGVERSION}/lisp/textmodes/bib-mode.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/bib-mode.elc
share/emacs/${PKGVERSION}/lisp/textmodes/bibtex-style.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/bibtex-style.elc
share/emacs/${PKGVERSION}/lisp/textmodes/bibtex.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/bibtex.elc
share/emacs/${PKGVERSION}/lisp/textmodes/conf-mode.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/conf-mode.elc
share/emacs/${PKGVERSION}/lisp/textmodes/css-mode.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/css-mode.elc
share/emacs/${PKGVERSION}/lisp/textmodes/dns-mode.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/dns-mode.elc
share/emacs/${PKGVERSION}/lisp/textmodes/enriched.el.gz
@ -2472,6 +2482,16 @@ share/emacs/${PKGVERSION}/lisp/textmodes/makeinfo.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/makeinfo.elc
share/emacs/${PKGVERSION}/lisp/textmodes/nroff-mode.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/nroff-mode.elc
share/emacs/${PKGVERSION}/lisp/textmodes/org-export-latex.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/org-export-latex.elc
share/emacs/${PKGVERSION}/lisp/textmodes/org-irc.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/org-irc.elc
share/emacs/${PKGVERSION}/lisp/textmodes/org-mac-message.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/org-mac-message.elc
share/emacs/${PKGVERSION}/lisp/textmodes/org-mouse.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/org-mouse.elc
share/emacs/${PKGVERSION}/lisp/textmodes/org-publish.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/org-publish.elc
share/emacs/${PKGVERSION}/lisp/textmodes/org.el.gz
share/emacs/${PKGVERSION}/lisp/textmodes/org.elc
share/emacs/${PKGVERSION}/lisp/textmodes/page-ext.el.gz
@ -2622,12 +2642,20 @@ share/emacs/${PKGVERSION}/lisp/userlock.el.gz
share/emacs/${PKGVERSION}/lisp/userlock.elc
share/emacs/${PKGVERSION}/lisp/vc-arch.el.gz
share/emacs/${PKGVERSION}/lisp/vc-arch.elc
share/emacs/${PKGVERSION}/lisp/vc-bzr.el.gz
share/emacs/${PKGVERSION}/lisp/vc-bzr.elc
share/emacs/${PKGVERSION}/lisp/vc-cvs.el.gz
share/emacs/${PKGVERSION}/lisp/vc-cvs.elc
share/emacs/${PKGVERSION}/lisp/vc-git.el.gz
share/emacs/${PKGVERSION}/lisp/vc-git.elc
share/emacs/${PKGVERSION}/lisp/vc-hg.el.gz
share/emacs/${PKGVERSION}/lisp/vc-hg.elc
share/emacs/${PKGVERSION}/lisp/vc-hooks.el.gz
share/emacs/${PKGVERSION}/lisp/vc-hooks.elc
share/emacs/${PKGVERSION}/lisp/vc-mcvs.el.gz
share/emacs/${PKGVERSION}/lisp/vc-mcvs.elc
share/emacs/${PKGVERSION}/lisp/vc-mtn.el.gz
share/emacs/${PKGVERSION}/lisp/vc-mtn.elc
share/emacs/${PKGVERSION}/lisp/vc-rcs.el.gz
share/emacs/${PKGVERSION}/lisp/vc-rcs.elc
share/emacs/${PKGVERSION}/lisp/vc-sccs.el.gz

45
editors/emacs/distinfo
View file

@ -1,25 +1,22 @@
$NetBSD: distinfo,v 1.37 2008/06/02 21:09:48 markd Exp $
$NetBSD: distinfo,v 1.38 2008/10/11 09:56:38 uebayasi Exp $
SHA1 (emacs-22.1.tar.gz) = 327664173eabe5db49d4e7e4a4b1794577af902e
RMD160 (emacs-22.1.tar.gz) = da5360871db8b1d473ff7f0b0937ee6c278c0b19
Size (emacs-22.1.tar.gz) = 38172226 bytes
SHA1 (patch-aa) = d7ae318f2140dbd8f796bfcbb48f299fe6bf2d81
SHA1 (patch-ab) = 0e022290d305fd73ab7aa633f955fca10ac70799
SHA1 (patch-ac) = 1fc45d38f879c2ae7287bc7f7a9cb868e2db74d8
SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
SHA1 (patch-ae) = 30a31df58bbcae854ded212ad42bde5b855a7318
SHA1 (patch-af) = 9b2b8c5dfe1b2dc9ca76587cdb323272f8cb103e
SHA1 (patch-aj) = 7707c5f8bb57bbacbd1d3c6f37a34916baacc363
SHA1 (patch-ak) = ef0bf533754e5392c419c251aac8278b5e90b438
SHA1 (patch-am) = 4e068210bcbea638d143bd9fb566795636d77b35
SHA1 (patch-an) = b541a2e78398aba03a43bf5b38140661dd959e76
SHA1 (patch-ao) = a843f4d7dde6e1d701cf65b87458c44d6a8fa7d1
SHA1 (patch-ap) = faad589de5971460b65ee9c0c4f01b035fb74b44
SHA1 (patch-aq) = 5d040fa79de68ec4a673db93caf3a9434c22a029
SHA1 (patch-ar) = d681a5e6daef094da957f198ab1607dca95a306a
SHA1 (patch-as) = 15ab1dcc2d6a445b119b7f2bb8a8331b4aa1fbd0
SHA1 (patch-at) = 470cbad6632038ff85aa942f74cab601e7f707fe
SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb
SHA1 (patch-av) = 252f3085a1e4986a25b46afa74837ca0562f4f05
SHA1 (patch-aw) = 456feb2517cad514837b75863336265006c158ee
SHA1 (patch-xx) = c486e9ca2c9134caf60ec935bf086e29324b1979
SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0
RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
Size (emacs-22.3.tar.gz) = 39587396 bytes
SHA1 (patch-aa) = e99831448b12ba9cc99b5530dc7de949b44c4337
SHA1 (patch-ab) = 2f5ae81209b1bb4bae4d48af6cbac3d650bad3b0
SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131
SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f
SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa
SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c
SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831
SHA1 (patch-an) = 1faa6d8913738278c746c50fff1b0b2f4a869796
SHA1 (patch-ao) = 7f2308966583205092885c997c47be83f81a4389
SHA1 (patch-ap) = b55bc6477c8ca7fd4cb6446ca9487cc0808e2b68
SHA1 (patch-aq) = 6ee5d195a7dc6d4e94246942689a3b22d9c85636
SHA1 (patch-ar) = 96c08701708a8c12c3ea6de12d7632f6ac696793
SHA1 (patch-as) = 00692744b545a98f4339160089eaa5519ca823a5
SHA1 (patch-at) = d5468ed9d7ca76f438f7c8b89960c6fcc9cb90c7
SHA1 (patch-au) = e4a525ed182c3b8f3f7365ee01e186ad5d1b0c7e
SHA1 (patch-av) = f2fcb0ccbddba1683cc7f1744bca8b171f83c0e7
SHA1 (patch-xx) = 3b66bbad50cef9d248a6f1d49b9d31150e14d6e1

8
editors/emacs/patches/patch-aa
View file

@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.13 2007/06/11 13:57:17 markd Exp $
$NetBSD: patch-aa,v 1.14 2008/10/11 09:56:38 uebayasi Exp $
--- man/Makefile.in.orig 2007-06-09 15:11:07.000000000 +1200
--- man/Makefile.in.orig 2008-10-10 10:35:49.000000000 +0900
+++ man/Makefile.in
@@ -36,7 +36,7 @@ MAKEINFO = makeinfo --force
INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.13 2007/06/11 13:57:17 markd Exp $
../info/sc ../info/vip ../info/viper ../info/widget \
../info/efaq ../info/ada-mode ../info/autotype ../info/calc \
../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
@@ -119,6 +119,7 @@ EMACSSOURCES= \
@@ -120,6 +120,7 @@ EMACSSOURCES= \
${srcdir}/kmacro.texi \
$(EMACS_XTRA)
@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.13 2007/06/11 13:57:17 markd Exp $
info: $(top_srcdir)/info $(INFO_TARGETS)
$(top_srcdir)/info:
@@ -135,12 +136,6 @@ dvi: $(DVI_TARGETS)
@@ -136,12 +137,6 @@ dvi: $(DVI_TARGETS)
# the @setfilename directive in info.texi, which is required for
# the Texinfo distribution.

6
editors/emacs/patches/patch-ab
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.25 2007/06/11 13:57:18 markd Exp $
$NetBSD: patch-ab,v 1.26 2008/10/11 09:56:38 uebayasi Exp $
--- configure.orig 2007-05-26 00:43:29.000000000 +1200
--- configure.orig 2008-10-10 10:35:49.000000000 +0900
+++ configure
@@ -1809,7 +1809,7 @@ archlibdir='${libexecdir}/emacs/${versio
docdir='${datadir}/emacs/${version}/etc'
@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.25 2007/06/11 13:57:18 markd Exp $
# Check whether --with-gcc was given.
@@ -3128,6 +3128,7 @@ _ACEOF
@@ -3142,6 +3142,7 @@ _ACEOF
*-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
*-sysv5OpenUNIX* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
*-386bsd* ) opsys=386bsd ;;

15
editors/emacs/patches/patch-ac
View file

@ -1,15 +0,0 @@
$NetBSD: patch-ac,v 1.16 2008/04/29 12:54:56 tonnerre Exp $
--- lisp/files.el.orig 2007-05-25 13:43:31.000000000 +0100
+++ lisp/files.el 2008-04-29 12:41:52.000000000 +0100
@@ -2736,8 +2736,8 @@
;; If caller wants only the safe variables,
;; install only them.
(dolist (elt result)
- (unless (or (memq (car elt) unsafe-vars)
- (memq (car elt) risky-vars))
+ (unless (or (member elt unsafe-vars)
+ (member elt risky-vars))
(hack-one-local-variable (car elt) (cdr elt))))
;; Query, except in the case where all are known safe
;; if the user wants no quuery in that case.

10
editors/emacs/patches/patch-ad
View file

@ -1,7 +1,9 @@
$NetBSD: patch-ad,v 1.6 2003/04/12 10:16:40 uebayasi Exp $
$NetBSD: patch-ad,v 1.7 2008/10/11 09:56:38 uebayasi Exp $
--- etc/ctags.1.orig Sun Oct 3 14:14:21 1999
+++ etc/ctags.1 Wed Apr 24 16:57:49 2002
@@ -1 +1 @@
--- etc/ctags.1.orig 2008-10-10 10:35:49.000000000 +0900
+++ etc/ctags.1
@@ -1,3 +1,3 @@
-.so man1/etags.1
+.so man1/emacs-etags.1
.\" arch-tag: 54d4579b-9d66-4ba5-9fda-f01ec83612ad

8
editors/emacs/patches/patch-ae
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ae,v 1.11 2007/06/11 13:57:18 markd Exp $
$NetBSD: patch-ae,v 1.12 2008/10/11 09:56:38 uebayasi Exp $
--- Makefile.in.orig 2007-06-10 09:22:56.000000000 +1200
--- Makefile.in.orig 2008-10-10 10:35:49.000000000 +0900
+++ Makefile.in
@@ -140,7 +140,7 @@ man1dir=$(mandir)/man1
@@ -141,7 +141,7 @@ man1dir=$(mandir)/man1
infodir=@infodir@
INFO_FILES=ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \
elisp eintr emacs emacs-mime eshell eudc flymake \
@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.11 2007/06/11 13:57:18 markd Exp $
pgg reftex sc ses sieve speedbar tramp vip viper widget \
woman smtpmail url rcirc erc
@@ -514,27 +514,23 @@ install-arch-indep: mkdir info
@@ -515,27 +515,23 @@ install-arch-indep: mkdir info
for elt in $(INFO_FILES); do \
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \

37
editors/emacs/patches/patch-af
View file

@ -1,37 +0,0 @@
$NetBSD: patch-af,v 1.11 2008/04/29 12:54:56 tonnerre Exp $
--- lib-src/vcdiff.orig 2007-01-21 04:49:26.000000000 +0000
+++ lib-src/vcdiff 2008-04-29 12:48:03.000000000 +0100
@@ -4,13 +4,13 @@
# This version is more compatible with rcsdiff(1).
#
# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
# GNU Emacs is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# GNU Emacs is distributed in the hope that it will be useful,
@@ -84,14 +84,14 @@
case $f in
s.* | */s.*)
if
- rev1=/tmp/geta$$
+ rev1=`mktemp /tmp/geta.XXXXXXXX`
get -s -p -k $sid1 "$f" > $rev1 &&
case $sid2 in
'')
workfile=`expr " /$f" : '.*/s.\(.*\)'`
;;
*)
- rev2=/tmp/getb$$
+ rev2=`mktemp /tmp/getb.XXXXXXXX`
get -s -p -k $sid2 "$f" > $rev2
workfile=$rev2
esac

6
editors/emacs/patches/patch-aj
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aj,v 1.11 2007/06/11 13:57:19 markd Exp $
$NetBSD: patch-aj,v 1.12 2008/10/11 09:56:38 uebayasi Exp $
--- lib-src/emacsclient.c.orig 2007-06-10 09:40:19.000000000 +1200
--- lib-src/emacsclient.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ lib-src/emacsclient.c
@@ -384,7 +384,6 @@ main (argc, argv)
@@ -498,7 +498,6 @@ main (argc, argv)
#define SEND_BUFFER_SIZE 4096
extern char *strerror ();

6
editors/emacs/patches/patch-ak
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ak,v 1.6 2007/06/11 13:57:19 markd Exp $
$NetBSD: patch-ak,v 1.7 2008/10/11 09:56:38 uebayasi Exp $
--- lib-src/Makefile.in.orig 2007-02-27 02:21:16.000000000 +1300
--- lib-src/Makefile.in.orig 2008-10-10 10:35:49.000000000 +0900
+++ lib-src/Makefile.in
@@ -332,12 +332,14 @@ install: $(DESTDIR)${archlibdir}
@@ -335,12 +335,14 @@ install: $(DESTDIR)${archlibdir}
@echo
@echo "Installing utilities for users to run."
for file in ${INSTALLABLES} ; do \

6
editors/emacs/patches/patch-am
View file

@ -1,8 +1,8 @@
$NetBSD: patch-am,v 1.6 2007/06/11 13:57:20 markd Exp $
$NetBSD: patch-am,v 1.7 2008/10/11 09:56:38 uebayasi Exp $
--- src/xterm.c.orig 2007-05-26 00:43:35.000000000 +1200
--- src/xterm.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/xterm.c
@@ -307,8 +307,6 @@ extern Lisp_Object Vx_no_window_manager;
@@ -309,8 +309,6 @@ extern Lisp_Object Vx_no_window_manager;
extern Lisp_Object Qeql;

6
editors/emacs/patches/patch-an
View file

@ -1,8 +1,8 @@
$NetBSD: patch-an,v 1.3 2005/12/29 13:56:51 joerg Exp $
$NetBSD: patch-an,v 1.4 2008/10/11 09:56:38 uebayasi Exp $
--- src/emacs.c.orig 2005-12-29 13:27:49.000000000 +0000
--- src/emacs.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/emacs.c
@@ -712,9 +712,6 @@ main (argc, argv, envp)
@@ -809,9 +809,6 @@ main (argc, argv
char stack_bottom_variable;
int do_initial_setlocale;
int skip_args = 0;

4
editors/emacs/patches/patch-ao
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ao,v 1.4 2007/06/11 13:57:20 markd Exp $
$NetBSD: patch-ao,v 1.5 2008/10/11 09:56:38 uebayasi Exp $
--- src/keyboard.c.orig 2007-04-02 09:54:54.000000000 +1200
--- src/keyboard.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/keyboard.c
@@ -83,10 +83,6 @@ Boston, MA 02110-1301, USA. */
#include "macterm.h"

6
editors/emacs/patches/patch-ap
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ap,v 1.4 2007/06/11 13:57:20 markd Exp $
$NetBSD: patch-ap,v 1.5 2008/10/11 09:56:38 uebayasi Exp $
--- src/buffer.c.orig 2007-06-01 13:57:42.000000000 +1200
--- src/buffer.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/buffer.c
@@ -28,11 +28,6 @@ Boston, MA 02110-1301, USA. */
@@ -29,11 +29,6 @@ Boston, MA 02110-1301, USA. */
#include <errno.h>
#include <stdio.h>

6
editors/emacs/patches/patch-aq
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aq,v 1.3 2005/12/29 13:56:51 joerg Exp $
$NetBSD: patch-aq,v 1.4 2008/10/11 09:56:38 uebayasi Exp $
--- src/fileio.c.orig 2005-12-29 13:30:15.000000000 +0000
--- src/fileio.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/fileio.c
@@ -64,12 +64,6 @@ Boston, MA 02111-1307, USA. */
@@ -61,12 +61,6 @@ Boston, MA 02110-1301, USA. */
#include <errno.h>

6
editors/emacs/patches/patch-ar
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ar,v 1.3 2005/12/29 13:56:51 joerg Exp $
$NetBSD: patch-ar,v 1.4 2008/10/11 09:56:38 uebayasi Exp $
--- src/floatfns.c.orig 2005-12-29 13:31:17.000000000 +0000
--- src/floatfns.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/floatfns.c
@@ -107,9 +107,6 @@ extern double logb ();
@@ -108,9 +108,6 @@ extern double logb ();
#ifdef FLOAT_CHECK_ERRNO
# include <errno.h>

6
editors/emacs/patches/patch-as
View file

@ -1,8 +1,8 @@
$NetBSD: patch-as,v 1.3 2005/12/29 13:56:51 joerg Exp $
$NetBSD: patch-as,v 1.4 2008/10/11 09:56:38 uebayasi Exp $
--- src/lread.c.orig 2005-12-29 13:32:39.000000000 +0000
--- src/lread.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/lread.c
@@ -72,10 +72,6 @@ Boston, MA 02111-1307, USA. */
@@ -78,10 +78,6 @@ Boston, MA 02110-1301, USA. */
#define file_tell ftell
#endif

4
editors/emacs/patches/patch-at
View file

@ -1,6 +1,6 @@
$NetBSD: patch-at,v 1.4 2007/06/11 13:57:20 markd Exp $
$NetBSD: patch-at,v 1.5 2008/10/11 09:56:38 uebayasi Exp $
--- src/process.c.orig 2007-05-15 02:56:31.000000000 +1200
--- src/process.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/process.c
@@ -203,9 +203,6 @@ extern Lisp_Object QCfilter;

6
editors/emacs/patches/patch-au
View file

@ -1,8 +1,8 @@
$NetBSD: patch-au,v 1.3 2005/12/29 13:56:51 joerg Exp $
$NetBSD: patch-au,v 1.4 2008/10/11 09:56:38 uebayasi Exp $
--- src/callproc.c.orig 2005-12-29 13:34:29.000000000 +0000
--- src/callproc.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/callproc.c
@@ -25,10 +25,6 @@ Boston, MA 02111-1307, USA. */
@@ -26,10 +26,6 @@ Boston, MA 02110-1301, USA. */
#include <errno.h>
#include <stdio.h>

4
editors/emacs/patches/patch-av
View file

@ -1,6 +1,6 @@
$NetBSD: patch-av,v 1.4 2007/06/11 13:57:20 markd Exp $
$NetBSD: patch-av,v 1.5 2008/10/11 09:56:38 uebayasi Exp $
--- src/dispnew.c.orig 2007-04-17 04:21:18.000000000 +1200
--- src/dispnew.c.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/dispnew.c
@@ -6167,9 +6167,6 @@ window_change_signal (signalnum) /* If w
int signalnum; /* some compilers complain in signal calls. */

32
editors/emacs/patches/patch-aw
View file

@ -1,32 +0,0 @@
$NetBSD: patch-aw,v 1.4 2008/06/02 21:09:48 markd Exp $
fix for CVE-2008-2142 from post 22.2 cvs.
--- lisp/obsolete/fast-lock.el.orig 2007-01-21 16:53:09.000000000 +1300
+++ lisp/obsolete/fast-lock.el
@@ -286,7 +286,7 @@ for buffers in Rmail mode, and size is i
(integer :tag "size")))))
:group 'fast-lock)
-(defcustom fast-lock-cache-directories '("." "~/.emacs-flc")
+(defcustom fast-lock-cache-directories '("~/.emacs-flc")
; - `internal', keep each file's Font Lock cache file in the same file.
; - `external', keep each file's Font Lock cache file in the same directory.
"*Directories in which Font Lock cache files are saved and read.
@@ -304,12 +304,15 @@ For example:
((\"^/your/true/home/directory/\" . \".\") \"~/.emacs-flc\")
would cause a file's current directory to be used if the file is under your
-home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'."
+home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'.
+For security reasons, it is not advisable to use the file's current directory
+to avoid the possibility of using the cache of another user."
:type '(repeat (radio (directory :tag "directory")
(cons :tag "Matching"
(regexp :tag "regexp")
(directory :tag "directory"))))
:group 'fast-lock)
+(put 'fast-lock-cache-directories 'risky-local-variable t)
(defcustom fast-lock-save-events '(kill-buffer kill-emacs)
"*Events under which caches will be saved.

4
editors/emacs/patches/patch-xx
View file

@ -1,10 +1,10 @@
$NetBSD: patch-xx,v 1.7 2007/06/11 13:57:21 markd Exp $
$NetBSD: patch-xx,v 1.8 2008/10/11 09:56:38 uebayasi Exp $
Following breaks gtk option as prefers /usr/X11R6 libs to those in /usr/pkg,
and is not needed as these get set in enough other places - at least for
pkgsrc.
--- src/s/netbsd.h.orig 2007-06-11 08:57:06.000000000 +1200
--- src/s/netbsd.h.orig 2008-10-10 10:35:49.000000000 +0900
+++ src/s/netbsd.h
@@ -102,12 +102,6 @@ Boston, MA 02110-1301, USA. */
#define AMPERSAND_FULL_NAME

4
editors/emacs/version.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $
# $NetBSD: version.mk,v 1.2 2008/10/11 09:56:38 uebayasi Exp $
_EMACS_FLAVOR= emacs
_EMACS_REQD= emacs>=22
@ -6,4 +6,4 @@ _EMACS_PKGDEP.base=
_EMACS_PKGDEP.leim=
_EMACS_VERSION_MAJOR= 22
_EMACS_VERSION_MINOR= 1
_EMACS_VERSION_MINOR= 3