summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorseb <seb>2002-02-18 15:14:00 +0000
committerseb <seb>2002-02-18 15:14:00 +0000
commit3d0911b16019865b66bd0db4ae4768f4d13d0909 (patch)
treec84409a165bd501342b10b825394cf1eb3684d02 /sysutils
parent41d99a9521443bed0b4de1c8b7469d9717545251 (diff)
downloadpkgsrc-3d0911b16019865b66bd0db4ae4768f4d13d0909.tar.gz
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.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/fileutils/Makefile4
-rw-r--r--sysutils/fileutils/PLIST6
-rw-r--r--sysutils/findutils/Makefile4
-rw-r--r--sysutils/findutils/PLIST6
-rw-r--r--sysutils/mtools/Makefile4
-rw-r--r--sysutils/mtools/PLIST6
-rw-r--r--sysutils/sh-utils/Makefile4
-rw-r--r--sysutils/sh-utils/PLIST6
-rw-r--r--sysutils/stow/Makefile3
-rw-r--r--sysutils/stow/PLIST6
-rw-r--r--sysutils/vcdimager/Makefile4
-rw-r--r--sysutils/vcdimager/PLIST6
12 files changed, 31 insertions, 28 deletions
diff --git a/sysutils/fileutils/Makefile b/sysutils/fileutils/Makefile
index dfc1fd8884d..a641dc81959 100644
--- a/sysutils/fileutils/Makefile
+++ b/sysutils/fileutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/12/22 08:49:58 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:40 seb Exp $
DISTNAME= fileutils-4.0
CATEGORIES= sysutils
@@ -8,9 +8,9 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/fileutils/fileutils.html
COMMENT= GNU file management utilities
-USE_GTEXINFO= yes
NO_PATCH= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --program-prefix=g
+.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fileutils/PLIST b/sysutils/fileutils/PLIST
index 6dc615d1f43..1a59c876687 100644
--- a/sysutils/fileutils/PLIST
+++ b/sysutils/fileutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:06 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:41 seb Exp $
bin/gchgrp
bin/gchown
bin/gchmod
@@ -20,9 +20,9 @@ bin/grmdir
bin/gsync
bin/gtouch
bin/gdf
-@unexec install-info --delete %D/info/fileutils.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/fileutils.info %D/info/dir
info/fileutils.info
-@exec install-info %D/info/fileutils.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/fileutils.info %D/info/dir
man/man1/grmdir.1
man/man1/gdircolors.1
man/man1/gln.1
diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile
index a68ae6101c8..a32a63a4b50 100644
--- a/sysutils/findutils/Makefile
+++ b/sysutils/findutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:42:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:41 seb Exp $
# FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
DISTNAME= findutils-4.1
@@ -9,10 +9,10 @@ MAINTAINER= bouyer@netbsd.org
HOMEPAGE= http://www.gnu.org/software/findutils/findutils.html
COMMENT= The GNU find, xargs and locate utilities
-USE_GTEXINFO= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --program-prefix=g
INFO_FILES= find.info
+.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/findutils/PLIST b/sysutils/findutils/PLIST
index 120f74ae943..f739ebabd8f 100644
--- a/sysutils/findutils/PLIST
+++ b/sysutils/findutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:07 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:41 seb Exp $
bin/gfind
bin/gxargs
bin/glocate
@@ -6,11 +6,11 @@ bin/gupdatedb
libexec/gfrcode
libexec/gcode
libexec/gbigram
-@unexec install-info --delete %D/info/find.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/find.info %D/info/dir
info/find.info
info/find.info-1
info/find.info-2
-@exec install-info %D/info/find.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/find.info %D/info/dir
man/cat1/gfind.1
man/cat1/gxargs.1
man/cat1/glocate.1
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index 4f3bbc18d88..61eb69a6b35 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/11/29 01:12:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.26 2002/02/18 15:14:41 seb Exp $
#
DISTNAME= mtools-3.9.7
@@ -15,6 +15,7 @@ NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64 # LP64 problem
GNU_CONFIGURE= yes
USE_GMAKE= yes
INFO_FILES= mtools.info
+TEXINFO_OVERRIDE= YES
.include "../../mk/bsd.prefs.mk"
@@ -41,4 +42,5 @@ post-install:
${GREP} -v /floppyd ${PKGDIR}/PLIST >${PLIST_SRC}
.endif
+.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mtools/PLIST b/sysutils/mtools/PLIST
index 9b24bb3005f..9cf16658443 100644
--- a/sysutils/mtools/PLIST
+++ b/sysutils/mtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:34 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:41 seb Exp $
bin/floppyd
bin/floppyd_installtest
bin/lz
@@ -32,9 +32,9 @@ bin/mxtar
bin/mzip
bin/tgz
bin/uz
-@unexec install-info --delete --info-dir=%D/info %D/info/mtools.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mtools.info
info/mtools.info
-@exec install-info --info-dir=%D/info %D/info/mtools.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mtools.info
man/man1/floppyd.1
man/man1/mattrib.1
man/man1/mbadblocks.1
diff --git a/sysutils/sh-utils/Makefile b/sysutils/sh-utils/Makefile
index 0a0099a2355..ed68d4e0d40 100644
--- a/sysutils/sh-utils/Makefile
+++ b/sysutils/sh-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/02/07 10:52:11 seb Exp $
+# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:41 seb Exp $
DISTNAME= sh-utils-2.0
PKGREVISION= 1
@@ -12,10 +12,10 @@ COMMENT= GNU shell utilities
BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5
USE_GMAKE= YES
-USE_GTEXINFO= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --program-prefix=g
CONFIGURE_ARGS+= --program-transform-name='s,^gid,gnuid,'
CONFIGURE_ENV+= ac_cv_func_uname=no
+.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sh-utils/PLIST b/sysutils/sh-utils/PLIST
index 23bb55089ae..b66cb0348e3 100644
--- a/sysutils/sh-utils/PLIST
+++ b/sysutils/sh-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/07 10:52:11 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:41 seb Exp $
bin/gbasename
bin/gchroot
bin/gdate
@@ -31,9 +31,9 @@ bin/gusers
bin/gwho
bin/gwhoami
bin/gyes
-@unexec install-info --delete %D/info/sh-utils.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/sh-utils.info %D/info/dir
info/sh-utils.info
-@exec install-info %D/info/sh-utils.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/sh-utils.info %D/info/dir
man/man1/gbasename.1
man/man1/gchroot.1
man/man1/gdate.1
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
index ecca98fb346..19a64cc600c 100644
--- a/sysutils/stow/Makefile
+++ b/sysutils/stow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/30 17:33:31 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:41 seb Exp $
#
DISTNAME= stow-1.3.2
@@ -15,4 +15,5 @@ GNU_CONFIGURE= YES
INFO_FILES= stow.info
.include "../../lang/perl5/buildlink.mk"
+.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/stow/PLIST b/sysutils/stow/PLIST
index cf316732029..d29485786bb 100644
--- a/sysutils/stow/PLIST
+++ b/sysutils/stow/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:50 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:42 seb Exp $
bin/stow
-@unexec install-info --delete %D/info/stow.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/stow.info %D/info/dir
info/stow.info
-@exec install-info %D/info/stow.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/stow.info %D/info/dir
diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile
index b4aaf651b40..0c7f6f35143 100644
--- a/sysutils/vcdimager/Makefile
+++ b/sysutils/vcdimager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/25 19:51:55 magick Exp $
+# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:42 seb Exp $
#
DISTNAME= vcdimager-0.6.2
@@ -10,9 +10,9 @@ HOMEPAGE= http://www.gnu.org/software/vcdimager/
COMMENT= mastering suite for Video CDs
USE_BUILDLINK_ONLY= YES
-#USE_GTEXINFO= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vcdimager/PLIST b/sysutils/vcdimager/PLIST
index a230aba16d0..1a223111895 100644
--- a/sysutils/vcdimager/PLIST
+++ b/sysutils/vcdimager/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:42 seb Exp $
bin/vcdimager
bin/vcdrip
-@unexec install-info --delete --info-dir=%D/info %D/info/vcdimager.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/vcdimager.info
info/vcdimager.info
-@exec install-info --info-dir=%D/info %D/info/vcdimager.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/vcdimager.info
man/man1/vcdimager.1
man/man1/vcdrip.1