- Add .info suffix to filename of info files.

- Use INFO macro.

Requested by:	edwin

3 files changed, 27 insertions, 81 deletions

diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 4e035ab5c90b..00713861161a 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	21.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	editors ipv6
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -52,6 +52,10 @@ TEXIFILES=	ada-mode autotype cc-mode cl dired-x ebrowse ediff \
 		faq emacs emacs-mime eshell eudc forms gnus idlwave \
 		info message mh-e pcl-cvs reftex sc speedbar vip \
 		viper widget woman
+INFO=		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 
 
 LATEST_LINK=	emacs
 
diff --git a/editors/emacs22/files/patch-Makefile.in b/editors/emacs22/files/patch-Makefile.in
index 63b440560094..2e04a36c21f8 100644
--- a/editors/emacs22/files/patch-Makefile.in
+++ b/editors/emacs22/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Thu Mar  7 00:13:23 2002
-+++ Makefile.in	Thu Mar  7 00:14:30 2002
+--- Makefile.in.orig	Sat Oct 19 10:21:01 2002
++++ Makefile.in	Fri Dec  9 01:25:01 2005
 @@ -348,14 +348,6 @@
  ## as a workaround for a bug in tar on Ultrix 4.2.
  install-arch-indep: mkdir info
@@ -15,3 +15,23 @@
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
  	unset CDPATH; \
+@@ -432,8 +424,8 @@
+ 	   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 \
+ 	     (cd $${thisdir}; \
+-	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
+-	      chmod a+r ${infodir}/$$f); \
++	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f.info; \
++	      chmod a+r ${infodir}/$$f.info); \
+ 	   done); \
+ 	else true; fi
+ 	-unset CDPATH; \
+@@ -442,7 +434,7 @@
+ 	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 \
+ 	    (cd $${thisdir}; \
+-	     ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
++	     ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f.info); \
+ 	  done; \
+ 	else true; fi
+ 	-chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
diff --git a/editors/emacs22/pkg-plist b/editors/emacs22/pkg-plist
index fe12dfd7c217..514352d50d85 100644
--- a/editors/emacs22/pkg-plist
+++ b/editors/emacs22/pkg-plist
@@ -7,84 +7,6 @@ bin/emacsclient
 bin/etags
 bin/grep-changelog
 bin/rcs-checkin
-@unexec install-info --delete %D/info/ada-mode %D/info/dir
-@unexec install-info --delete %D/info/autotype %D/info/dir
-@unexec install-info --delete %D/info/ccmode %D/info/dir
-@unexec install-info --delete %D/info/cl %D/info/dir
-@unexec install-info --delete %D/info/dired-x %D/info/dir
-@unexec install-info --delete %D/info/ebrowse %D/info/dir
-@unexec install-info --delete %D/info/ediff %D/info/dir
-@unexec install-info --delete %D/info/efaq %D/info/dir
-@unexec install-info --delete %D/info/emacs %D/info/dir
-@unexec install-info --delete %D/info/emacs-mime %D/info/dir
-@unexec install-info --delete %D/info/eshell %D/info/dir
-@unexec install-info --delete %D/info/eudc %D/info/dir
-@unexec install-info --delete %D/info/forms %D/info/dir
-@unexec install-info --delete %D/info/gnus %D/info/dir
-@unexec install-info --delete %D/info/idlwave %D/info/dir
-@unexec install-info --delete %D/info/info %D/info/dir
-@unexec install-info --delete %D/info/message %D/info/dir
-@unexec install-info --delete %D/info/mh-e %D/info/dir
-@unexec install-info --delete %D/info/pcl-cvs %D/info/dir
-@unexec install-info --delete %D/info/reftex %D/info/dir
-@unexec install-info --delete %D/info/sc %D/info/dir
-@unexec install-info --delete %D/info/speedbar %D/info/dir
-@unexec install-info --delete %D/info/vip %D/info/dir
-@unexec install-info --delete %D/info/viper %D/info/dir
-@unexec install-info --delete %D/info/widget %D/info/dir
-@unexec install-info --delete %D/info/woman %D/info/dir
-info/ada-mode
-info/autotype
-info/ccmode
-info/cl
-info/dired-x
-info/ebrowse
-info/ediff
-info/efaq
-info/emacs
-info/emacs-mime
-info/eshell
-info/eudc
-info/forms
-info/gnus
-info/idlwave
-info/info
-info/message
-info/mh-e
-info/pcl-cvs
-info/reftex
-info/sc
-info/speedbar
-info/vip
-info/viper
-info/widget
-info/woman
-@exec install-info %D/info/ada-mode %D/info/dir
-@exec install-info %D/info/autotype %D/info/dir
-@exec install-info %D/info/ccmode %D/info/dir
-@exec install-info %D/info/cl %D/info/dir
-@exec install-info %D/info/dired-x %D/info/dir
-@exec install-info %D/info/ebrowse %D/info/dir
-@exec install-info %D/info/ediff %D/info/dir
-@exec install-info %D/info/efaq %D/info/dir
-@exec install-info %D/info/emacs %D/info/dir
-@exec install-info %D/info/emacs-mime %D/info/dir
-@exec install-info %D/info/eshell %D/info/dir
-@exec install-info %D/info/eudc %D/info/dir
-@exec install-info %D/info/forms %D/info/dir
-@exec install-info %D/info/gnus %D/info/dir
-@exec install-info %D/info/idlwave %D/info/dir
-@exec install-info %D/info/info %D/info/dir
-@exec install-info %D/info/message %D/info/dir
-@exec install-info %D/info/mh-e %D/info/dir
-@exec install-info %D/info/pcl-cvs %D/info/dir
-@exec install-info %D/info/reftex %D/info/dir
-@exec install-info %D/info/sc %D/info/dir
-@exec install-info %D/info/speedbar %D/info/dir
-@exec install-info %D/info/vip %D/info/dir
-@exec install-info %D/info/viper %D/info/dir
-@exec install-info %D/info/widget %D/info/dir
-@exec install-info %D/info/woman %D/info/dir
 libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/cvtmail
 libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/digest-doc
 libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/emacsserver