From 80012e1ea94e4d2eb3f2a5c5abca884be6a7e626 Mon Sep 17 00:00:00 2001 From: Boris Samorodov Date: Mon, 10 Nov 2008 22:30:51 +0000 Subject: . update to version 22.3 (includes a security fix in the way Emacs interacts with Python); . change EMACS_VER at bsd.emacs.mk. While I'm here: remove old PORTREVISION. PR: 127168 Submitted by: keramida (maintainer) --- editors/emacs22/files/patch-Makefile.in | 12 ++++++------ editors/emacs22/files/patch-lispintro-Makefile.in | 8 ++++---- editors/emacs22/files/patch-lispref-Makefile.in | 12 ++++++------ editors/emacs22/files/patch-src__alloc.c | 11 ++++++----- 4 files changed, 22 insertions(+), 21 deletions(-) (limited to 'editors/emacs22/files') diff --git a/editors/emacs22/files/patch-Makefile.in b/editors/emacs22/files/patch-Makefile.in index 29774c94a862..e9bba5c55c8a 100644 --- a/editors/emacs22/files/patch-Makefile.in +++ b/editors/emacs22/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig Sun Aug 27 04:16:25 2006 -+++ ./Makefile.in Fri Sep 1 21:10:08 2006 -@@ -409,14 +409,6 @@ +--- Makefile.in.orig 2008-09-07 05:23:59.000000000 +0300 ++++ Makefile.in 2008-09-07 05:23:59.000000000 +0300 +@@ -419,14 +419,6 @@ ## That flag is also used in leim/Makefile.in install-arch-indep: mkdir info -set ${COPYDESTS} ; \ @@ -15,7 +15,7 @@ mkdir ${COPYDESTS} ; \ chmod ugo+rx ${COPYDESTS} ; \ unset CDPATH; \ -@@ -503,9 +495,9 @@ +@@ -513,9 +505,9 @@ fi; \ cd ${srcdir}/info ; \ for elt in $(INFO_FILES); do \ @@ -28,7 +28,7 @@ done; \ done); \ else true; fi -@@ -515,7 +507,7 @@ +@@ -525,7 +517,7 @@ then \ for elt in $(INFO_FILES); do \ (cd $${thisdir}; \ @@ -36,4 +36,4 @@ + ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \ done; \ else true; fi - -chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${infodir} + -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir} diff --git a/editors/emacs22/files/patch-lispintro-Makefile.in b/editors/emacs22/files/patch-lispintro-Makefile.in index eac664f21cda..cfc206bd4fba 100644 --- a/editors/emacs22/files/patch-lispintro-Makefile.in +++ b/editors/emacs22/files/patch-lispintro-Makefile.in @@ -1,6 +1,6 @@ ---- ./lispintro/Makefile.in.orig Mon Feb 6 01:05:17 2006 -+++ ./lispintro/Makefile.in Fri Sep 1 21:10:08 2006 -@@ -33,7 +33,7 @@ +--- lispintro/Makefile.in.orig 2008-09-07 05:24:38.000000000 +0300 ++++ lispintro/Makefile.in 2008-09-07 05:24:38.000000000 +0300 +@@ -34,7 +34,7 @@ INFO_TARGETS = ${infodir}/eintr DVI_TARGETS = emacs-lisp-intro.dvi @@ -8,4 +8,4 @@ +MAKEINFO = makeinfo --no-split TEXI2DVI = texi2dvi DVIPS = dvips - ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" + diff --git a/editors/emacs22/files/patch-lispref-Makefile.in b/editors/emacs22/files/patch-lispref-Makefile.in index cfd8699c6512..c721452cd6e1 100644 --- a/editors/emacs22/files/patch-lispref-Makefile.in +++ b/editors/emacs22/files/patch-lispref-Makefile.in @@ -1,6 +1,6 @@ ---- ./lispref/Makefile.in.orig Mon Aug 21 08:22:22 2006 -+++ ./lispref/Makefile.in Fri Sep 1 21:10:08 2006 -@@ -32,7 +32,7 @@ +--- lispref/Makefile.in.orig 2008-09-07 05:24:57.000000000 +0300 ++++ lispref/Makefile.in 2008-09-07 05:24:57.000000000 +0300 +@@ -33,7 +33,7 @@ TEXI2DVI = texi2dvi SHELL = /bin/sh INSTALL_INFO = install-info @@ -9,7 +9,7 @@ # The name of the manual: VERSION=2.9 -@@ -109,7 +109,7 @@ +@@ -110,7 +110,7 @@ # This is for use in a separate distro of the Emacs Lisp manual. install: elisp $(srcdir)/mkinstalldirs $(infodir) @@ -18,7 +18,7 @@ ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp # This is for use in a separate distro of the Emacs Lisp manual. -@@ -125,7 +125,7 @@ +@@ -126,7 +126,7 @@ maintainer-clean: clean rm -f elisp.dvi elisp.oaux @@ -27,7 +27,7 @@ dist: $(infodir)/elisp elisp.dvi -rm -rf temp -@@ -135,7 +135,7 @@ +@@ -136,7 +136,7 @@ $(srcdir)/Makefile.in $(srcs) \ $(srcdir)/../man/texinfo.tex \ elisp.dvi elisp.aux elisp.??s \ diff --git a/editors/emacs22/files/patch-src__alloc.c b/editors/emacs22/files/patch-src__alloc.c index b295275127d5..80c226b6f778 100644 --- a/editors/emacs22/files/patch-src__alloc.c +++ b/editors/emacs22/files/patch-src__alloc.c @@ -1,14 +1,15 @@ ---- ./src/alloc.c.orig Thu Aug 31 20:50:29 2006 -+++ ./src/alloc.c Fri Sep 1 21:10:08 2006 -@@ -4560,7 +4560,11 @@ +--- src/alloc.c.orig 2008-09-07 05:25:27.000000000 +0300 ++++ src/alloc.c 2008-09-07 05:25:27.000000000 +0300 +@@ -4573,8 +4573,12 @@ needed on ia64 too. See mach_dep.c, where it also says inline assembler doesn't work with relevant proprietary compilers. */ - #ifdef sparc + #ifdef __sparc__ +#ifdef __sparc64__ + asm ("flushw"); +#else asm ("ta 3"); -+#endif #endif ++#endif /* Save registers that we need to see on the stack. We need to see + registers used to hold register variables and registers used to -- cgit v1.2.3