diff options
Diffstat (limited to 'editors/emacs/patches/patch-ae')
| -rw-r--r-- | editors/emacs/patches/patch-ae | 68 |
1 files changed, 32 insertions, 36 deletions
diff --git a/editors/emacs/patches/patch-ae b/editors/emacs/patches/patch-ae index 3c04a937e8b..8aeab45d5f2 100644 --- a/editors/emacs/patches/patch-ae +++ b/editors/emacs/patches/patch-ae @@ -1,52 +1,48 @@ -$NetBSD: patch-ae,v 1.10 2003/04/12 10:16:40 uebayasi Exp $ +$NetBSD: patch-ae,v 1.11 2007/06/11 13:57:18 markd Exp $ ---- Makefile.in.orig Sat Oct 19 10:21:01 2002 +--- Makefile.in.orig 2007-06-10 09:22:56.000000000 +1200 +++ Makefile.in -@@ -430,28 +430,24 @@ - chmod a+r ${infodir}/dir); \ - fi; \ - cd ${srcdir}/info ; \ -- for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \ -+ for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \ - (cd $${thisdir}; \ -- ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ -- chmod a+r ${infodir}/$$f); \ -+ ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \ +@@ -140,7 +140,7 @@ man1dir=$(mandir)/man1 + infodir=@infodir@ + INFO_FILES=ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \ + elisp eintr emacs emacs-mime eshell eudc flymake \ +- forms gnus idlwave info message mh-e newsticker org pcl-cvs \ ++ forms gnus idlwave message mh-e newsticker org pcl-cvs \ + pgg reftex sc ses sieve speedbar tramp vip viper widget \ + woman smtpmail url rcirc erc + +@@ -514,27 +514,23 @@ install-arch-indep: mkdir info + for elt in $(INFO_FILES); do \ + for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ + ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \ +- chmod a+r $(DESTDIR)${infodir}/$$f; \ + done; \ done); \ else true; fi -unset CDPATH; \ - thisdir=`/bin/pwd`; \ -- if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ +- if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ - then \ -- for f in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \ +- for elt in $(INFO_FILES); do \ - (cd $${thisdir}; \ -- ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \ +- ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ - done; \ - else true; fi -- -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir} -+ chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir} +- -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir} ++ chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir} thisdir=`/bin/pwd`; \ cd ${srcdir}/etc; \ - for page in emacs etags ctags gfdl ; do \ +- for page in emacs emacsclient etags ctags ; do \ ++ for page in emacs emacsclient ; do \ (cd $${thisdir}; \ -- ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \ -- chmod a+r ${man1dir}/$${page}${manext}); \ -+ if [ $${page} = emacs ]; then \ -+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \ -+ chmod a+r ${man1dir}/$${page}${manext}; \ -+ else \ -+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/emacs-$${page}${manext}; \ -+ chmod a+r ${man1dir}/emacs-$${page}${manext}; \ -+ fi) \ + ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \ + chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \ done ++ for page in etags ctags ; do \ ++ (cd $${thisdir}; \ ++ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/emacs-$${page}${manext}; \ ++ chmod a+r $(DESTDIR)${man1dir}/emacs-$${page}${manext}); \ ++ done ### Install LEIM files. Although they are machine-independent, we -@@ -506,7 +502,7 @@ - done - (cd ${archlibdir} && rm -f fns-*) - -rm -rf ${libexecdir}/emacs/${version} -- (cd ${infodir} && rm -f cl* ada-mode* autotype* ccmode* ebrowse* efaq* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*) -+ (cd ${infodir} && rm -f cl* ada-mode* autotype* ccmode* ebrowse* efaq* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* 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)) - + ### have separate target here instead of including it in |