Convert to USE_NEW_TEXINFO.

5 files changed, 34 insertions, 17 deletions

diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index dcfbc5d4391..1ce921db392 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/06/09 14:05:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/29 12:54:57 seb Exp $
 
 DISTNAME=	gnats-3.113.1
 CATEGORIES=	devel
@@ -14,7 +14,10 @@ USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 USE_GMAKE=	yes
 USE_BISON=	yes
-TEXINFO_OVERRIDE=	YES
+
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=	YES
+INFO_FILES=	gnats.info send-pr.info
 
 CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/share/emacs/site-lisp \
 		--with-full-gnats \
@@ -46,8 +49,5 @@ post-build:
 post-install:
 	(cd ${WRKSRC}/gnats;   ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info)
 	(cd ${WRKSRC}/send-pr; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info)
-	${INSTALL_INFO} ${PREFIX}/info/gnats.info   ${PREFIX}/info/dir
-	${INSTALL_INFO} ${PREFIX}/info/send-pr.info ${PREFIX}/info/dir
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gnats/PLIST b/databases/gnats/PLIST
index a27e01c86de..0909d802842 100644
--- a/databases/gnats/PLIST
+++ b/databases/gnats/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/30 22:14:29 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/06/29 12:54:57 seb Exp $
 bin/edit-pr
 bin/getclose
 bin/install-sid
@@ -7,16 +7,12 @@ bin/nquery-pr
 bin/query-pr
 bin/send-pr
 bin/sub-type
-@unexec ${INSTALL_INFO} --delete %D/info/gnats.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/send-pr.info %D/info/dir
 info/gnats.info
 info/gnats.info-1
 info/gnats.info-2
 info/gnats.info-3
 info/gnats.info-4
 info/send-pr.info
-@exec ${INSTALL_INFO} %D/info/gnats.info %D/info/dir
-@exec ${INSTALL_INFO} %D/info/send-pr.info %D/info/dir
 libexec/gnats/at-pr
 libexec/gnats/check-db
 libexec/gnats/delete-pr
diff --git a/databases/gnats/distinfo b/databases/gnats/distinfo
index 7222d03b675..1736f017bb6 100644
--- a/databases/gnats/distinfo
+++ b/databases/gnats/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/11 11:42:26 martti Exp $
+$NetBSD: distinfo,v 1.2 2003/06/29 12:54:58 seb Exp $
 
 SHA1 (gnats-3.113.1.tar.gz) = ad4dbafae3e643c61dbcacb721a1e11a803c67aa
 Size (gnats-3.113.1.tar.gz) = 1120985 bytes
 SHA1 (patch-aa) = f9fda77cd1d7bd3fc320ce70c258ed199201cd6f
-SHA1 (patch-ab) = 6a4a870fe949f3897405ecf6a514b55d0ba7f8ac
+SHA1 (patch-ab) = 2622209755ad5a23f59c816fc949df9260bd16bf
 SHA1 (patch-ac) = a31e14d97ff797ee1934612091e86da9aed60832
+SHA1 (patch-ad) = 84e99baec317293d902bc684ca49f290c4e1272a
diff --git a/databases/gnats/patches/patch-ab b/databases/gnats/patches/patch-ab
index 719a3007744..734e0becaa1 100644
--- a/databases/gnats/patches/patch-ab
+++ b/databases/gnats/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/10/11 11:42:26 martti Exp $
+$NetBSD: patch-ab,v 1.2 2003/06/29 12:54:58 seb Exp $
 
---- gnats/Makefile.in.orig	Tue Sep 21 16:18:39 1999
-+++ gnats/Makefile.in	Fri Jan 21 10:06:19 2000
-@@ -465,7 +465,7 @@
+--- gnats/Makefile.in.orig	2001-05-08 17:23:36.000000000 +0000
++++ gnats/Makefile.in
+@@ -127,7 +127,6 @@ LIBS = @LIBS@
+ KRBINCLUDE = @KRBINCLUDE@
+ 
+ M4 = @M4@
+-MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ 
+ # Where to find texinfo.tex to format docs with TeX
+@@ -465,7 +464,7 @@ gnats.elc: gnats.el $(srcdir)/../send-pr
  
  getdate.c: getdate.y
  	@echo expect 10 shift/reduce conflicts
@@ -11,7 +19,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/10/11 11:42:26 martti Exp $
  
  config-send-pr:
  	@if [ ! -d ../send-pr ]; then \
-@@ -496,7 +496,7 @@
+@@ -496,7 +495,7 @@ install-tools-arch-indep: all-tools
  	  echo "*** Warning: Must chown $(GNATS_USER) $(datadir)/gnats" ; \
  	fi
  	$(INSTALL_DATA) gnats.el $(lispdir)/gnats.el
diff --git a/databases/gnats/patches/patch-ad b/databases/gnats/patches/patch-ad
new file mode 100644
index 00000000000..a3a2607332c
--- /dev/null
+++ b/databases/gnats/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2003/06/29 12:54:59 seb Exp $
+
+--- send-pr/Makefile.in.orig	2001-05-08 17:22:21.000000000 +0000
++++ send-pr/Makefile.in
+@@ -67,7 +67,6 @@ TEXIDIR = $(srcdir)/../texinfo
+ # Where to find sundry TeX/Texinfo files
+ TEXINPUTS = $(srcdir):$(srcdir)/../gnats:$(srcdir)/../send-pr:$(TEXIDIR)
+ 
+-MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ 
+ INSTALL = @INSTALL@