Convert to USE_NEW_TEXINFO.

Remove now unnecessary patch file.

5 files changed, 5 insertions, 34 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 3105e17a7e3..f3150fc41c6 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2003/07/17 21:49:54 grant Exp $
+# $NetBSD: Makefile,v 1.45 2003/08/03 08:14:46 seb Exp $
 
 DISTNAME=	screen-3.9.15
 CATEGORIES=	misc
@@ -11,9 +11,9 @@ COMMENT=	Multi-screen window manager
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
+USE_NEW_TEXINFO=	YES
 INFO_FILES=		screen.info
 PLIST_SUBST=		DISTNAME=${DISTNAME}
-TEXINFO_OVERRIDE=	YES
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-sys-screenrc=${PKG_SYSCONFDIR}/screenrc
@@ -38,5 +38,4 @@ post-install:
 		/usr/5bin/tic screeninfo.src
 .endif
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/screen/PLIST b/misc/screen/PLIST
index e494667cff0..9436bb250d4 100644
--- a/misc/screen/PLIST
+++ b/misc/screen/PLIST
@@ -1,15 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2003/03/15 16:16:38 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/08/03 08:14:47 seb Exp $
 bin/screen
 bin/${DISTNAME}
 man/man1/screen.1
-@unexec ${INSTALL_INFO} --delete %D/info/screen.info %D/info/dir
 info/screen.info
 info/screen.info-1
 info/screen.info-2
 info/screen.info-3
 info/screen.info-4
 info/screen.info-5
-@exec ${INSTALL_INFO} %D/info/screen.info %D/info/dir
 @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
 share/examples/screen/screenrc
 share/screen/utf8encodings/01
diff --git a/misc/screen/PLIST.SunOS b/misc/screen/PLIST.SunOS
index 1037ba752dc..ce311380150 100644
--- a/misc/screen/PLIST.SunOS
+++ b/misc/screen/PLIST.SunOS
@@ -1,15 +1,13 @@
-@comment $NetBSD: PLIST.SunOS,v 1.8 2003/04/15 00:43:50 grant Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.9 2003/08/03 08:14:47 seb Exp $
 bin/screen
 bin/${DISTNAME}
 man/man1/screen.1
-@unexec ${INSTALL_INFO} --delete %D/info/screen.info %D/info/dir
 info/screen.info
 info/screen.info-1
 info/screen.info-2
 info/screen.info-3
 info/screen.info-4
 info/screen.info-5
-@exec ${INSTALL_INFO} %D/info/screen.info %D/info/dir
 @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
 share/examples/screen/screenrc
 share/lib/terminfo/s/screen
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 5b7d0fe4a3e..b92f1631d62 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2003/03/15 16:16:38 hubertf Exp $
+$NetBSD: distinfo,v 1.12 2003/08/03 08:14:48 seb Exp $
 
 SHA1 (screen-3.9.15.tar.gz) = 6e94b044465613e707abdd4c02bab37d5a1733b5
 Size (screen-3.9.15.tar.gz) = 829248 bytes
 SHA1 (patch-aa) = 57a7800823cf46c42011f7703fd9949bc614736d
-SHA1 (patch-ab) = 97a465b4eefb0ec0cae3cd077f7c880cf46f3355
 SHA1 (patch-ae) = dcdbb1ca08e36308f5659a90a5b6f31fb3a45691
 SHA1 (patch-ai) = a3d2c7d2ef3db9deb7a5e70ed7f906efd3196af6
 SHA1 (patch-aj) = 8aa5c79e483e500ca9b3ed978835bbf1a866a5dc
diff --git a/misc/screen/patches/patch-ab b/misc/screen/patches/patch-ab
deleted file mode 100644
index 0c02b664ffe..00000000000
--- a/misc/screen/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2001/08/18 09:53:02 wiz Exp $
-
---- doc/Makefile.in.orig	Fri May 25 16:50:55 2001
-+++ doc/Makefile.in
-@@ -27,7 +27,7 @@
- 
- info screen.info: screen.texinfo
- 	@rm -f screen.info*
--	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
-+	$(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
- 
- install: installdirs
- 	$(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
-@@ -35,9 +35,6 @@
- 	-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
- 	if test -f $$d/screen.info; then \
- 	for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \
--	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
--	  install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \
--	else true; fi; \
- 	fi
- 
- uninstall: