. 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)
This commit is contained in:
parent
c3f5beab16
commit
80012e1ea9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=222705
@ -1,5 +1,5 @@
|
||||
#
|
||||
# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.73 2008-06-03 14:36:49 bsam Exp $
|
||||
# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.74 2008-11-10 22:30:51 bsam Exp $
|
||||
#
|
||||
# bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
|
||||
#
|
||||
@ -83,7 +83,7 @@ PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
|
||||
# Emacs-22.x
|
||||
.elif (${EMACS_PORT_NAME} == "emacs22")
|
||||
EMACS_NAME= emacs
|
||||
EMACS_VER= 22.2
|
||||
EMACS_VER= 22.3
|
||||
EMACS_MAJOR_VER= 22
|
||||
EMACS_LIBDIR?= share/${EMACS_NAME}
|
||||
EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
PORTNAME= emacs
|
||||
PORTVERSION= ${EMACS_VER}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= editors ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
@ -29,7 +28,7 @@ CONFLICTS= emacs-19.* emacs-21.* \
|
||||
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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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)"
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -2381,10 +2381,10 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
|
||||
%%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.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/bibtex.el.gz
|
||||
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex.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 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
|
||||
%%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 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
|
||||
%%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 @@ var/games/emacs/tetris-scores
|
||||
@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
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
PORTNAME= emacs
|
||||
PORTVERSION= ${EMACS_VER}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= editors ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
@ -29,7 +28,7 @@ CONFLICTS= emacs-19.* emacs-21.* \
|
||||
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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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)"
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -2381,10 +2381,10 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
|
||||
%%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.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/bibtex.el.gz
|
||||
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex.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 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
|
||||
%%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 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
|
||||
%%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 @@ var/games/emacs/tetris-scores
|
||||
@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
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
PORTNAME= emacs
|
||||
PORTVERSION= ${EMACS_VER}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= editors ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= ${PORTNAME}
|
||||
@ -29,7 +28,7 @@ CONFLICTS= emacs-19.* emacs-21.* \
|
||||
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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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)"
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -2381,10 +2381,10 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
|
||||
%%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.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/bibtex.el.gz
|
||||
%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/bibtex.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 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
|
||||
%%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 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/vcdiff
|
||||
%%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 @@ var/games/emacs/tetris-scores
|
||||
@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
|
||||
|
Loading…
Reference in New Issue
Block a user