Attachment 93383 Details for Bug 131275 – emacs-23.0.90.diff

[patch] emacs-23.0.90.diff

emacs-23.0.90.diff (text/plain), 10.95 KB, created by Giorgos Keramidas on 2009-02-02 04:50:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Giorgos Keramidas

Created: 2009-02-02 04:50:06 UTC

Size: 10.95 KB

patch

obsolete

>Index: Mk/bsd.emacs.mk
>===================================================================
>RCS file: /home/ncvs/ports/Mk/bsd.emacs.mk,v
>retrieving revision 1.75
>diff -u -r1.75 bsd.emacs.mk
>--- Mk/bsd.emacs.mk	12 Jan 2009 18:44:16 -0000	1.75
>+++ Mk/bsd.emacs.mk	2 Feb 2009 04:20:26 -0000
>@@ -100,7 +100,7 @@
> # Emacs-23.x (development version)
> .elif (${EMACS_PORT_NAME} == "emacs-devel")
> EMACS_NAME=		emacs
>-EMACS_VER=		23.0.60
>+EMACS_VER=		23.0.90
> EMACS_MAJOR_VER=	23
> EMACS_LIBDIR?=		share/${EMACS_NAME}
> EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
>Index: editors/emacs-devel/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/emacs-devel/Makefile,v
>retrieving revision 1.24
>diff -u -r1.24 Makefile
>--- editors/emacs-devel/Makefile	8 Jan 2009 12:42:03 -0000	1.24
>+++ editors/emacs-devel/Makefile	2 Feb 2009 04:22:41 -0000
>@@ -6,12 +6,10 @@
> #
> 
> PORTNAME=	emacs
>-PORTVERSION=	${EMACS_VER}.${SNAPSHOT}
>-PORTREVISION=	1
>+PORTVERSION=	${EMACS_VER}
> CATEGORIES=	editors ipv6
>-MASTER_SITES=	${MASTER_SITE_LOCAL}
>-MASTER_SITE_SUBDIR=	keramida
>-DISTNAME=	${PORTNAME}-cvs-2008.12.07.18.51.01
>+MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
>+MASTER_SITE_SUBDIR=     emacs/pretest
> 
> MAINTAINER=	keramida@ceid.upatras.gr
> COMMENT=	GNU editing macros
>@@ -33,17 +31,13 @@
> 		xemacs-[0-9]* xemacs-devel-[0-9]* \
> 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
> 
>-USE_BZIP2=	yes
> INSTALLS_ICONS=	yes
> 
>-EMACS_VER=	23.0.60
>-SNAPSHOT=	20081207
>+EMACS_VER=	23.0.90
> GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
> ALL_TARGET=	bootstrap
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>-
> CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
> .if defined(WITHOUT_X11)
> CONFIGURE_ARGS=		--with-x=no
>@@ -68,7 +62,8 @@
> CONFIGURE_ARGS+=	--without-xim
> .endif
> 
>-MAN1=		ctags.1 emacs.1 emacsclient.1 etags.1
>+MAN1=		b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
>+		grep-changelog.1 rcs-checkin.1
> PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
> 
> MAKE_ENV=	LC_ALL=C
>Index: editors/emacs-devel/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/editors/emacs-devel/distinfo,v
>retrieving revision 1.14
>diff -u -r1.14 distinfo
>--- editors/emacs-devel/distinfo	9 Dec 2008 22:18:53 -0000	1.14
>+++ editors/emacs-devel/distinfo	2 Feb 2009 04:19:56 -0000
>@@ -1,3 +1,3 @@
>-MD5 (emacs-cvs-2008.12.07.18.51.01.tar.bz2) = e8f610d73c1108ea226e100770d5bc1a
>-SHA256 (emacs-cvs-2008.12.07.18.51.01.tar.bz2) = 6305c0d0c2e502fc2b9df46e66d4ab58dd24bc60fa790e9bff2390c955a5c999
>-SIZE (emacs-cvs-2008.12.07.18.51.01.tar.bz2) = 23799850
>+MD5 (emacs-23.0.90.tar.gz) = 5e08d4dbd3e59ebbc829c0bc20293ec9
>+SHA256 (emacs-23.0.90.tar.gz) = 0afb69a3996455c0883909fd1f9db786d0485eed9ef44c12bd623dff2ec7c7af
>+SIZE (emacs-23.0.90.tar.gz) = 42816900
>Index: editors/emacs-devel/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/editors/emacs-devel/pkg-plist,v
>retrieving revision 1.15
>diff -u -r1.15 pkg-plist
>--- editors/emacs-devel/pkg-plist	9 Dec 2008 22:18:53 -0000	1.15
>+++ editors/emacs-devel/pkg-plist	2 Feb 2009 04:19:56 -0000
>@@ -231,11 +231,6 @@
> %%DATADIR%%/%%EMACS_VER%%/etc/images/contact.xpm
> %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.pbm
> %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.xpm
>-%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/README
>-%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down-pushed.xpm
>-%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down.xpm
>-%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/right-pushed.xpm
>-%%DATADIR%%/%%EMACS_VER%%/etc/images/custom/right.xpm
> %%DATADIR%%/%%EMACS_VER%%/etc/images/cut.pbm
> %%DATADIR%%/%%EMACS_VER%%/etc/images/cut.xpm
> %%DATADIR%%/%%EMACS_VER%%/etc/images/data-save.pbm
>@@ -871,6 +866,7 @@
> %%DATADIR%%/%%EMACS_VER%%/leim/quail/greek.elc
> %%DATADIR%%/%%EMACS_VER%%/leim/quail/hangul.el.gz
> %%DATADIR%%/%%EMACS_VER%%/leim/quail/hangul.elc
>+%%DATADIR%%/%%EMACS_VER%%/leim/quail/hangul3.elc
> %%DATADIR%%/%%EMACS_VER%%/leim/quail/hanja-jis.el.gz
> %%DATADIR%%/%%EMACS_VER%%/leim/quail/hanja-jis.elc
> %%DATADIR%%/%%EMACS_VER%%/leim/quail/hanja.el.gz
>@@ -972,7 +968,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/button.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/button.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/calc/README
>-%%DATADIR%%/%%EMACS_VER%%/lisp/calc/README.prev
> %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-alg.el.gz
>@@ -2120,24 +2115,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/metamail.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mspools.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mspools.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmail.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmail.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailedit.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailedit.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailhdr.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailhdr.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailkwd.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailkwd.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailmm.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailmm.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailmsc.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailmsc.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailout.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailout.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailsort.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailsort.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailsum.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/pmailsum.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.el.gz
>@@ -2152,6 +2129,8 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmailedit.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmailkwd.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmailkwd.elc
>+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmailmm.el.gz
>+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmailmm.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmailmsc.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmailmsc.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmailout.el.gz
>@@ -2368,7 +2347,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/newcomment.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/novice.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/novice.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/TODO
> %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-glyph.el.gz
>@@ -2446,6 +2424,8 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.elc
>+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz
>+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/x-menu.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/x-menu.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-agenda.el.gz
>@@ -2470,6 +2450,8 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-export-latex.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.elc
>+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-footnote.el.gz
>+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-footnote.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-id.el.gz
>@@ -2761,6 +2743,8 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ps-mode.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/python.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/python.elc
>+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ruby-mode.el.gz
>+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ruby-mode.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/scheme.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/scheme.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sh-script.el.gz
>@@ -3114,8 +3098,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/vc-hg.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/vc-hooks.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/vc-hooks.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/vc-mcvs.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/vc-mcvs.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/vc-mtn.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/vc-mtn.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/vc-rcs.el.gz
>@@ -3233,7 +3215,6 @@
> @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/gud
> @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus
> @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage
>-@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/custom
> @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images
> @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/gnus
> @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/e
>@@ -3243,6 +3224,9 @@
> @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 share/icons/hicolor/scalable/mimetypes
> @dirrmtry share/icons/hicolor/scalable/apps
> @dirrmtry share/icons/hicolor/scalable
>@@ -3259,6 +3243,3 @@
> @dirrmtry share/icons/hicolor
> @dirrmtry share/icons
> @dirrmtry share/applications
>-@dirrmtry var/games/emacs
>-@dirrmtry var/games
>-@dirrmtry var
>Index: editors/emacs-devel/files/patch-Makefile.in
>===================================================================
>RCS file: /home/ncvs/ports/editors/emacs-devel/files/patch-Makefile.in,v
>retrieving revision 1.7
>diff -u -r1.7 patch-Makefile.in
>--- editors/emacs-devel/files/patch-Makefile.in	9 Dec 2008 22:18:53 -0000	1.7
>+++ editors/emacs-devel/files/patch-Makefile.in	2 Feb 2009 04:19:56 -0000
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
>-+++ Makefile.in	2008-12-09 19:25:19.000000000 +0200
>-@@ -444,14 +444,6 @@
>+--- Makefile.in.orig	Mon Feb 02 04:32:35 2009 +0200
>++++ Makefile.in	Mon Feb 02 04:22:03 2009 +0200
>+@@ -451,14 +451,6 @@
>  
>  install-arch-indep: mkdir info install-etc
>  	-set ${COPYDESTS} ; \
>@@ -15,7 +15,7 @@
>  	mkdir ${COPYDESTS} ; \
>  	chmod ugo+rx ${COPYDESTS} ; \
>  	unset CDPATH; \
>-@@ -552,9 +544,9 @@
>+@@ -559,9 +551,9 @@
>  	   cd ${srcdir}/info ; \
>  	   for elt in $(INFO_FILES); do \
>  	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
>@@ -28,7 +28,7 @@
>  	      done; \
>  	   done); \
>  	else true; fi
>-@@ -565,7 +557,7 @@
>+@@ -572,7 +564,7 @@
>  	  for elt in $(INFO_FILES); do \
>  	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
>  	    (cd $${thisdir}; \
>Index: editors/emacs-devel/files/patch-src-alloc.c
>===================================================================
>RCS file: editors/emacs-devel/files/patch-src-alloc.c
>diff -N editors/emacs-devel/files/patch-src-alloc.c
>--- editors/emacs-devel/files/patch-src-alloc.c	9 Dec 2008 22:18:53 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,15 +0,0 @@
>---- src/alloc.c.orig	2008-12-09 19:27:59.000000000 +0200
>-+++ src/alloc.c	2008-12-09 19:25:42.000000000 +0200
>-@@ -4488,8 +4488,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

Actions: View | Diff

Attachments on bug 131275: 93383