head	1.14;
access;
symbols
	pkgsrc-2013Q2:1.14.0.8
	pkgsrc-2013Q2-base:1.14
	pkgsrc-2012Q4:1.14.0.6
	pkgsrc-2012Q4-base:1.14
	pkgsrc-2011Q4:1.14.0.4
	pkgsrc-2011Q4-base:1.14
	pkgsrc-2011Q2:1.14.0.2
	pkgsrc-2011Q2-base:1.14
	pkgsrc-2010Q1:1.13.0.6
	pkgsrc-2010Q1-base:1.13
	pkgsrc-2009Q4:1.13.0.4
	pkgsrc-2009Q4-base:1.13
	pkgsrc-2009Q3:1.13.0.2
	pkgsrc-2009Q3-base:1.13
	pkgsrc-2008Q4:1.12.0.2
	pkgsrc-2008Q4-base:1.12
	pkgsrc-2008Q3:1.11.0.8
	pkgsrc-2008Q3-base:1.11
	cube-native-xorg:1.11.0.6
	cube-native-xorg-base:1.11
	pkgsrc-2008Q2:1.11.0.4
	pkgsrc-2008Q2-base:1.11
	cwrapper:1.11.0.2
	pkgsrc-2008Q1:1.10.0.8
	pkgsrc-2008Q1-base:1.10
	pkgsrc-2007Q4:1.10.0.6
	pkgsrc-2007Q4-base:1.10
	pkgsrc-2007Q3:1.10.0.4
	pkgsrc-2007Q3-base:1.10
	pkgsrc-2007Q2:1.10.0.2
	pkgsrc-2007Q2-base:1.10
	pkgsrc-2007Q1:1.9.0.4
	pkgsrc-2007Q1-base:1.9
	pkgsrc-2006Q4:1.9.0.2
	pkgsrc-2006Q4-base:1.9
	pkgsrc-2006Q3:1.8.0.24
	pkgsrc-2006Q3-base:1.8
	pkgsrc-2006Q2:1.8.0.22
	pkgsrc-2006Q2-base:1.8
	pkgsrc-2006Q1:1.8.0.20
	pkgsrc-2006Q1-base:1.8
	pkgsrc-2005Q4:1.8.0.18
	pkgsrc-2005Q4-base:1.8
	pkgsrc-2005Q3:1.8.0.16
	pkgsrc-2005Q3-base:1.8
	pkgsrc-2005Q2:1.8.0.14
	pkgsrc-2005Q2-base:1.8
	pkgsrc-2005Q1:1.8.0.12
	pkgsrc-2005Q1-base:1.8
	pkgsrc-2004Q4:1.8.0.10
	pkgsrc-2004Q4-base:1.8
	pkgsrc-2004Q3:1.8.0.8
	pkgsrc-2004Q3-base:1.8
	pkgsrc-2004Q2:1.8.0.6
	pkgsrc-2004Q2-base:1.8
	pkgsrc-2004Q1:1.8.0.4
	pkgsrc-2004Q1-base:1.8
	pkgsrc-2003Q4:1.8.0.2
	pkgsrc-2003Q4-base:1.8
	netbsd-1-6-1:1.6.0.2
	netbsd-1-6-1-base:1.6
	netbsd-1-6:1.5.0.8
	netbsd-1-6-RELEASE-base:1.5
	pkgviews:1.5.0.4
	pkgviews-base:1.5
	buildlink2:1.5.0.2
	buildlink2-base:1.5
	netbsd-1-5-PATCH003:1.5
	netbsd-1-5-PATCH001:1.5
	netbsd-1-5-RELEASE:1.5
	netbsd-1-4-PATCH003:1.5
	netbsd-1-4-PATCH002:1.5
	comdex-fall-1999:1.5
	netbsd-1-4-PATCH001:1.5
	netbsd-1-4-RELEASE:1.5
	netbsd-1-3-PATCH003:1.3
	netbsd-1-3-PATCH002:1.2;
locks; strict;
comment	@# @;


1.14
date	2010.06.01.21.44.54;	author minskim;	state dead;
branches;
next	1.13;

1.13
date	2009.10.07.10.56.40;	author obache;	state Exp;
branches;
next	1.12;

1.12
date	2008.10.11.09.56.38;	author uebayasi;	state dead;
branches;
next	1.11;

