diff options
author | Satoshi Asami <asami@FreeBSD.org> | 1997-04-18 10:50:28 +0000 |
---|---|---|
committer | Satoshi Asami <asami@FreeBSD.org> | 1997-04-18 10:50:28 +0000 |
commit | df765a4bd61a0ee5b0ae4ee38364282243c419c5 (patch) | |
tree | 2b0d7c2098f0db822f9ad9c7824f7ab400d25dd0 /editors/emacs | |
parent | Puff, the magic dragon, lived by the sea, (diff) |
Hey guys, thanks for the number of comments on my install-info inquiry
(which was about equal to number of FreeBSD installations on Hale Bopp
itself). Seems like I need to just go ahead and commit it so people
can try out and scream!
Notes
Notes:
svn path=/head/; revision=6235
Diffstat (limited to 'editors/emacs')
-rw-r--r-- | editors/emacs/Makefile | 6 | ||||
-rw-r--r-- | editors/emacs/files/patch-aa | 95 | ||||
-rw-r--r-- | editors/emacs/pkg-plist | 7 |
3 files changed, 103 insertions, 5 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 0859b2f04109..ba9d2e90e233 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -3,7 +3,7 @@ # Date created: 29 October 1994 # Whom: jkh # -# $Id: Makefile,v 1.25 1996/11/18 10:22:58 asami Exp $ +# $Id: Makefile,v 1.26 1996/11/19 13:14:40 asami Exp $ # DISTNAME= emacs-19.34b @@ -21,5 +21,9 @@ post-install: for file in emacs-19.34 emacsclient etags ctags b2m; do \ strip ${PREFIX}/bin/$$file; \ done + if [ ! -f ${PREFIX}/info/dir ]; then \ + sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + install-info ${PREFIX}/info/emacs ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/editors/emacs/files/patch-aa b/editors/emacs/files/patch-aa new file mode 100644 index 000000000000..c9a46426109f --- /dev/null +++ b/editors/emacs/files/patch-aa @@ -0,0 +1,95 @@ +--- ./man/emacs.texi.org Mon Aug 19 21:15:12 1996 ++++ ./man/emacs.texi Mon Apr 14 23:08:20 1997 +@@ -49,6 +49,24 @@ + @settitle GNU Emacs Manual + @setfilename ../info/emacs + @synindex pg cp ++@dircategory The Emacs editor and associated tools ++@direntry ++* Emacs: (emacs). The extensible self-documenting text editor. ++* VIP: (vip). A VI-emulation for Emacs. ++* VIPER: (viper). The new VI-emulation mode in Emacs-19.29. ++* Forms: (forms). Emacs package for editing data bases ++ by filling in forms. ++* GNUS: (gnus). The news reader GNUS. ++* MH-E: (mh-e). Emacs interface to the MH mail system. ++* CL: (cl). Partial Common Lisp support for Emacs Lisp. ++* SC: (sc). Supercite lets you cite parts of messages you're ++ replying to, in flexible ways. ++* Dired-X: (dired-x). Dired Extra Features. ++* Ediff: (ediff). A comprehensive visual interface to diff & patch. ++* CC mode: (ccmode). The GNU Emacs mode for editing C, C++, Objective-C ++ and Java code. ++@end direntry ++ + @c + @c in general, keep the following line commented out, unless doing a + @c copy of this manual that will be published. the manual should go +--- ./Makefile.in.org Mon Aug 19 21:12:19 1996 ++++ ./Makefile.in Tue Apr 15 00:15:28 1997 +@@ -184,7 +184,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. +-SUBDIR = lib-src src ++SUBDIR = lib-src src man + + # The makefiles of the directories in $SUBDIR. + SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile +@@ -368,14 +368,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; \ +- 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 \ + (cd $${thisdir}; \ + ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ + chmod a+r ${infodir}/$$f); \ +@@ -426,7 +420,7 @@ + esac ; \ + fi ; \ + done +- (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*) ++ (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*) + (cd ${man1dir} && rm -f emacs.1 etags.1 ctags.1) + (cd ${bindir} && rm -f emacs-${version} $(EMACS)) + +--- ./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. + 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 + DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \ +@@ -66,6 +66,7 @@ + ${srcdir}/gnu1.texi \ + ${srcdir}/glossary.texi + ++all: info + info: $(INFO_TARGETS) + + dvi: $(DVI_TARGETS) +@@ -74,12 +75,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 + + ../info/emacs: ${EMACSSOURCES} + cd $(srcdir); $(MAKEINFO) emacs.texi diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist index f6f1a5cb83a6..5b7050afd696 100644 --- a/editors/emacs/pkg-plist +++ b/editors/emacs/pkg-plist @@ -15,9 +15,6 @@ bin/emacsclient man/man1/emacs.1.gz man/man1/etags.1.gz man/man1/ctags.1.gz -@unexec cp %D/info/dir %D/info/dir.bak -info/dir -@unexec cp %D/info/dir.bak %D/info/dir info/cl info/cl-1 info/cl-2 @@ -29,6 +26,7 @@ info/dired-x info/ediff info/ediff-1 info/ediff-2 +@unexec install-info --delete %D/info/emacs %D/info/dir info/emacs info/emacs-1 info/emacs-10 @@ -69,7 +67,6 @@ info/gnus-5 info/gnus-6 info/gnus-7 info/gnus-8 -info/info info/mh-e info/mh-e-1 info/mh-e-2 @@ -87,6 +84,8 @@ info/viper-1 info/viper-2 info/viper-3 info/viper-4 +@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec install-info %D/info/emacs %D/info/dir libexec/emacs/19.34/i386--freebsd/cvtmail libexec/emacs/19.34/i386--freebsd/digest-doc libexec/emacs/19.34/i386--freebsd/emacsserver |