diff options
author | seb <seb@pkgsrc.org> | 2002-02-18 15:14:00 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2002-02-18 15:14:00 +0000 |
commit | 66111c6d15be91debc28f649061f5ed03d48e340 (patch) | |
tree | c84409a165bd501342b10b825394cf1eb3684d02 /games | |
parent | 0b7fe93445e5b9c2ed4f512cd83d2c904922531b (diff) | |
download | pkgsrc-66111c6d15be91debc28f649061f5ed03d48e340.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 'games')
-rw-r--r-- | games/gnugo/Makefile | 4 | ||||
-rw-r--r-- | games/gnugo/PLIST | 6 | ||||
-rw-r--r-- | games/xboard/Makefile | 3 | ||||
-rw-r--r-- | games/xboard/PLIST | 6 | ||||
-rw-r--r-- | games/xboard/distinfo | 4 | ||||
-rw-r--r-- | games/xboard/patches/patch-aa | 13 | ||||
-rw-r--r-- | games/xconq/Makefile | 4 | ||||
-rw-r--r-- | games/xconq/PLIST | 14 |
8 files changed, 30 insertions, 24 deletions
diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile index 557be2e2618..88d45cef08c 100644 --- a/games/gnugo/Makefile +++ b/games/gnugo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:51 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:19 seb Exp $ DISTNAME= gnugo-2.6 CATEGORIES= games @@ -10,6 +10,6 @@ COMMENT= Go playing program GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GTEXINFO= yes +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/gnugo/PLIST b/games/gnugo/PLIST index e33d0837f5d..35726d3a58d 100644 --- a/games/gnugo/PLIST +++ b/games/gnugo/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:53:05 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:19 seb Exp $ bin/gnugo -@unexec install-info --delete %D/info/gnugo.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gnugo.info %D/info/dir info/gnugo.info info/gnugo.info-1 info/gnugo.info-2 info/gnugo.info-3 info/gnugo.info-4 info/gnugo.info-5 -@exec install-info %D/info/gnugo.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gnugo.info %D/info/dir man/man6/gnugo.6 diff --git a/games/xboard/Makefile b/games/xboard/Makefile index d8b045423cc..7fbde314028 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/11/29 13:27:46 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:19 seb Exp $ DISTNAME= xboard-4.2.3 CATEGORIES= games @@ -25,4 +25,5 @@ CONFIGURE_ARGS+= --with-Xaw3d .include "../../graphics/xpm/buildlink.mk" .include "../../mk/xaw.buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xboard/PLIST b/games/xboard/PLIST index 00f6a8a5ee5..bfabae33fdd 100644 --- a/games/xboard/PLIST +++ b/games/xboard/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:56:17 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:19 seb Exp $ bin/cmail bin/pxboard bin/xboard bin/zic2xpm -@unexec install-info --delete %D/info/xboard.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/xboard.info %D/info/dir info/xboard.info -@exec install-info %D/info/xboard.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/xboard.info %D/info/dir man/man6/cmail.6 man/man6/xboard.6 man/man6/zic2xpm.6 diff --git a/games/xboard/distinfo b/games/xboard/distinfo index 6821d538d45..40aef292e9d 100644 --- a/games/xboard/distinfo +++ b/games/xboard/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:37 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:19 seb Exp $ SHA1 (xboard-4.2.3.tar.gz) = 772c5108af79b54a94b12945426486f0e7700230 Size (xboard-4.2.3.tar.gz) = 1100059 bytes -SHA1 (patch-aa) = fb4fd5f625c071524fb750ca9ef11a8fbe9caf67 +SHA1 (patch-aa) = 02f5315dd2e817340e3caee2832c012d42601fb8 diff --git a/games/xboard/patches/patch-aa b/games/xboard/patches/patch-aa index 2d903abf8f8..b29b0a49f98 100644 --- a/games/xboard/patches/patch-aa +++ b/games/xboard/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2001/02/07 06:11:24 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2002/02/18 15:14:19 seb Exp $ ---- Makefile.in.orig Sat Dec 16 21:24:38 2000 +--- Makefile.in.orig Tue Feb 20 05:02:22 2001 +++ Makefile.in -@@ -63,14 +63,14 @@ +@@ -63,16 +63,15 @@ install: installdirs xboard zic2xpm cmail pxboard xboard.man cmail.man \ zic2xpm.man @@ -14,6 +14,8 @@ $NetBSD: patch-aa,v 1.5 2001/02/07 06:11:24 jlam Exp $ - $(INSTALL_DATA) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext) - $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext) - $(INSTALL_DATA) xboard.info $(infodir)/xboard.info +- -PATH=$$PATH:/sbin:/usr/sbin install-info \ +- $(infodir)/xboard.info $(infodir)/dir + $(BSD_INSTALL_PROGRAM) xboard $(bindir)/xboard + $(BSD_INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm + $(BSD_INSTALL_SCRIPT) cmail $(bindir)/cmail @@ -22,6 +24,7 @@ $NetBSD: patch-aa,v 1.5 2001/02/07 06:11:24 jlam Exp $ + $(BSD_INSTALL_MAN) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext) + $(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext) + $(BSD_INSTALL_DATA) xboard.info $(infodir)/xboard.info - -PATH=$$PATH:/sbin:/usr/sbin install-info \ - $(infodir)/xboard.info $(infodir)/dir ++ $(INSTALL_INFO) $(infodir)/xboard.info $(infodir)/dir + installdirs: mkinstalldirs + $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir) diff --git a/games/xconq/Makefile b/games/xconq/Makefile index d59e0d229d4..f58ee0203cd 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/24 22:10:58 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/02/18 15:14:19 seb Exp $ DISTNAME= xconq-7.4.1 CATEGORIES= games x11 @@ -19,6 +19,7 @@ CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_DIR}/lib" MAKE_ENV+= LOCALBASE="${LOCALBASE}" INFO_FILES= hacking.info xcdesign.info xconq.info +TEXINFO_OVERRIDE= YES post-build: cd ${WRKSRC}/doc && ${MAKE_PROGRAM} info @@ -28,4 +29,5 @@ post-install: .include "../../x11/tk/buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xconq/PLIST b/games/xconq/PLIST index b854a0b708e..6af5b1cb96b 100644 --- a/games/xconq/PLIST +++ b/games/xconq/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:56:30 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:19 seb Exp $ bin/imf2x bin/x2imf bin/xconq bin/ximfapp -@unexec install-info --delete %D/info/hacking.info %D/info/dir -@unexec install-info --delete %D/info/xcdesign.info %D/info/dir -@unexec install-info --delete %D/info/xconq.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/hacking.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/xcdesign.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/xconq.info %D/info/dir info/hacking.info info/xcdesign.info info/xcdesign.info-1 @@ -28,9 +28,9 @@ info/xconq.info-3 info/xconq.info-4 info/xconq.info-5 info/xconq.info-6 -@exec install-info %D/info/hacking.info %D/info/dir -@exec install-info %D/info/xcdesign.info %D/info/dir -@exec install-info %D/info/xconq.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/hacking.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/xcdesign.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/xconq.info %D/info/dir man/man6/xconq.6 share/xconq/images/advt24x26.gif share/xconq/images/advt32x32.gif |