1.11
date	2008.04.29.12.54.56;	author tonnerre;	state Exp;
branches;
next	1.10;

1.10
date	2007.06.11.13.57.18;	author markd;	state dead;
branches
	1.10.8.1;
next	1.9;

1.9
date	2006.11.01.11.18.20;	author markd;	state Exp;
branches;
next	1.8;

1.8
date	2003.04.11.00.50.54;	author uebayasi;	state dead;
branches;
next	1.7;

1.7
date	2003.03.01.06.18.22;	author uebayasi;	state Exp;
branches;
next	1.6;

1.6
date	2002.10.26.19.47.07;	author bouyer;	state Exp;
branches;
next	1.5;

1.5
date	99.02.04.14.54.25;	author frueauf;	state Exp;
branches;
next	1.4;

1.4
date	99.01.31.17.29.32;	author frueauf;	state Exp;
branches;
next	1.3;

1.3
date	98.08.07.10.40.31;	author agc;	state Exp;
branches;
next	1.2;

1.2
date	98.04.07.13.03.11;	author tv;	state Exp;
branches;
next	1.1;

1.1
date	98.03.16.08.40.18;	author tron;	state Exp;
branches;
next	;

1.10.8.1
date	2008.05.01.13.41.33;	author rtr;	state Exp;
branches;
next	;


desc
@@


1.14
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
@$NetBSD: patch-af,v 1.13 2009/10/07 10:56:40 obache Exp $

--- src/m/mips.h.orig	2009-06-21 13:38:20.000000000 +0900
+++ src/m/mips.h
@@@@ -23,7 +23,7 @@@@ along with GNU Emacs.  If not, see <http
    USUAL-OPSYS="note"
 
 NOTE-START
-This is only used on GNU/Linux.
+This is used on GNU/Linux and netbsd.
 NOTE-END  */
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
@@@@ -50,7 +50,7 @@@@ NOTE-END  */
 
 #define TEXT_START      0x00400000
 
-#ifndef GNU_LINUX
+#if !defined(GNU_LINUX) && !defined(__NetBSD__)
 #define DATA_START      0x10000000
 #endif
 
@


1.13
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.12
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-af,v 1.11 2008/04/29 12:54:56 tonnerre Exp $
d3 20
a22 35
--- 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
@


1.11
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.10
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-af,v 1.9 2006/11/01 11:18:20 markd Exp $
d3 35
a37 21
--- src/m/pmax.h.orig	2006-11-02 00:11:05.000000000 +1300
+++ src/m/pmax.h
@@@@ -22,13 +22,17 @@@@ NOTE-END  */
 #ifdef MACH
 #define START_FILES pre-crt0.o /usr/lib/crt0.o
 #else
+#if !defined (__NetBSD__)
 /* This line starts being needed with ultrix 4.0.  */
 /* You must delete it for version 3.1.  */
 #define START_FILES pre-crt0.o /usr/lib/cmplrs/cc/crt0.o
 #endif
+#endif
 
-#if defined (__NetBSD__) || defined (__OpenBSD__)
+#if defined (__OpenBSD__)
 #undef START_FILES
+#endif
+#if defined (__NetBSD__) || defined (__OpenBSD__)
 #undef RUN_TIME_REMAP
 #undef UNEXEC
 #define UNEXEC unexelf.o
@


1.10.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-af,v 1.11 2008/04/29 12:54:56 tonnerre Exp $
d3 21
a23 35
--- 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
@


1.9
log
@Don't clobber START_FILES in m/pmax.h.
Should fix PR pkg/26679.
@
text
@d1 1
a1 1
$NetBSD$
@


1.8
log
@Remove old patches
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.7 2003/03/01 06:18:22 uebayasi Exp $
d3 10
a12 8
--- src/Makefile.in.orig	Thu Jan 16 19:08:48 2003
+++ src/Makefile.in
@@@@ -329,7 +329,7 @@@@
 #ifdef USE_X_TOOLKIT
 #define @@X_TOOLKIT_TYPE@@
 #if defined (LUCID) || defined (ATHENA)
-LIBW= -lXaw
+LIBW= -lXaw @@LIBXPM@@
d14 1
a14 4
 #ifdef MOTIF
 #if defined (HAVE_MOTIF_2_1) && defined (HAVE_LIBXP)
