From 94736fef3d3bc180c38e89ad3b9fc89d91756057 Mon Sep 17 00:00:00 2001
From: seb <seb>
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.
---
 comms/mgetty+sendfax/Makefile         |  3 ++-
 comms/mgetty+sendfax/PLIST            |  6 +++---
 comms/mgetty+sendfax/distinfo         |  4 ++--
 comms/mgetty+sendfax/patches/patch-ad | 15 ++++++++++++---
 4 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'comms/mgetty+sendfax')

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index a6a639b78c5..9ede4d012b1 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/26 14:10:00 agc Exp $
+# $NetBSD: Makefile,v 1.19 2002/02/18 15:14:04 seb Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
 #
 
@@ -44,4 +44,5 @@ post-install:
 	    ${PAX} -r -w -pe -k * ${MGETTY_CONFDIR}
 
 .include "../../graphics/netpbm/buildlink.mk"
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/mgetty+sendfax/PLIST b/comms/mgetty+sendfax/PLIST
index ac47645a0df..bb0ece736aa 100644
--- a/comms/mgetty+sendfax/PLIST
+++ b/comms/mgetty+sendfax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:20 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:04 seb Exp $
 bin/autopvf
 bin/basictopvf
 bin/faxspool
@@ -33,13 +33,13 @@ bin/rmdtopvf
 bin/vm
 bin/voctopvf
 bin/wavtopvf
-@unexec install-info --delete %D/info/mgetty.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/mgetty.info %D/info/dir
 info/mgetty.info
 info/mgetty.info-1
 info/mgetty.info-2
 info/mgetty.info-3
 info/mgetty.info-4
-@exec install-info %D/info/mgetty.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/mgetty.info %D/info/dir
 lib/mgetty+sendfax/cour25.pbm
 lib/mgetty+sendfax/cour25n.pbm
 man/man1/g3cat.1
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index b0cea2047c1..39218f15b84 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2001/06/21 17:02:23 fredb Exp $
+$NetBSD: distinfo,v 1.4 2002/02/18 15:14:04 seb Exp $
 
 SHA1 (mgetty1.1.26-Apr16.tar.gz) = c36926dad8849f14e617f207cb7729f8e4c7f089
 Size (mgetty1.1.26-Apr16.tar.gz) = 948245 bytes
 SHA1 (patch-aa) = 249ec3d2425d359a5d89241978ff9ac6122d0eb6
 SHA1 (patch-ab) = ca2ff2961b045b66a3aedf692ce83e8fc6ecdd09
 SHA1 (patch-ac) = f37ba8521f18957931f5180c8c90f3ec0b6a707f
-SHA1 (patch-ad) = c31a50209e83d9082cd4a026c0d3e1517d96a336
+SHA1 (patch-ad) = a4ae1d528791ff532c8e8f0dcdf9eda9df790b33
 SHA1 (patch-ae) = bf1dde04e3c3ae0b0683481cf1bd2e590d1dddd8
 SHA1 (patch-af) = 418e87beca4f3a52ae0c6f7e337d119f86766d6c
 SHA1 (patch-ag) = 943aa837a285663ff6cf5ab07c3f908f499c2074
diff --git a/comms/mgetty+sendfax/patches/patch-ad b/comms/mgetty+sendfax/patches/patch-ad
index bb9f1798baa..edb09012b50 100644
--- a/comms/mgetty+sendfax/patches/patch-ad
+++ b/comms/mgetty+sendfax/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 1998/11/15 20:45:30 tron Exp $
+$NetBSD: patch-ad,v 1.3 2002/02/18 15:14:04 seb Exp $
 
---- doc/Makefile.orig	Fri Nov 28 04:33:26 1997
-+++ doc/Makefile	Mon Dec 29 22:31:59 1997
+--- doc/Makefile.orig	Thu Nov 27 21:33:26 1997
++++ doc/Makefile
 @@ -26,7 +26,7 @@
  
  all:
@@ -11,3 +11,12 @@ $NetBSD: patch-ad,v 1.2 1998/11/15 20:45:30 tron Exp $
  
  manpages: $(MANSRC)
  
+@@ -43,7 +43,7 @@
+ 	-texi2html -verbose mgetty.texi
+ 
+ mgetty.info: mgetty.texi
+-	-makeinfo mgetty.texi
++	-${MAKEINFO} mgetty.texi
+ 
+ mgetty.ps: mgetty.dvi
+ 	-dvips -o mgetty.ps mgetty.dvi
-- 
cgit v1.2.3