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 /mail | |
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 'mail')
-rw-r--r-- | mail/mailcrypt/Makefile | 3 | ||||
-rw-r--r-- | mail/mailcrypt/PLIST | 6 | ||||
-rw-r--r-- | mail/mew/Makefile | 3 | ||||
-rw-r--r-- | mail/mew/PLIST | 6 | ||||
-rw-r--r-- | mail/vm/Makefile | 3 | ||||
-rw-r--r-- | mail/vm/PLIST.emacs | 6 | ||||
-rw-r--r-- | mail/vm/distinfo | 4 | ||||
-rw-r--r-- | mail/vm/patches/patch-aa | 8 | ||||
-rw-r--r-- | mail/wl/Makefile | 3 |
9 files changed, 23 insertions, 19 deletions
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile index 5b62237560d..91d01daab02 100644 --- a/mail/mailcrypt/Makefile +++ b/mail/mailcrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/07/23 19:52:29 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:27 seb Exp $ # FreeBSD Id: ports/mail/mailcrypt/Makefile,v 1.7 2000/05/14 05:21:52 billf Exp DISTNAME= mailcrypt-3.5.6 @@ -13,4 +13,5 @@ BUILD_DEPENDS= emacs>=19.34:../../editors/emacs GNU_CONFIGURE= yes +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mailcrypt/PLIST b/mail/mailcrypt/PLIST index c4feaf6b91e..0eef222c836 100644 --- a/mail/mailcrypt/PLIST +++ b/mail/mailcrypt/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:21 zuntum Exp $ -@unexec install-info --delete %D/info/mailcrypt.info %D/info/dir +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:27 seb Exp $ +@unexec ${INSTALL_INFO} --delete %D/info/mailcrypt.info %D/info/dir info/mailcrypt.info info/mailcrypt.info-1 info/mailcrypt.info-2 -@exec install-info %D/info/mailcrypt.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/mailcrypt.info %D/info/dir share/emacs/site-lisp/expect.el share/emacs/site-lisp/expect.elc share/emacs/site-lisp/mailcrypt.el diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 780ba4bd52c..09897e2bf62 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2001/12/10 09:45:35 jun Exp $ +# $NetBSD: Makefile,v 1.45 2002/02/18 15:14:28 seb Exp $ DISTNAME= mew-2.1.51 CATEGORIES= mail @@ -33,4 +33,5 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/contrib/$f ${PREFIX}/bin .endfor +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mew/PLIST b/mail/mew/PLIST index 84070bf1b29..5493cd9ba5e 100644 --- a/mail/mew/PLIST +++ b/mail/mew/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:33 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:28 seb Exp $ bin/incdir bin/incmbox bin/mewcat @@ -6,12 +6,12 @@ bin/mewdecode bin/mewencode bin/mewinc bin/mewls -@unexec install-info --delete --info-dir=%D/info %D/info/mew.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mew.info info/mew.info info/mew.info-1 info/mew.info-2 info/mew.info-3 -@exec install-info --info-dir=%D/info %D/info/mew.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mew.info lib/emacs/etc/Mew/Mew.img lib/emacs/etc/Mew/Mew.png lib/emacs/etc/Mew/Mew.xbm diff --git a/mail/vm/Makefile b/mail/vm/Makefile index 75af5e35548..e95eae10827 100644 --- a/mail/vm/Makefile +++ b/mail/vm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/02/07 14:50:19 seb Exp $ +# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:28 seb Exp $ DISTNAME= vm-7.00 CATEGORIES= mail @@ -47,4 +47,5 @@ do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode \ base64-decode base64-encode ${BINDIR} +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/vm/PLIST.emacs b/mail/vm/PLIST.emacs index 073c52a1036..aefd396d770 100644 --- a/mail/vm/PLIST.emacs +++ b/mail/vm/PLIST.emacs @@ -1,15 +1,15 @@ -@comment $NetBSD: PLIST.emacs,v 1.3 2002/02/15 10:12:49 skrll Exp $ +@comment $NetBSD: PLIST.emacs,v 1.4 2002/02/18 15:14:28 seb Exp $ bin/base64-decode bin/base64-encode bin/qp-decode bin/qp-encode -@unexec install-info --delete --info-dir=%D/info %D/info/vm.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/vm.info info/vm.info info/vm.info-1 info/vm.info-2 info/vm.info-3 info/vm.info-4 -@exec install-info --info-dir=%D/info %D/info/vm.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/vm.info share/emacs/site-lisp/vm/pixmaps/audio_stamp-colorful.xpm share/emacs/site-lisp/vm/pixmaps/audio_stamp-simple.xpm share/emacs/site-lisp/vm/pixmaps/autofile-dn.xbm diff --git a/mail/vm/distinfo b/mail/vm/distinfo index c29590c33fe..df45c15a502 100644 --- a/mail/vm/distinfo +++ b/mail/vm/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2001/12/11 15:49:26 wiz Exp $ +$NetBSD: distinfo,v 1.6 2002/02/18 15:14:28 seb Exp $ SHA1 (vm-7.00.tar.gz) = 855e7020d9033ecc5a13c9a209b5d58cfa49ebbb Size (vm-7.00.tar.gz) = 361595 bytes -SHA1 (patch-aa) = 91e0d6f87091138d0f0922653706dddfa44c5ba6 +SHA1 (patch-aa) = dfec118e2c67fc90ca9373d9db56cbf91206dbdd diff --git a/mail/vm/patches/patch-aa b/mail/vm/patches/patch-aa index c61f721654a..95eb703661c 100644 --- a/mail/vm/patches/patch-aa +++ b/mail/vm/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2001/01/28 03:16:55 jtb Exp $ +$NetBSD: patch-aa,v 1.4 2002/02/18 15:14:28 seb Exp $ ---- Makefile.orig Fri Dec 15 20:05:39 2000 +--- Makefile.orig Sun Oct 28 02:35:41 2001 +++ Makefile @@ -2,24 +2,24 @@ # prior to 19.14 for XEmacs are unsupported. @@ -33,12 +33,12 @@ $NetBSD: patch-aa,v 1.3 2001/01/28 03:16:55 jtb Exp $ ############## no user servicable parts beyond this point ################### -@@ -131,7 +131,7 @@ +@@ -134,7 +134,7 @@ vm.info: vm.texinfo @echo "making vm.info..." - @$(EMACS) $(BATCHFLAGS) -insert vm.texinfo -l texinfmt -f texinfo-format-buffer -f save-buffer -+ makeinfo vm.texinfo ++ $(MAKEINFO) vm.texinfo vm-autoload.elc: $(SOURCES) @echo scanning sources to build autoload definitions... diff --git a/mail/wl/Makefile b/mail/wl/Makefile index bd38ec44040..ab6382e4d57 100644 --- a/mail/wl/Makefile +++ b/mail/wl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/01/08 11:47:16 jun Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:29 seb Exp $ DISTNAME= wl-2.8.1 CATEGORIES= mail @@ -35,4 +35,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/samples/ja/$f ${EXAMPLESDIR}/ja .endfor +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" |