diff options
author | wiz <wiz> | 2013-03-15 22:44:59 +0000 |
---|---|---|
committer | wiz <wiz> | 2013-03-15 22:44:59 +0000 |
commit | b8de5129110f9a1194b9a5fb16e8c0040e5d1de9 (patch) | |
tree | a6400c1c9dec6f952dfb9e3bb1e0bc20dc447c0f /editors/emacs24/patches | |
parent | b7d91f0d8f11d235e9d2df79bc8fb18abac26aa6 (diff) | |
download | pkgsrc-b8de5129110f9a1194b9a5fb16e8c0040e5d1de9.tar.gz |
Update to 24.3:
Highlights of this release include:
Generalized variables are now in core Emacs Lisp.
An update for the Common Lisp emulation library.
A new major mode for Python.
(The operating system support framework was changed -- Dragonfly
support might need fixes.)
Diffstat (limited to 'editors/emacs24/patches')
-rw-r--r-- | editors/emacs24/patches/patch-aa | 26 | ||||
-rw-r--r-- | editors/emacs24/patches/patch-ab | 18 | ||||
-rw-r--r-- | editors/emacs24/patches/patch-ag | 12 |
3 files changed, 28 insertions, 28 deletions
diff --git a/editors/emacs24/patches/patch-aa b/editors/emacs24/patches/patch-aa index d36e9604fd1..6a2a49ca957 100644 --- a/editors/emacs24/patches/patch-aa +++ b/editors/emacs24/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.5 2012/12/15 12:27:45 marino Exp $ +$NetBSD: patch-aa,v 1.6 2013/03/15 22:45:00 wiz Exp $ Add DragonFly ---- configure.in.orig 2012-08-23 05:33:42.000000000 +0000 -+++ configure.in -@@ -469,6 +469,14 @@ case "${canonical}" in - vax-*) machine=vax ;; - esac +--- configure.ac.orig 2013-03-05 08:24:59.000000000 +0000 ++++ configure.ac +@@ -476,6 +476,14 @@ case "${canonical}" in + powerpc-ibm-aix[56]* ) + opsys=aix4-2 ;; + ## DragonFly ports + *-*-dragonfly*) @@ -17,9 +17,9 @@ Add DragonFly + esac + ;; - ## OpenBSD ports - *-*-openbsd* ) -@@ -955,7 +955,7 @@ + ## Silicon Graphics machines + ## Iris 4D +@@ -992,7 +1000,7 @@ case "$opsys" in ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2. aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;; @@ -28,7 +28,7 @@ Add DragonFly hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; -@@ -999,6 +1007,11 @@ case $opsys in +@@ -1038,6 +1046,11 @@ case $opsys in LIB_MATH= START_FILES='pre-crt0.o' ;; @@ -38,9 +38,9 @@ Add DragonFly + START_FILES='$(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o' + ;; freebsd ) - LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' - START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' -@@ -1095,6 +1108,28 @@ fi # crt_fi + LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o' + START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o' +@@ -1143,6 +1156,28 @@ fi # crt_fi AC_SUBST(CRT_DIR) case $opsys in diff --git a/editors/emacs24/patches/patch-ab b/editors/emacs24/patches/patch-ab index 967038af4d9..74b545436af 100644 --- a/editors/emacs24/patches/patch-ab +++ b/editors/emacs24/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.5 2012/12/15 12:27:45 marino Exp $ +$NetBSD: patch-ab,v 1.6 2013/03/15 22:45:00 wiz Exp $ Add DragonFly ---- configure.orig 2012-08-23 06:37:10.000000000 +0000 +--- configure.orig 2013-03-08 08:13:36.000000000 +0000 +++ configure -@@ -4476,6 +4476,15 @@ case "${canonical}" in - esac +@@ -4539,6 +4539,15 @@ case "${canonical}" in + opsys=netbsd ;; + ## DragonFly ports @@ -20,7 +20,7 @@ Add DragonFly ## OpenBSD ports *-*-openbsd* ) opsys=openbsd -@@ -7854,7 +7854,7 @@ +@@ -8341,7 +8350,7 @@ case "$opsys" in ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2. aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;; @@ -29,7 +29,7 @@ Add DragonFly hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; -@@ -8095,6 +8104,11 @@ case $opsys in +@@ -8382,6 +8391,11 @@ case $opsys in LIB_MATH= START_FILES='pre-crt0.o' ;; @@ -39,9 +39,9 @@ Add DragonFly + START_FILES='$(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o' + ;; freebsd ) - LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' - START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' -@@ -8209,6 +8223,51 @@ fi # crt_fi + LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o' + START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o' +@@ -8508,6 +8522,51 @@ fi # crt_fi case $opsys in diff --git a/editors/emacs24/patches/patch-ag b/editors/emacs24/patches/patch-ag index 09d6a7bd417..12833e705c9 100644 --- a/editors/emacs24/patches/patch-ag +++ b/editors/emacs24/patches/patch-ag @@ -1,20 +1,20 @@ -$NetBSD: patch-ag,v 1.1 2012/06/16 21:03:42 dholland Exp $ +$NetBSD: patch-ag,v 1.2 2013/03/15 22:45:00 wiz Exp $ When running terminfo but compiled for termcap, we cannot assume that we actually have anything useable in termcap_term_buffer so just use the terminfo fixed size defined ealier. ---- src/term.c 2010-01-06 10:11:04.000000000 +0000 -+++ src/term.c 2012-06-09 13:23:09.000000000 +0900 -@@ -3161,11 +3161,6 @@ +--- src/term.c.orig 2013-01-01 20:37:17.000000000 +0000 ++++ src/term.c +@@ -3111,11 +3111,6 @@ use the Bourne shell command `TERM=... e terminal_type); } -#ifndef TERMINFO - if (strlen (tty->termcap_term_buffer) >= buffer_size) -- abort (); +- emacs_abort (); - buffer_size = strlen (tty->termcap_term_buffer); -#endif - tty->termcap_strings_buffer = area = (char *) xmalloc (buffer_size); + tty->termcap_strings_buffer = area = xmalloc (buffer_size); tty->TS_ins_line = tgetstr ("al", address); tty->TS_ins_multi_lines = tgetstr ("AL", address); |