diff options
author | tron <tron@pkgsrc.org> | 1998-08-31 20:29:27 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 1998-08-31 20:29:27 +0000 |
commit | e92dec637b530204bc72a35c16898b27b21ac957 (patch) | |
tree | 5f0b220e62ff368aadad0f2a5df72165ee15201b /editors/emacs/patches | |
parent | 8adbc66d44ca4ffe2d49bd52e892db4eca767278 (diff) | |
download | pkgsrc-e92dec637b530204bc72a35c16898b27b21ac957.tar.gz |
Update "emacs" package to version 20.3.
Diffstat (limited to 'editors/emacs/patches')
-rw-r--r-- | editors/emacs/patches/patch-aa | 78 | ||||
-rw-r--r-- | editors/emacs/patches/patch-ab | 22 | ||||
-rw-r--r-- | editors/emacs/patches/patch-ae | 28 |
3 files changed, 44 insertions, 84 deletions
diff --git a/editors/emacs/patches/patch-aa b/editors/emacs/patches/patch-aa index 577288c0231..0e2b587aed5 100644 --- a/editors/emacs/patches/patch-aa +++ b/editors/emacs/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 1998/08/07 10:40:31 agc Exp $ +$NetBSD: patch-aa,v 1.5 1998/08/31 20:29:28 tron Exp $ --- ./man/widget.texi.orig Sat Oct 11 04:47:03 1997 +++ ./man/widget.texi Sat Oct 11 04:46:38 1997 @@ -137,34 +137,6 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:31 agc Exp $ @iftex @finalout @end iftex ---- ./man/dired-x.texi.org Thu Jan 4 12:54:19 1996 -+++ ./man/dired-x.texi Tue May 20 01:25:55 1997 -@@ -18,6 +18,11 @@ - @setfilename ../info/dired-x - @c dired-x.el REVISION NUMBER - @settitle Dired Extra Version 2 User's Manual -+@dircategory The Emacs editor and associated tools -+@direntry -+* Dired-X: (dired-x). Dired Extra Features. -+@end direntry -+ - @iftex - @finalout - @end iftex ---- ./man/ediff.texi.org Fri Jun 21 20:00:04 1996 -+++ ./man/ediff.texi Tue May 20 01:26:29 1997 -@@ -10,6 +10,11 @@ - @synindex vr cp - @synindex fn cp - @synindex pg cp -+@dircategory The Emacs editor and associated tools -+@direntry -+* Ediff: (ediff). A comprehensive visual interface to diff -+ and patch. -+@end direntry - @iftex - @finalout - @end iftex --- ./man/cc-mode.texi.org Sun Aug 4 21:56:21 1996 +++ ./man/cc-mode.texi Tue May 20 01:27:18 1997 @@ -9,6 +9,12 @@ @@ -180,47 +152,35 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:31 agc Exp $ @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @comment @setchapternewpage odd !! we don't want blank pages !! @comment %**end of header (This is for running Texinfo on a region) ---- ./man/Makefile.in.org Thu Jun 27 15:27:19 1996 -+++ ./man/Makefile.in Tue Apr 15 00:29:52 1997 -@@ -13,7 +13,7 @@ - # The makeinfo program is part of the Texinfo distribution. +--- man/Makefile.in.orig Sat May 16 21:00:22 1998 ++++ man/Makefile.in Mon Aug 31 00:53:10 1998 +@@ -14,7 +14,7 @@ MAKEINFO = makeinfo - INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \ -- ../info/ediff ../info/forms ../info/gnus ../info/info \ -+ ../info/ediff ../info/forms ../info/gnus \ - ../info/mh-e ../info/sc ../info/vip ../info/viper \ - ../info/message ../info/custom ../info/widget - DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \ -@@ -67,6 +67,7 @@ - ${srcdir}/gnu1.texi \ - ${srcdir}/glossary.texi + INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/customize \ + ../info/dired-x ../info/ediff ../info/forms ../info/gnus \ +- ../info/info ../info/message ../info/mh-e ../info/reftex \ ++ ../info/message ../info/mh-e ../info/reftex \ + ../info/sc ../info/vip ../info/viper ../info/widget + DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi customize.dvi dired-x.dvi \ + ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \ +@@ -70,6 +70,7 @@ + ${srcdir}/glossary.texi \ + ${srcdir}/ack.texi +all: info info: $(INFO_TARGETS) dvi: $(DVI_TARGETS) -@@ -76,12 +77,6 @@ +@@ -78,12 +79,6 @@ + # in srcdir. There is no provision for Info files # to exist in the build directory. # In a distribution of Emacs, the Info files should be up to date. - +- -../info/info: ${INFOSOURCES} - cd $(srcdir); $(MAKEINFO) --no-split info.texi - -info.dvi: ${INFOSOURCES} -- TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi -- +- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi + ../info/emacs: ${EMACSSOURCES} cd $(srcdir); $(MAKEINFO) emacs.texi - -@@ -151,9 +146,9 @@ - ../etc/GNU: gnu1.texi gnu.texi - makeinfo --no-headers -o ../etc/GNU gnu1.texi - --../info/viper: viper.texi viper-cmd.texi -+../info/viper: viper.texi - cd $(srcdir); $(MAKEINFO) viper.texi --viper.dvi: viper.texi viper-cmd.texi -+viper.dvi: viper.texi - TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/viper.texi - - mostlyclean: diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab index 92beb79ef1a..305ae966f1f 100644 --- a/editors/emacs/patches/patch-ab +++ b/editors/emacs/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:31 agc Exp $ +$NetBSD: patch-ab,v 1.4 1998/08/31 20:29:28 tron Exp $ ---- lib-src/Makefile.in.orig Mon Jul 28 07:50:45 1997 -+++ lib-src/Makefile.in Sat Feb 21 23:22:00 1998 -@@ -276,7 +276,7 @@ +--- lib-src/Makefile.in.orig Sun Aug 2 02:22:55 1998 ++++ lib-src/Makefile.in Mon Aug 31 20:50:30 1998 +@@ -278,7 +278,7 @@ if [ `(cd ${archlibdir} && /bin/pwd)` \ != `(cd ${srcdir} && /bin/pwd)` ]; then \ for file in ${SCRIPTS}; do \ @@ -11,17 +11,17 @@ $NetBSD: patch-ab,v 1.3 1998/08/07 10:40:31 agc Exp $ done ; \ fi -@@ -284,12 +284,14 @@ +@@ -286,12 +286,14 @@ @echo @echo "Installing utilities for users to run." for file in ${INSTALLABLES} ; do \ -- $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \ +- $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \ - chmod a+rx ${bindir}/$${file}; \ -+ if [ $${file} = emacsclient ]; then \ -+ $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \ -+ else \ -+ $(INSTALL_PROGRAM) $${file} ${bindir}/emacs-$${file} ; \ -+ fi ; \ ++ if [ $${file} = emacsclient ]; then \ ++ $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \ ++ else \ ++ $(INSTALL_PROGRAM) $${file} ${bindir}/emacs-$${file} ; \ ++ fi ; \ done for file in ${INSTALLABLE_SCRIPTS} ; do \ - $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \ diff --git a/editors/emacs/patches/patch-ae b/editors/emacs/patches/patch-ae index 4c24e80dd29..3e6be5e0bf2 100644 --- a/editors/emacs/patches/patch-ae +++ b/editors/emacs/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 1998/08/07 10:40:31 agc Exp $ +$NetBSD: patch-ae,v 1.3 1998/08/31 20:29:28 tron Exp $ ---- Makefile.in.orig Tue Sep 16 22:23:57 1997 -+++ Makefile.in Sat Feb 21 23:49:32 1998 -@@ -185,7 +185,7 @@ +--- Makefile.in.orig Sun Aug 2 02:21:22 1998 ++++ Makefile.in Mon Aug 31 00:38:50 1998 +@@ -188,7 +188,7 @@ # Subdirectories to make recursively. `lisp' is not included # because the compiled lisp files are part of the distribution # and you cannot remake them without installing Emacs first. @@ -11,23 +11,23 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 10:40:31 agc Exp $ # The makefiles of the directories in $SUBDIR. SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile -@@ -357,14 +357,8 @@ +@@ -376,14 +376,8 @@ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ then \ (cd ${infodir}; \ -- if [ -f dir ]; then \ -- if [ ! -f dir.old ]; then mv -f dir dir.old; \ -- else mv -f dir dir.bak; fi; \ +- if [ -f dir ]; then true; \ +- else \ +- (cd $${thisdir}; \ +- ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir; \ +- chmod a+r ${infodir}/dir); \ - fi; \ cd ${srcdir}/info ; \ -- (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ -- (cd $${thisdir}; chmod a+r ${infodir}/dir); \ -- for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \ -+ for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \ +- for f in ccmode* cl* customize* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* reftex* sc* vip* widget*; do \ ++ for f in ccmode* cl* customize* dired-x* ediff* emacs* forms* gnus* message* mh-e* reftex* sc* vip* widget*; do \ (cd $${thisdir}; \ ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ chmod a+r ${infodir}/$$f); \ -@@ -374,8 +368,13 @@ +@@ -402,8 +396,13 @@ cd ${srcdir}/etc; \ for page in emacs etags ctags ; do \ (cd $${thisdir}; \ @@ -43,7 +43,7 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 10:40:31 agc Exp $ done ### Install LEIM files. Although they are machine-independent, we -@@ -421,7 +420,7 @@ +@@ -451,7 +450,7 @@ esac ; \ fi ; \ done |