From 66111c6d15be91debc28f649061f5ed03d48e340 Mon Sep 17 00:00:00 2001
From: seb <seb@pkgsrc.org>
Date: Mon, 18 Feb 2002 15:14:00 +0000
Subject: Introduce new framework for handling info files generation and
 installation.

Summary of changes:
- removal of USE_GTEXINFO
- addition of mk/texinfo.mk
- inclusion of this file in package Makefiles requiring it
- `install-info' substituted by `${INSTALL_INFO}' in PLISTs
- tuning of mk/bsd.pkg.mk:
    removal of USE_GTEXINFO
    INSTALL_INFO added to PLIST_SUBST
    `${INSTALL_INFO}' replace `install-info' in target rules
    print-PLIST target now generate `${INSTALL_INFO}' instead of `install-info'
- a couple of new patch files added for a handful of packages
- setting of the TEXINFO_OVERRIDE "switch" in packages Makefiles requiring it
- devel/cssc marked requiring texinfo 4.0
- a couple of packages Makefiles were tuned with respect of INFO_FILES and
  makeinfo command usage

See -newly added by this commit- section 10.24 of Packages.txt for
further information.
---
 misc/screen/Makefile    | 4 +++-
 misc/screen/PLIST       | 6 +++---
 misc/screen/PLIST.SunOS | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'misc/screen')

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 5ac623dbaec..caec8b98526 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/02/16 11:18:34 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2002/02/18 15:14:34 seb Exp $
 #
 
 DISTNAME=	screen-3.9.11
@@ -14,6 +14,7 @@ GNU_CONFIGURE=		yes
 INFO_FILES=		screen.info
 PLIST_SUBST=		DISTNAME=${DISTNAME}
 USE_BUILDLINK_ONLY=	yes
+TEXINFO_OVERRIDE=	YES
 
 .include "../../mk/bsd.prefs.mk"
 .if (${OPSYS} == SunOS)
@@ -29,4 +30,5 @@ 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 f3a98adb7ab..0c931f14191 100644
--- a/misc/screen/PLIST
+++ b/misc/screen/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/16 11:18:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:34 seb Exp $
 bin/screen
 bin/${DISTNAME}
 man/man1/screen.1
-@unexec install-info --delete %D/info/screen.info %D/info/dir
+@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
+@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 acd2e8d0a0c..64dee5d196d 100644
--- a/misc/screen/PLIST.SunOS
+++ b/misc/screen/PLIST.SunOS
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2002/02/18 11:09:47 seb Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.5 2002/02/18 15:14:34 seb Exp $
 bin/screen
 bin/${DISTNAME}
 man/man1/screen.1
-@unexec install-info --delete %D/info/screen.info %D/info/dir
+@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
+@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
-- 
cgit v1.2.3