head 1.23; access; symbols pkgsrc-2013Q2:1.23.0.4 pkgsrc-2013Q2-base:1.23 pkgsrc-2012Q4:1.23.0.2 pkgsrc-2012Q4-base:1.23 pkgsrc-2011Q4:1.22.0.2 pkgsrc-2011Q4-base:1.22 pkgsrc-2011Q2:1.21.0.2 pkgsrc-2011Q2-base:1.21 pkgsrc-2011Q1:1.20.0.2 pkgsrc-2011Q1-base:1.20 pkgsrc-2010Q1:1.18.0.6 pkgsrc-2010Q1-base:1.18 pkgsrc-2009Q4:1.18.0.4 pkgsrc-2009Q4-base:1.18 pkgsrc-2009Q3:1.18.0.2 pkgsrc-2009Q3-base:1.18 pkgsrc-2008Q4:1.17.0.2 pkgsrc-2008Q4-base:1.17 pkgsrc-2008Q3:1.16.0.8 pkgsrc-2008Q3-base:1.16 cube-native-xorg:1.16.0.6 cube-native-xorg-base:1.16 pkgsrc-2008Q2:1.16.0.4 pkgsrc-2008Q2-base:1.16 cwrapper:1.16.0.2 pkgsrc-2008Q1:1.15.0.8 pkgsrc-2008Q1-base:1.15 pkgsrc-2007Q4:1.15.0.6 pkgsrc-2007Q4-base:1.15 pkgsrc-2007Q3:1.15.0.4 pkgsrc-2007Q3-base:1.15 pkgsrc-2007Q2:1.15.0.2 pkgsrc-2007Q2-base:1.15 pkgsrc-2007Q1:1.14.0.12 pkgsrc-2007Q1-base:1.14 pkgsrc-2006Q4:1.14.0.10 pkgsrc-2006Q4-base:1.14 pkgsrc-2006Q3:1.14.0.8 pkgsrc-2006Q3-base:1.14 pkgsrc-2006Q2:1.14.0.6 pkgsrc-2006Q2-base:1.14 pkgsrc-2006Q1:1.14.0.4 pkgsrc-2006Q1-base:1.14 pkgsrc-2005Q4:1.14.0.2 pkgsrc-2005Q4-base:1.14 pkgsrc-2005Q3:1.13.0.16 pkgsrc-2005Q3-base:1.13 pkgsrc-2005Q2:1.13.0.14 pkgsrc-2005Q2-base:1.13 pkgsrc-2005Q1:1.13.0.12 pkgsrc-2005Q1-base:1.13 pkgsrc-2004Q4:1.13.0.10 pkgsrc-2004Q4-base:1.13 pkgsrc-2004Q3:1.13.0.8 pkgsrc-2004Q3-base:1.13 pkgsrc-2004Q2:1.13.0.6 pkgsrc-2004Q2-base:1.13 pkgsrc-2004Q1:1.13.0.4 pkgsrc-2004Q1-base:1.13 pkgsrc-2003Q4:1.13.0.2 pkgsrc-2003Q4-base:1.13 netbsd-1-6-1:1.12.0.4 netbsd-1-6-1-base:1.12 netbsd-1-6:1.12.0.6 netbsd-1-6-RELEASE-base:1.12 pkgviews:1.12.0.2 pkgviews-base:1.12 buildlink2:1.11.0.2 buildlink2-base:1.12 netbsd-1-5-PATCH003:1.11 netbsd-1-3-PATCH003:1.7 netbsd-1-3-PATCH002:1.4 FreeBSD-current-1997-09-25:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.23 date 2012.02.19.17.44.35; author minskim; state dead; branches; next 1.22; 1.22 date 2011.12.03.22.46.30; author jmmv; state Exp; branches; next 1.21; 1.21 date 2011.06.09.13.47.31; author drochner; state dead; branches; next 1.20; 1.20 date 2011.01.14.10.32.28; author wiz; state Exp; branches; next 1.19; 1.19 date 2010.06.01.21.44.54; author minskim; state dead; branches; next 1.18; 1.18 date 2009.10.07.10.56.40; author obache; state Exp; branches; next 1.17; 1.17 date 2008.10.11.09.56.38; author uebayasi; state dead; branches; next 1.16; 1.16 date 2008.04.29.12.54.56; author tonnerre; state Exp; branches; next 1.15; 1.15 date 2007.06.11.13.57.18; author markd; state dead; branches 1.15.8.1; next 1.14; 1.14 date 2005.10.06.11.08.39; author markd; state Exp; branches; next 1.13; 1.13 date 2003.04.11.00.50.54; author uebayasi; state dead; branches; next 1.12; 1.12 date 2002.05.20.17.43.42; author cjep; state Exp; branches; next 1.11; 1.11 date 2001.10.06.22.04.22; author hubertf; state Exp; branches 1.11.2.1; next 1.10; 1.10 date 2000.08.23.16.20.18; author toshii; state dead; branches; next 1.9; 1.9 date 2000.07.10.21.22.08; author tron; state Exp; branches; next 1.8; 1.8 date 99.02.25.17.08.34; author sommerfe; state dead; branches; next 1.7; 1.7 date 98.09.04.02.28.53; author tron; state Exp; branches; next 1.6; 1.6 date 98.09.01.20.04.34; author mellon; state Exp; branches; next 1.5; 1.5 date 98.08.07.10.40.31; author agc; state Exp; branches; next 1.4; 1.4 date 98.03.16.06.44.08; author mycroft; state Exp; branches; next 1.3; 1.3 date 98.03.16.06.37.59; author mycroft; state Exp; branches; next 1.2; 1.2 date 97.10.11.21.32.59; author hubertf; state Exp; branches; next 1.1; 1.1 date 97.10.11.20.54.46; author hubertf; state Exp; branches 1.1.1.1; next ; 1.15.8.1 date 2008.05.01.13.41.33; author rtr; state Exp; branches; next ; 1.11.2.1 date 2002.06.23.18.45.16; author jlam; state Exp; branches; next ; 1.1.1.1 date 97.10.11.20.54.46; author hubertf; state Exp; branches; next ; desc @@ 1.23 log @Update emacs to 23.4. Emacs 23.4 mainly fixes a security flaw in EDE (CVE-2012-0035), which was already fixed in emacs-23.3nb1 in pkgsrc. @ text @$NetBSD: patch-ac,v 1.22 2011/12/03 22:46:30 jmmv Exp $ http://lists.gnu.org/archive/html/emacs-bug-tracker/2011-07/msg00445.html Bug #8395: Disable address randomization under Darwin to fix compilation with Xcode 4.1. --- src/s/darwin.h.orig 2011-11-26 03:20:20.000000000 +0000 +++ src/s/darwin.h @@@@ -181,7 +181,7 @@@@ along with GNU Emacs. If not, see jmpbuf, 1); +#else + png_longjmp (png_ptr, 1); +#endif } d17 1 a17 1 @@@@ -5824,7 +5828,7 @@@@ png_load (f, img) a18 7 /* Set error jump-back. We come back here when the PNG library detects an error. */ - if (setjmp (png_ptr->jmpbuf)) + if (setjmp (png_jmpbuf(png_ptr))) { error: if (png_ptr) @ 1.20 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD$ @ 1.19 log @Update emacs to 23.2. Patches were provided by Makoto Fujiwara in PR 43335. Excerpt from the announcement: In addition to a large number of bugfixes, Emacs 23.2 includes several new packages, such as the CEDET suite of development tools (including Semantic, a set of libraries and utilities for parsing source code, and EDE, a package for managing code projects), and a new mode for editing Javascript. The default mail composition mode is now Message mode, which provides features such as MIME handling. Many other part of Emacs have also been improved. For a more complete list of changes, see the file etc/NEWS. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.18 2009/10/07 10:56:40 obache Exp $ d3 15 a17 3 --- src/m/alpha.h.orig 2009-06-21 13:38:20.000000000 +0900 +++ src/m/alpha.h @@@@ -95,7 +95,7 @@@@ NOTE-END d19 1 a19 6 #undef UNEXEC #define UNEXEC unexelf.o -#ifndef GNU_LINUX +#if !defined(GNU_LINUX) && !defined(__NetBSD__) #define DATA_START 0x140000000 #endif d21 7 @ 1.18 log @fit for NetBSD-mips variants, do not use pmax configuration. prevent unrequisite warning messages on NetBSD-alpha (patch-ac) and NetBSD-mips variants (patch-af). fixes PR 39027. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.17 log @Update emacs to 22.3. 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.) @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.16 2008/04/29 12:54:56 tonnerre Exp $ d3 11 a13 13 --- 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. @ 1.16 log @Fix two emacs vulnerabilities: - Fix unsafe handling of local variables iin hack-local-variables (CVE-2007-5795). - Prevent symlink attack on arbitrary files using the temp files vcdiff generates (CVE-2008-1694). @ text @d1 1 a1 1 $NetBSD$ @ 1.15 log @Update emacs{,-nox11} to 22.1. update based in part on wip/emacs-current and wip/emacs22 packages. Many many changes since 21.4a. Read NEWS file for details. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.14 2005/10/06 11:08:39 markd Exp $ d3 13 a15 14 --- src/m/hp800.h.orig 1996-01-15 01:15:02.000000000 -0800 +++ src/m/hp800.h 2005-10-04 10:49:46.000000000 -0700 @@@@ -181,3 +181,11 @@@@ #define rindex strrchr #endif /* __hpux */ + +/* Systems with GCC don't need to lose. */ +#ifdef __NetBSD__ +# ifdef __GNUC__ +# define alloca __builtin_alloca +# define HAVE_ALLOCA +# endif /* __GNUC__ */ +#endif /* __NetBSD__ */ @ 1.15.8.1 log @pullup ticket #2359 - requested by tonnerre emacs, emacs-nox11: fix for security issue revisions pulled up: - pkgsrc/editors/emacs/Makefile 1.107,1.108 - pkgsrc/editors/emacs/Makefile.common r0 - pkgsrc/editors/emacs/distinfo 1.36 - pkgsrc/editors/emacs/options.mk 1.7 - pkgsrc/editors/emacs/patches/patch-ac 1.16 - pkgsrc/editors/emacs/patches/patch-af 1.11 - pkgsrc/editors/emacs-nox11/DESCR r0 - pkgsrc/editors/emacs-nox11/Makefile 1.28 Module Name: pkgsrc Committed By: jlam Date: Fri Apr 25 16:35:32 UTC 2008 Modified Files: pkgsrc/editors/emacs: Makefile options.mk pkgsrc/editors/emacs-nox11: Makefile Removed Files: pkgsrc/editors/emacs: Makefile.common pkgsrc/editors/emacs-nox11: DESCR Log Message: Make emacs and emacs-nox11 look more like xemacs and xemacs-nox11 in terms of file structure. Also add DESTDIR support. ------------------------------------------------------------------------ Module Name: pkgsrc Committed By: tonnerre Date: Tue Apr 29 12:54:56 UTC 2008 Modified Files: pkgsrc/editors/emacs: Makefile distinfo Added Files: pkgsrc/editors/emacs/patches: patch-ac patch-af Log Message: Fix two emacs vulnerabilities: - Fix unsafe handling of local variables iin hack-local-variables (CVE-2007-5795). - Prevent symlink attack on arbitrary files using the temp files vcdiff generates (CVE-2008-1694). @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.16 2008/04/29 12:54:56 tonnerre Exp $ d3 14 a16 13 --- 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. @ 1.14 log @A couple of patches to fix build on NetBSD/hp700. From Konrad Schroder. @ text @d1 1 a1 1 $NetBSD$ @ 1.13 log @Remove old patches @ text @d1 16 a16 21 $NetBSD: patch-ac,v 1.12 2002/05/20 17:43:42 cjep Exp $ --- config.sub.orig Sat Oct 6 22:14:24 2001 +++ config.sub Sat Oct 6 22:15:18 2001 @@@@ -168,7 +168,7 @@@@ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ + | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipseb | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ | mips64vr5000 | miprs64vr5000el \ @@@@ -201,7 +201,7 @@@@ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ + | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipseb-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ | mipstx39-* | mipstx39el-* \ @ 1.12 log @Add NetBSD tags. @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Make this build on sgimips @ text @d1 1 @ 1.11.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 1 $NetBSD: patch-ac,v 1.12 2002/05/20 17:43:42 cjep Exp $ @ 1.10 log @fix build failure on alpha, and merge patch-ac into patch-az @ text @d1 20 a20 12 $NetBSD: patch-ac,v 1.9 2000/07/10 21:22:08 tron Exp $ --- src/unexelf.c.orig Mon May 15 18:14:02 2000 +++ src/unexelf.c Mon Jul 10 00:53:42 2000 @@@@ -479,6 +479,7 @@@@ # ifndef PT_LOAD # define PT_LOAD Elf_pt_load +# define SHT_PROGBITS Elf_sht_progbits # define SHT_SYMTAB Elf_sht_symtab # define SHT_DYNSYM Elf_sht_dynsym # define SHT_NULL Elf_sht_null @ 1.9 log @Make "emacs" package build on "pmax" port. Patch supplied by Joel Reicher in PR pkg/10548. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Fix mh-e's use of nmh (previous patch was insufficient, as nmh is split in three parts, not two; also, repl's interface changed in nmh so reply-to-all was busted) Fix report-emacs-bug. Re-byte-compile patched mh-*.el @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 1998/09/04 02:28:53 tron Exp $ d3 10 a12 7 --- /dev/null Fri Aug 28 10:35:45 1998 +++ lisp/site-load.el Fri Aug 28 12:51:28 1998 @@@@ -0,0 +1,4 @@@@ +;; MH files from nmh package are at an unexpected location. + +(setq mh-progs "/usr/pkg/bin") +(setq mh-lib "/usr/pkg/libexec/nmh") @ 1.7 log @Lots of bug fixes: - sync package list with reality and use "mkdir -p" - add missing RCSIds - split patches - don't install texinfo documentation - avoid conflict with "xemacs" and "vim" - remove unnecessary "${WRKSRC}" - add missing info files to "${INFO}" - don't remove "share/emacs/20.3/etc/DOC-20.3.[13-9]*" (fixes PR pkg/6097) @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Clean things up a bit. Support arm32. Fix install failures. @ text @d1 2 @ 1.5 log @Add NetBSD RCS Ids. @ text @d1 4 a4 33 $NetBSD$ --- src/s/netbsd.h.orig Tue Jun 10 21:09:55 1997 +++ src/s/netbsd.h Mon Mar 16 01:25:54 1998 @@@@ -14,8 +14,6 @@@@ #undef LDAV_SYMBOL #define HAVE_GETLOADAVG -#define HAVE_UNION_WAIT - #define SIGNALS_VIA_CHARACTERS #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) @@@@ -31,9 +29,13 @@@@ #define NO_TERMIO #define LIBS_DEBUG -/* -lutil is not needed for NetBSD >0.9. */ -/* #define LIBS_SYSTEM -lutil */ +#define LIBS_SYSTEM -lutil +#ifdef HAVE_LIBNCURSES +#define TERMINFO +#define LIBS_TERMCAP -lncurses +#else #define LIBS_TERMCAP -ltermcap +#endif #define NEED_ERRNO #define SYSV_SYSTEM_DIR @@@@ -65,6 +67,33 @@@@ #define NO_MATHERR #define AMPERSAND_FULL_NAME d6 2 a7 29 +/* Don't close pty in process.c to make it as controlling terminal. + It is already a controlling terminal of subprocess, because we did + ioctl TIOCSCTTY. */ +#define DONT_REOPEN_PTY + +/* We have a function to do all the right magic. */ +#undef FIRST_PTY_LETTER +#define PTY_ITERATION for (i = 0; i < 1; i++) /* ick */ +#define PTY_NAME_SPRINTF /* none */ +#define PTY_TTY_NAME_SPRINTF /* none */ +#define PTY_OPEN \ + do \ + { \ + int slave; \ + SIGMASKTYPE mask; \ + mask = sigblock (sigmask (SIGCHLD)); \ + if (-1 == openpty (&fd, &slave, pty_name, 0, 0)) \ + fd = -1; \ + else \ + close (slave); \ + sigsetmask (mask); \ + } \ + while (0) + +/* Use POSIX signal interface. */ +#define POSIX_SIGNALS #ifdef __ELF__ /* Here is how to find X Windows. LD_SWITCH_X_SITE_AUX gives an -R option @ 1.4 log @Oops; fix pasto. @ text @d1 2 @ 1.3 log @Use openpty(3) and POSIX signal functions. Remove HAVE_UNION_WAIT. @ text @d48 1 a48 1 + mask = sigblockx (SIGCHLD); \ @ 1.2 log @Update: 19.34/FreeBSD -> 20.2/NetBSD @ text @d1 14 a14 3 --- src/s/netbsd.h.orig Sat Oct 11 04:29:49 1997 +++ src/s/netbsd.h Sat Oct 11 04:30:46 1997 @@@@ -33,7 +33,12 @@@@ d16 3 a18 2 /* -lutil is not needed for NetBSD >0.9. */ /* #define LIBS_SYSTEM -lutil */ d28 34 @ 1.1 log @Initial revision @ text @d1 3 a3 4 --- src/s/freebsd.h.orig Mon Jun 10 04:14:32 1996 +++ src/s/freebsd.h Mon May 26 21:21:55 1997 @@@@ -33,9 +33,16 @@@@ d5 2 a6 4 #define LIBS_SYSTEM -lutil -#define LIBS_TERMCAP -ltermcap #define LIB_GCC -lgcc d11 1 a11 1 +#define LIBS_TERMCAP -ltermcap d13 2 a14 2 + + a15 11 /* freebsd has POSIX-style pgrp behavior. */ @@@@ -80,6 +87,8 @@@@ #define BSD 199103 #elif __FreeBSD__ == 2 #define BSD 199306 +#elif __FreeBSD__ == 3 +#define BSD 199506 #endif #define WAITTYPE int @ 1.1.1.1 log @Import of FSF emacs 19.34 port @ text @@