Convert to USE_NEW_TEXINFO.

Fix the Info directory file entry and provide patches for both the
.texi and the .info file so USE_MAKEINFO is not needed.

5 files changed, 33 insertions, 7 deletions

diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index 5bd888955a1..3aab124ed14 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/06/05 05:01:54 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/29 13:11:19 seb Exp $
 #
 
 DISTNAME=	guile-pg-0.07
@@ -19,9 +19,9 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-libpq-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
 
-#INFO_FILES=	guile-pg.info
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	guile-pg.info
 
 .include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../lang/guile14/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/guile-pg/PLIST b/databases/guile-pg/PLIST
index c3213a3d1f5..37c68e41937 100644
--- a/databases/guile-pg/PLIST
+++ b/databases/guile-pg/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/27 01:14:09 cjones Exp $
-@unexec ${INSTALL_INFO} --delete %D/info/guile-pg.info %D/info/dir
+@comment $NetBSD: PLIST,v 1.2 2003/06/29 13:11:19 seb Exp $
 share/guile/database/postgres.scm
 @dirrm share/guile/database
 info/guile-pg.info
@@ -7,4 +6,3 @@ lib/libpostgres.a
 lib/libpostgres.la
 lib/libpostgres.so.2.0
 bin/guile-pg
-@exec ${INSTALL_INFO} %D/info/guile-pg.info %D/info/dir
diff --git a/databases/guile-pg/distinfo b/databases/guile-pg/distinfo
index dd30082dbf6..12cb98dd236 100644
--- a/databases/guile-pg/distinfo
+++ b/databases/guile-pg/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/27 01:14:09 cjones Exp $
+$NetBSD: distinfo,v 1.2 2003/06/29 13:11:20 seb Exp $
 
 SHA1 (guile-pg-0.07.tar.gz) = f232cd752a5640af222de5016d57cc192219091e
 Size (guile-pg-0.07.tar.gz) = 212233 bytes
 SHA1 (patch-aa) = 025a6d3eec84e972f259fb979ae26a42fea1aced
 SHA1 (patch-ab) = 49b7c64f2f8eeb24ae75dd85c627e59327b6db08
 SHA1 (patch-ac) = 90f1dd2d86d532d4b847c4c85e9f54e0d909cef6
+SHA1 (patch-ad) = 056a914c8f35630fdd9546447bbf6c3c2bf138ca
+SHA1 (patch-ae) = 85745986f5438619e4748e72ba772f0eb1b251dd
diff --git a/databases/guile-pg/patches/patch-ad b/databases/guile-pg/patches/patch-ad
new file mode 100644
index 00000000000..862f1cdef57
--- /dev/null
+++ b/databases/guile-pg/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/06/29 13:11:21 seb Exp $
+
+--- doc/guile-pg.texi.orig	2000-07-01 08:28:56.000000000 +0000
++++ doc/guile-pg.texi
+@@ -9,7 +9,7 @@
+ 
+ @dircategory Guile modules
+ @direntry
+-* Guile-pg- (guile-pg).           Access to PostgreSQL databases from Guile.
++* Guile-pg: (guile-pg).           Access to PostgreSQL databases from Guile.
+ @end direntry
+ 
+ @ifinfo
diff --git a/databases/guile-pg/patches/patch-ae b/databases/guile-pg/patches/patch-ae
new file mode 100644
index 00000000000..0072c27b27c
--- /dev/null
+++ b/databases/guile-pg/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/06/29 13:11:21 seb Exp $
+
+--- doc/guile-pg.info.orig	2000-07-08 08:52:29.000000000 +0000
++++ doc/guile-pg.info
+@@ -5,7 +5,7 @@ guile-pg.texi.
+ 
+ INFO-DIR-SECTION Guile modules
+ START-INFO-DIR-ENTRY
+-* Guile-pg- (guile-pg).           Access to PostgreSQL databases from Guile.
++* Guile-pg: (guile-pg).           Access to PostgreSQL databases from Guile.
+ END-INFO-DIR-ENTRY
+ 
+    This file is the Guile-pg Command Reference