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.
---
 wm/sawfish/Makefile        | 3 ++-
 wm/sawfish/Makefile.common | 3 ++-
 wm/sawfish/PLIST           | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'wm/sawfish')

diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 5758013d422..b9661a9fb77 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/26 20:19:49 tron Exp $
+# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:44 seb Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
@@ -11,6 +11,7 @@ USE_X11BASE=		# defined
 
 CONFIGURE_ENV+=		LOCALEDIR=${LOCALEDIR}
 MAKE_ENV+=		LOCALEDIR=${LOCALEDIR}
+TEXINFO_OVERRIDE=	YES
 
 PLIST_SUBST+=		SF_VERS=${SF_VERS}
 
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index 0951ab8b033..1be4359718d 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2001/10/22 02:34:38 mycroft Exp $
+# $NetBSD: Makefile.common,v 1.6 2002/02/18 15:14:44 seb Exp $
 
 DISTNAME=		sawfish-${SF_VERS}
 SF_VERS=		1.0.1
@@ -21,4 +21,5 @@ GNU_CONFIGURE=		# defined
 FILESDIR=		${.CURDIR}/../../wm/sawfish/files
 PATCHDIR=		${.CURDIR}/../../wm/sawfish/patches
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST
index c6446cd709d..bafd146e4f6 100644
--- a/wm/sawfish/PLIST
+++ b/wm/sawfish/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:44 seb Exp $
 bin/sawfish
 bin/sawfish-capplet
 bin/sawfish-client
 bin/sawfish-themer
 bin/sawfish-ui
-@unexec install-info --delete --info-dir=%D/info %D/info/sawfish.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/sawfish.info
 info/sawfish.info
 info/sawfish.info-1
 info/sawfish.info-2
 info/sawfish.info-3
 info/sawfish.info-4
 info/sawfish.info-5
-@exec install-info --info-dir=%D/info %D/info/sawfish.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/sawfish.info
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/DOC
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.la
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.a
-- 
cgit v1.2.3