Convert to USE_NEW_TEXINFO.

Use INSTALL_TARGET to install info files: this gives a proper
environment for USE_NEW_TEXINFO framework to work.

Fix makeinfo invocation for zsh-current via patch file so that
only _one_ info file is generated as PLIST seems to want it.

7 files changed, 24 insertions, 14 deletions

diff --git a/shells/zsh-current/Makefile b/shells/zsh-current/Makefile
index 5b39ed8c28f..f44e21fc6e6 100644
--- a/shells/zsh-current/Makefile
+++ b/shells/zsh-current/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:53:24 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/05 13:37:52 seb Exp $
 #
 .include "../../shells/zsh/Makefile.common"
 
 ZSH_VERSION=	4.1.1
 ZSH_MAINTAINER=	uebayasi@NetBSD.org
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh-current/PLIST b/shells/zsh-current/PLIST
index a618b269d2c..286a228a858 100644
--- a/shells/zsh-current/PLIST
+++ b/shells/zsh-current/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/29 03:00:48 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/08/05 13:37:53 seb Exp $
 bin/zsh
 bin/${PKGNAME}
-@unexec ${INSTALL_INFO} --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
-@exec ${INSTALL_INFO} %D/info/zsh.info %D/info/dir
 man/man1/zsh.1
 man/man1/zshall.1
 man/man1/zshbuiltins.1
diff --git a/shells/zsh-current/distinfo b/shells/zsh-current/distinfo
index d00e691cdd7..4b1408e57e4 100644
--- a/shells/zsh-current/distinfo
+++ b/shells/zsh-current/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2003/06/29 04:24:57 uebayasi Exp $
+$NetBSD: distinfo,v 1.6 2003/08/05 13:37:53 seb Exp $
 
 SHA1 (zsh-4.1.1.tar.bz2) = a47a6e698530d89988ed12dc7aaa6428e7336c5e
 Size (zsh-4.1.1.tar.bz2) = 1924514 bytes
+SHA1 (patch-aa) = 86a2aa8ce6e885003a751d7f8ec4b94755bf0631
 SHA1 (patch-ac) = fb983a8d7281f97023be5ea8df505b9eab93b32f
 SHA1 (patch-ad) = 744b188c8d273238ce74ea37e9f77a53800ac823
diff --git a/shells/zsh-current/patches/patch-aa b/shells/zsh-current/patches/patch-aa
new file mode 100644
index 00000000000..4cb50833ead
--- /dev/null
+++ b/shells/zsh-current/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2003/08/05 13:37:54 seb Exp $
+
+--- Doc/Makefile.in.orig	2003-02-13 11:06:46.000000000 +0000
++++ Doc/Makefile.in
+@@ -37,7 +37,7 @@ INSTALL         = @INSTALL@
+ 
+ @DEFS_MK@
+ 
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips
+ TEXI2HTML = texi2html -expand info -split chapter
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 7e0684b7de2..abfc0f7fc32 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2003/06/29 04:24:56 uebayasi Exp $
+# $NetBSD: Makefile,v 1.42 2003/08/05 13:37:51 seb Exp $
 #
 .include "../../shells/zsh/Makefile.common"
 
 ZSH_VERSION=	4.0.7
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index c6b4beb25e4..e68531e2d79 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2003/06/30 13:46:04 grant Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/08/05 13:37:51 seb Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -17,8 +17,9 @@ COMMENT=	The Z shell
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
-TEXINFO_OVERRIDE=	YES
 
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=		YES
 INFO_FILES=		zsh.info
 
 .include "../../mk/bsd.prefs.mk"
@@ -39,8 +40,9 @@ PLIST_SRC=	${PKGDIR}/PLIST.shlibs ${PKGDIR}/PLIST.dynamic ${PKGDIR}/PLIST
 
 PKG_SHELL=	${PREFIX}/bin/zsh
 
+INSTALL_TARGET=	install install.info
+
 post-install:
-	@cd ${WRKSRC}/Doc; ${MAKE} install.info
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zsh
 	@cd ${WRKSRC}/Etc; ${INSTALL_DATA} BUGS FAQ FEATURES NEWS	\
 		${PREFIX}/share/doc/zsh
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index 80464648707..3a9ffb186d1 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2003/06/20 05:59:02 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/08/05 13:37:51 seb Exp $
 bin/zsh
 bin/${PKGNAME}
-@unexec ${INSTALL_INFO} --delete %D/info/zsh.info %D/info/dir
 info/zsh.info
-@exec ${INSTALL_INFO} %D/info/zsh.info %D/info/dir
 man/man1/zsh.1
 man/man1/zshall.1
 man/man1/zshbuiltins.1