Convert to USE_NEW_TEXINFO.

2 files changed, 5 insertions, 32 deletions

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index eb652ef2d80..c7890ed9114 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/06/28 17:14:29 joda Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/30 00:17:06 seb Exp $
 
 DISTNAME=	emacs-20.7
 PKGREVISION=	2
@@ -73,8 +73,10 @@ CONFIGURE_ARGS+=--with-ipv6
 CONFIGURE_ARGS+=--without-ipv6
 .endif
 MAKE_ENV+=	INSTALL_STRIP=${_STRIPFLAG_INSTALL}
+
+USE_NEW_TEXINFO=	YES
 INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
-		    ccmode message widget reftex forms
+		    ccmode message widget reftex
 
 INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
@@ -84,5 +86,4 @@ pre-install:
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs20/PLIST b/editors/emacs20/PLIST
index e9498e7e791..befb74e92f8 100644
--- a/editors/emacs20/PLIST
+++ b/editors/emacs20/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/11 00:31:44 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/06/30 00:17:06 seb Exp $
 bin/emacs
 bin/emacs-${PKGVERSION}
 bin/emacs-b2m
@@ -6,33 +6,23 @@ bin/emacs-ctags
 bin/emacs-etags
 bin/emacs-rcs-checkin
 bin/emacsclient
-@unexec ${INSTALL_INFO} --delete %D/info/ccmode %D/info/dir
 info/ccmode
-@exec   ${INSTALL_INFO}          %D/info/ccmode %D/info/dir
 info/ccmode-1
 info/ccmode-2
 info/ccmode-3
-@unexec ${INSTALL_INFO} --delete %D/info/cl %D/info/dir
 info/cl
-@exec   ${INSTALL_INFO}          %D/info/cl %D/info/dir
 info/cl-1
 info/cl-2
 info/cl-3
 info/cl-4
 info/cl-5
 info/cl-6
-@unexec ${INSTALL_INFO} --delete %D/info/dired-x %D/info/dir
 info/dired-x
-@exec   ${INSTALL_INFO}          %D/info/dired-x %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/ediff %D/info/dir
 info/ediff
-@exec   ${INSTALL_INFO}          %D/info/ediff %D/info/dir
 info/ediff-1
 info/ediff-2
 info/ediff-3
-@unexec ${INSTALL_INFO} --delete %D/info/emacs %D/info/dir
 info/emacs
-@exec   ${INSTALL_INFO}          %D/info/emacs %D/info/dir
 info/emacs-1
 info/emacs-10
 info/emacs-11
@@ -65,12 +55,8 @@ info/emacs-6
 info/emacs-7
 info/emacs-8
 info/emacs-9
-@unexec ${INSTALL_INFO} --delete %D/info/forms %D/info/dir
 info/forms
-@exec   ${INSTALL_INFO}          %D/info/forms %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/gnus %D/info/dir
 info/gnus
-@exec   ${INSTALL_INFO}          %D/info/gnus %D/info/dir
 info/gnus-1
 info/gnus-10
 info/gnus-11
@@ -87,44 +73,30 @@ info/gnus-6
 info/gnus-7
 info/gnus-8
 info/gnus-9
-@unexec ${INSTALL_INFO} --delete %D/info/message %D/info/dir
 info/message
-@exec   ${INSTALL_INFO}          %D/info/message %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/mh-e %D/info/dir
 info/mh-e
-@exec   ${INSTALL_INFO}          %D/info/mh-e %D/info/dir
 info/mh-e-1
 info/mh-e-2
 info/mh-e-3
 info/mh-e-4
-@unexec ${INSTALL_INFO} --delete %D/info/reftex %D/info/dir
 info/reftex
-@exec   ${INSTALL_INFO}          %D/info/reftex %D/info/dir
 info/reftex-1
 info/reftex-2
 info/reftex-3
-@unexec ${INSTALL_INFO} --delete %D/info/sc %D/info/dir
 info/sc
-@exec   ${INSTALL_INFO}          %D/info/sc %D/info/dir
 info/sc-1
 info/sc-2
 info/sc-3
-@unexec ${INSTALL_INFO} --delete %D/info/vip %D/info/dir
 info/vip
-@exec   ${INSTALL_INFO}          %D/info/vip %D/info/dir
 info/vip-1
 info/vip-2
-@unexec ${INSTALL_INFO} --delete %D/info/viper %D/info/dir
 info/viper
-@exec   ${INSTALL_INFO}          %D/info/viper %D/info/dir
 info/viper-1
 info/viper-2
 info/viper-3
 info/viper-4
 info/viper-5
-@unexec ${INSTALL_INFO} --delete %D/info/widget %D/info/dir
 info/widget
-@exec   ${INSTALL_INFO}          %D/info/widget %D/info/dir
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
 libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver