Convert to USE_NEW_TEXINFO.

Patch ngspice.info for INFO-DIR-{SECTION,ENTRY} addition.

4 files changed, 25 insertions, 6 deletions

diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index e26a56fa400..b7866d129f8 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/09/21 06:36:45 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/27 10:18:55 seb Exp $
 #
 
 DISTNAME=	ng-spice-rework-14
@@ -21,8 +21,10 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-debug
 LIBS+=			${LIBGETOPT}
 
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	ngspice.info
+
 .include "../../devel/libgetopt/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/ng-spice/PLIST b/cad/ng-spice/PLIST
index 552d0b19803..ddbea14fc6b 100644
--- a/cad/ng-spice/PLIST
+++ b/cad/ng-spice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:03 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/27 10:18:55 seb Exp $
 bin/nghelp
 bin/ngmakeidx
 bin/ngmultidec
@@ -6,7 +6,6 @@ bin/ngspice
 bin/ngnutmeg
 bin/ngproc2mod
 bin/ngsconvert
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ngspice.info
 info/ngspice.info
 info/ngspice.info-1
 info/ngspice.info-2
@@ -16,7 +15,6 @@ info/ngspice.info-5
 info/ngspice.info-6
 info/ngspice.info-7
 info/ngspice.info-8
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ngspice.info
 lib/libdev.a
 lib/ng-spice-rework/libasrc.a
 lib/ng-spice-rework/libasrc.la
diff --git a/cad/ng-spice/distinfo b/cad/ng-spice/distinfo
index 79a1649ee0a..d8e30cbe3b2 100644
--- a/cad/ng-spice/distinfo
+++ b/cad/ng-spice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/04/04 01:25:00 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2003/06/27 10:18:55 seb Exp $
 
 SHA1 (ng-spice-rework-14.tar.gz) = 4610d694dc0bacf4828ec480a88b7f89ba1140a0
 Size (ng-spice-rework-14.tar.gz) = 2762582 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = c17bac29ddd4e1a682afc34a1216e795bb77eb74
 SHA1 (patch-ab) = 2537cf3f4afb96c2e79a4a2e4a7053e1def02a01
 SHA1 (patch-ac) = 54d879f5d82b535d4553705d5610e8694353e4cc
 SHA1 (patch-ad) = 5061e4e3366a230600fba9a3f1d44c29bae6b78c
+SHA1 (patch-ae) = 5d800d68b5d90e80193080201ffb8f64b7e69322
diff --git a/cad/ng-spice/patches/patch-ae b/cad/ng-spice/patches/patch-ae
new file mode 100644
index 00000000000..f026615400c
--- /dev/null
+++ b/cad/ng-spice/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.3 2003/06/27 10:18:55 seb Exp $
+
+--- doc/ngspice.info.orig	2001-12-10 20:26:23.000000000 +0000
++++ doc/ngspice.info
+@@ -1,6 +1,13 @@
+ This is ngspice.info, produced by makeinfo version 4.0b from
+ ngspice.texi.
+ 
++INFO-DIR-SECTION Simulation
++START-INFO-DIR-ENTRY
++* Ngspice: (ngspice).            General-purpose circuit simulation program for
++                                 nonlinear dc, nonlinear transient, and linear
++                                 ac analyses
++END-INFO-DIR-ENTRY
++
+    This file documents NGSPICE.
+ 
+    Copyright 1996 The Regents of the University of California.