Date: Sun, 7 Sep 2008 06:10:25 +0300 (EEST) From: Giorgos Keramidas <keramida@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/127168: [PATCH] Upgrade editors/emacs to GNU Emacs 22.3 Message-ID: <200809070310.m873APe3075355@kobe.laptop> Resent-Message-ID: <200809070340.m873e0sB026851@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127168 >Category: ports >Synopsis: [PATCH] Upgrade editors/emacs to GNU Emacs 22.3 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Sep 07 03:40:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Giorgos Keramidas >Release: FreeBSD 8.0-CURRENT i386 >Organization: >Environment: System: FreeBSD kobe 8.0-CURRENT FreeBSD 8.0-CURRENT #2: \ Sat Sep 6 01:42:04 EEST 2008 build@kobe:/home/build/obj/home/build/src/sys/KOBE i386 >Description: Update the editors/emacs port to GNU Emacs 22.3. This version also includes a security fix in the way Emacs interacts with Python. More details are available online at: http://lists.gnu.org/archive/html/emacs-devel/2008-09/msg00215.html I've rebased the local FreeBSD patches and build-tested this on i386 and amd64 with the default options, with WITHOUT_GTK and WITHOUT_X11. More testing is probably needed for other platforms, but it would be nice if we commit this upgrade to get the security fix in, and then fix any fallout for the remaining platforms. >How-To-Repeat: >Fix: --- emacs-22.3-release.patch begins here --- diff -r 28770cecba01 Makefile --- a/Makefile Sun Sep 07 00:06:14 2008 +0000 +++ b/Makefile Sun Sep 07 06:05:42 2008 +0300 @@ -29,7 +29,7 @@ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* -EMACS_VER= 22.2 +EMACS_VER= 22.3 GNU_CONFIGURE= yes USE_GMAKE= yes diff -r 28770cecba01 distinfo --- a/distinfo Sun Sep 07 00:06:14 2008 +0000 +++ b/distinfo Sun Sep 07 06:05:42 2008 +0300 @@ -1,3 +1,3 @@ -MD5 (emacs-22.2.tar.gz) = d6ee586b8752351334ebf072904c4d51 -SHA256 (emacs-22.2.tar.gz) = 216839e1fb38ca4f2ed0a07689fb47ee80d90845f34e0a56fe781d6aa462e367 -SIZE (emacs-22.2.tar.gz) = 38694318 +MD5 (emacs-22.3.tar.gz) = aa8ba34f548cd78b35914ae5a7bb87eb +SHA256 (emacs-22.3.tar.gz) = 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 +SIZE (emacs-22.3.tar.gz) = 39587396 diff -r 28770cecba01 files/patch-Makefile.in --- a/files/patch-Makefile.in Sun Sep 07 00:06:14 2008 +0000 +++ b/files/patch-Makefile.in Sun Sep 07 06:05:42 2008 +0300 @@ -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 -r 28770cecba01 files/patch-lispintro-Makefile.in --- a/files/patch-lispintro-Makefile.in Sun Sep 07 00:06:14 2008 +0000 +++ b/files/patch-lispintro-Makefile.in Sun Sep 07 06:05:42 2008 +0300 @@ -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 -r 28770cecba01 files/patch-lispref-Makefile.in --- a/files/patch-lispref-Makefile.in Sun Sep 07 00:06:14 2008 +0000 +++ b/files/patch-lispref-Makefile.in Sun Sep 07 06:05:42 2008 +0300 @@ -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 -r 28770cecba01 files/patch-man-Makefile.in --- a/files/patch-man-Makefile.in Sun Sep 07 00:06:14 2008 +0000 +++ b/files/patch-man-Makefile.in Sun Sep 07 06:05:42 2008 +0300 @@ -1,5 +1,5 @@ ---- ./man/Makefile.in.orig Sat May 6 18:54:21 2006 -+++ ./man/Makefile.in Fri Sep 1 21:10:08 2006 +--- man/Makefile.in.orig 2008-09-07 05:25:12.000000000 +0300 ++++ man/Makefile.in 2008-09-07 05:25:12.000000000 +0300 @@ -32,7 +32,7 @@ # The makeinfo program is part of the Texinfo distribution. diff -r 28770cecba01 files/patch-src-alloc.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/files/patch-src-alloc.c Sun Sep 07 06:05:42 2008 +0300 @@ -0,0 +1,15 @@ +--- 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 __sparc64__ ++ asm ("flushw"); ++#else + asm ("ta 3"); + #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 diff -r 28770cecba01 files/patch-src__alloc.c --- a/files/patch-src__alloc.c Sun Sep 07 00:06:14 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ ---- ./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 @@ - needed on ia64 too. See mach_dep.c, where it also says inline - assembler doesn't work with relevant proprietary compilers. */ - #ifdef sparc -+#ifdef __sparc64__ -+ asm ("flushw"); -+#else - asm ("ta 3"); -+#endif - #endif - - /* Save registers that we need to see on the stack. We need to see diff -r 28770cecba01 pkg-plist --- a/pkg-plist Sun Sep 07 00:06:14 2008 +0000 +++ b/pkg-plist Sun Sep 07 06:05:42 2008 +0300 @@ -2381,10 +2381,10 @@ %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/artist.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bib-mode.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bib-mode.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex-style.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex-style.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex-style.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex-style.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/conf-mode.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/conf-mode.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/css-mode.el.gz @@ -2403,6 +2403,16 @@ %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-export-latex.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-export-latex.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-irc.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-irc.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-mac-message.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-mac-message.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-mouse.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-mouse.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-publish.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org-publish.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/org.elc %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/page-ext.el.gz @@ -2620,9 +2630,10 @@ %%DATADIR%%/site-lisp/subdirs.el var/games/emacs/snake-scores var/games/emacs/tetris-scores -@dirrm libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%% -@dirrm libexec/emacs/%%EMACS_VER%% -@dirrm libexec/emacs +@dirrmtry var/games/emacs +@dirrmtry var/games +@dirrmtry var +@dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/url @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/term @@ -2658,8 +2669,7 @@ @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/e @dirrm %%DATADIR%%/%%EMACS_VER%%/etc -@dirrm %%DATADIR%%/%%EMACS_VER%%/site-lisp @dirrm %%DATADIR%%/%%EMACS_VER%% -@dirrmtry var/games/emacs -@dirrmtry var/games -@dirrmtry var +@dirrm libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%% +@dirrm libexec/emacs/%%EMACS_VER%% +@dirrm libexec/emacs --- emacs-22.3-release.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809070310.m873APe3075355>