@@@@ -402,7 +402,7 @@@@
    ask GCC explicitly where to find libgcc.a.  */
d16 8
a23 31
 #ifndef LINKER
-#define LINKER $(CC) -nostdlib
+#define LINKER $(CC) -nostartfiles
 #endif
 
 #ifndef LIB_GCC
@@@@ -457,7 +457,7 @@@@
 #endif /* not ORDINARY_LINK */
 
 ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
-	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS)
+	 LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE
 
 /* A macro which other sections of Makefile can redefine to munge the
    flags before they're passed to LD.  This is helpful if you have
@@@@ -804,14 +804,7 @@@@
 #define OBJECTS_MACHINE
 #endif
 
-all: emacs bytecomp OTHER_FILES
-
-bytecomp: emacs
-	./emacs -batch -q -f batch-byte-compile \
-	${lispsource}ange-ftp.el ${lispsource}international/ccl.el \
-	${lispsource}international/mule-cmds.el \
-	${lispsource}international/mule.el \
-	${lispsource}international/titdic-cnv.el
+all: emacs OTHER_FILES
 
 emacs: temacs ${etc}DOC ${lisp}
 #ifdef CANNOT_DUMP
@


1.7
log
@* Update Satoshi Yatagawa <yatagawa at cc dot teu dot ac dot jp>'s Mule 4.1
  patch.  The previous one had decode-coding string<f> bug.  Pointed out and
  tested by tron.  Thanks!

* XIM patch by Seiichiro Inouse <ginouse at ts dot catv dot ne dot jp>.

* Belately Buildlinkify.

Let's bump revision to 2.
@
text
@d1 1
a1 1
$NetBSD$
@


1.6
log
@Xaw may need xpm, add support for this in configure.
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.5 1999/02/04 14:54:25 frueauf Exp $
d3 2
a4 2
--- src/Makefile.in.orig	Mon Apr 26 07:19:42 1999
+++ src/Makefile.in	Tue Oct 22 15:55:06 2002
d32 16
@


1.5
log
@Make UNEXEC work on NetBSD/pmax - this makes the DOC-link-trick
unnecessary and emacs work much better on pmax. Thanks to Jonathan Stone
for the src/unexelf.c patch.
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.4 1999/01/31 17:29:32 frueauf Exp $
d3 11
a13 2
--- src/Makefile.in.orig	Sun Aug  2 02:29:21 1998
+++ src/Makefile.in	Sun Jan 31 14:36:49 1999
@


1.4
log
@Make at least the CANNOT_DUMP version of emacs work on NetBSD/pmax.
Two patches provided by Jonathan Stone.
@
text
@d1 1
a1 1
$NetBSD$
a22 8
@@@@ -810,6 +810,7 @@@@
 #ifdef CANNOT_DUMP
 	rm -f emacs
 	ln temacs emacs
+	cp -p ../etc/DOC ../etc/DOC-20.3.1
 #else
 #ifdef HAVE_SHM
 	./temacs -nl -batch -l loadup dump
@


1.3
log
@Add NetBSD RCS Ids.
@
text
@d3 3
a5 3
--- src/Makefile.in.orig	Mon Aug 25 15:09:35 1997
+++ src/Makefile.in	Mon Apr  6 14:09:15 1998
@@@@ -401,7 +401,7 @@@@
d14 17
@


1.2
log
@Use -nostartfiles, not -L/usr/lib.  Don't try to hack around the system;
use it to your advantage.
@
text
@d1 2
@


1.1
log
@Adapt to changed behaviour of gcc's "-nostdlib" option.
@
text
@d1 8
a8 8
--- src/Makefile.in.orig	Mon Aug 25 21:09:35 1997
+++ src/Makefile.in	Mon Mar 16 09:20:37 1998
@@@@ -147,7 +147,7 @@@@
 /* This holds special options for linking temacs
    that should be used for linking anything else.  */
 #ifndef LD_SWITCH_SYSTEM_TEMACS
-#define LD_SWITCH_SYSTEM_TEMACS
+#define LD_SWITCH_SYSTEM_TEMACS -L/usr/lib
d11 1
a11 1
 /* Some m/MACHINE.h files define this to request special switches in ld.  */
@