From c33d27f2619cffee529f1dc4b79bab6f9c8cca4b Mon Sep 17 00:00:00 2001
From: seb <seb>
Date: Mon, 4 Aug 2003 22:55:22 +0000
Subject: Convert to USE_NEW_TEXINFO.

---
 security/fsh/Makefile   | 5 +++--
 security/fsh/PLIST      | 4 +---
 security/gnupg/Makefile | 4 ++--
 security/gnupg/PLIST    | 6 +-----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/security/fsh/Makefile b/security/fsh/Makefile
index 229f8cf73ac..60095f63b2f 100644
--- a/security/fsh/Makefile
+++ b/security/fsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/21 17:20:09 martti Exp $
+# $NetBSD: Makefile,v 1.12 2003/08/04 22:55:22 seb Exp $
 #
 
 DISTNAME=	fsh-1.2
@@ -11,9 +11,10 @@ HOMEPAGE=	http://www.lysator.liu.se/fsh/
 COMMENT=	Fast remote command execution
 
 GNU_CONFIGURE=	YES
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	fsh.info
 
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 
 .include "../../lang/python/application.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/fsh/PLIST b/security/fsh/PLIST
index ccbd5616c25..a8a237cb6e5 100644
--- a/security/fsh/PLIST
+++ b/security/fsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/05 21:59:35 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/08/04 22:55:23 seb Exp $
 bin/fcp
 bin/fsh
 bin/fshd
@@ -11,7 +11,5 @@ share/fsh/fshd.py
 share/fsh/fshlib.py
 share/fsh/fshversion.py
 share/fsh/infshd.py
-@unexec ${INSTALL_INFO} --delete %D/info/fsh.info %D/info/dir
 info/fsh.info
-@exec ${INSTALL_INFO} %D/info/fsh.info %D/info/dir
 @dirrm share/fsh
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 72979a30ca5..7e00512fb67 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2003/07/17 22:52:55 grant Exp $
+# $NetBSD: Makefile,v 1.48 2003/08/04 23:12:17 seb Exp $
 
 DISTNAME=	gnupg-1.2.2
 PKGREVISION=	1
@@ -28,6 +28,7 @@ TEST_TARGET=		check
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+USE_NEW_TEXINFO=	YES
 INFO_FILES=	gpg.info gpgv.info
 
 .include "../../mk/bsd.prefs.mk"
@@ -63,5 +64,4 @@ PLIST_SUBST+=	OPENLDAP="@comment "
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index 2834adda03b..55d104b927b 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,13 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2003/05/05 16:33:47 taca Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/08/04 23:12:17 seb Exp $
 bin/gpg
 bin/gpgsplit
 bin/gpgv
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gpg.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gpgv.info
 info/gpg.info
 info/gpgv.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gpg.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gpgv.info
 libexec/gnupg/gpgkeys_mailto
 ${OPENLDAP}libexec/gnupg/gpgkeys_ldap
 man/man1/gpg.1
-- 
cgit v1.2.3