summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorseb <seb>2002-02-18 15:14:00 +0000
committerseb <seb>2002-02-18 15:14:00 +0000
commit94736fef3d3bc180c38e89ad3b9fc89d91756057 (patch)
treec84409a165bd501342b10b825394cf1eb3684d02 /misc
parentd1274f983b9d5510a39b04e8946f0ba1dc328035 (diff)
downloadpkgsrc-94736fef3d3bc180c38e89ad3b9fc89d91756057.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 'misc')
-rw-r--r--misc/git/Makefile3
-rw-r--r--misc/git/PLIST6
-rw-r--r--misc/pinfo/Makefile3
-rw-r--r--misc/pinfo/PLIST6
-rw-r--r--misc/screen/Makefile4
-rw-r--r--misc/screen/PLIST6
-rw-r--r--misc/screen/PLIST.SunOS6
-rw-r--r--misc/vera/Makefile8
-rw-r--r--misc/vera/PLIST6
9 files changed, 25 insertions, 23 deletions
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 6d015aa5104..18e43a4d573 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/02/25 04:18:02 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 2002/02/18 15:14:33 seb Exp $
# FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp
#
@@ -23,4 +23,5 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc
${MV} ${PREFIX}/lib/git/html ${PREFIX}/share/doc/git
+.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/git/PLIST b/misc/git/PLIST
index 29ac820b7b6..7907fc8435f 100644
--- a/misc/git/PLIST
+++ b/misc/git/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:05 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:33 seb Exp $
bin/git
bin/gitps
bin/gitview
@@ -13,12 +13,12 @@ bin/gitregrep
bin/gitrfgrep
bin/gitunpack
bin/gitmkdirs
-@unexec install-info --delete %D/info/git.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/git.info %D/info/dir
info/git.info
info/git.info-1
info/git.info-2
info/git.info-3
-@exec install-info %D/info/git.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/git.info %D/info/dir
lib/git/term/.gitrc.aixterm
lib/git/term/.gitrc.ansi
lib/git/term/.gitrc.common
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 56ef39f5438..d80cd01ca10 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/07/02 23:06:55 fredb Exp $
+# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:34 seb Exp $
#
DISTNAME= pinfo-0.6.1
@@ -28,4 +28,5 @@ DEPENDS+= ncurses>=5.0:../../devel/ncurses
CONFIGURE_ARGS+= --with-ncurses=${LOCALBASE}
.endif
+.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/pinfo/PLIST b/misc/pinfo/PLIST
index d158cd108ca..da9258b3f6e 100644
--- a/misc/pinfo/PLIST
+++ b/misc/pinfo/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:14 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:34 seb Exp $
bin/pinfo
-@unexec install-info --delete %D/info/pinfo.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/pinfo.info %D/info/dir
info/pinfo.info
-@exec install-info %D/info/pinfo.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/pinfo.info %D/info/dir
man/man1/pinfo.1
share/locale/cs/LC_MESSAGES/pinfo.mo
share/locale/de/LC_MESSAGES/pinfo.mo
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
diff --git a/misc/vera/Makefile b/misc/vera/Makefile
index 6b0c7f316f0..cb4d43da364 100644
--- a/misc/vera/Makefile
+++ b/misc/vera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/26 09:56:10 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:34 seb Exp $
# FreeBSD Id: ports/misc/vera/Makefile,v 1.7 2000/11/13 12:44:18 demon Exp
DISTNAME= vera-1.6
@@ -10,12 +10,10 @@ HOMEPAGE= http://userpage.fu-berlin.de/~oheiabbd/vera-e.html
COMMENT= Virtual Entity of Relevant Acronyms
do-build:
- cd ${WRKSRC} && makeinfo vera.texi
+ cd ${WRKSRC} && ${MAKEINFO} vera.texi
do-install:
${INSTALL_DATA} ${WRKSRC}/vera.info* ${PREFIX}/info
-post-install:
- install-info ${PREFIX}/info/vera.info ${PREFIX}/info/dir
-
+.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/vera/PLIST b/misc/vera/PLIST
index 52e8f01c089..b59694b806c 100644
--- a/misc/vera/PLIST
+++ b/misc/vera/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:48 zuntum Exp $
-@unexec install-info --delete %D/info/vera.info %D/info/dir
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:34 seb Exp $
+@unexec ${INSTALL_INFO} --delete %D/info/vera.info %D/info/dir
info/vera.info
info/vera.info-1
info/vera.info-2
@@ -12,4 +12,4 @@ info/vera.info-8
info/vera.info-9
info/vera.info-10
info/vera.info-11
-@exec install-info %D/info/vera.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/vera.info %D/info/dir