From 94736fef3d3bc180c38e89ad3b9fc89d91756057 Mon Sep 17 00:00:00 2001 From: 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. --- editors/mule/Makefile | 6 ++-- editors/mule/PLIST | 90 +++++++++++++++++++++++++-------------------------- 2 files changed, 49 insertions(+), 47 deletions(-) (limited to 'editors/mule') diff --git a/editors/mule/Makefile b/editors/mule/Makefile index fc34c595cb7..21dc0c5cd6f 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/01/08 09:36:51 agc Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:17 seb Exp $ DISTNAME= mule-2.3 CATEGORIES= editors @@ -22,7 +22,6 @@ DEPENDS+= Canna-lib-3.5b2:../../japanese/canna-lib WRKSRC= ${WRKDIR}/mule GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GTEXINFO= yes CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-x --with-x-toolkit=lucid CONFIGURE_ARGS+= --terminal-face --mcpath @@ -40,6 +39,8 @@ CONFIGURE_ARGS+= --canna --canna-includes=${LOCALBASE}/include --canna-libraries INFO_FILES= antenews-jp canna-jp cl dired-x egg-jp emacs forms gnus mule \ mule-jp sc vip +TEXINFO_OVERRIDE= YES +TEXINFO_PATTERNS+= Makefile MAN1= coco.1 ctags.1 etags.1 m2ps.1 mule.1 @@ -48,4 +49,5 @@ post-patch: @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/info.patch @${RM} -f ${WRKSRC}/info/*.orig +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/mule/PLIST b/editors/mule/PLIST index b3782182ef9..0b6a95c4911 100644 --- a/editors/mule/PLIST +++ b/editors/mule/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:36 skrll Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:17 seb Exp $ bin/any2ps bin/b2m bin/coco @@ -10,28 +10,28 @@ bin/mule-19.28 @exec ln %D/%F %B/mule @unexec ${RM} %B/mule bin/rcs-checkin -@comment @unexec install-info --delete %D/info/CCL %D/info/dir -@comment @unexec install-info --delete %D/info/ISO2022 %D/info/dir -@comment @unexec install-info --delete %D/info/R2L %D/info/dir -@comment @unexec install-info --delete %D/info/XFONT %D/info/dir -@unexec install-info --delete %D/info/antenews-jp %D/info/dir -@unexec install-info --delete %D/info/canna-jp %D/info/dir -@unexec install-info --delete %D/info/cl %D/info/dir -@unexec install-info --delete %D/info/dired-x %D/info/dir -@comment @unexec install-info --delete %D/info/egg %D/info/dir -@unexec install-info --delete %D/info/egg-jp %D/info/dir -@unexec install-info --delete %D/info/emacs %D/info/dir -@unexec install-info --delete %D/info/forms %D/info/dir -@unexec install-info --delete %D/info/gnus %D/info/dir -@comment @unexec install-info --delete %D/info/kbd-trans %D/info/dir -@comment @unexec install-info --delete %D/info/languages %D/info/dir -@comment @unexec install-info --delete %D/info/m2ps %D/info/dir -@unexec install-info --delete %D/info/mule %D/info/dir -@unexec install-info --delete %D/info/mule-jp %D/info/dir -@comment @unexec install-info --delete %D/info/quail %D/info/dir -@unexec install-info --delete %D/info/sc %D/info/dir -@comment @unexec install-info --delete %D/info/terminology %D/info/dir -@unexec install-info --delete %D/info/vip %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/CCL %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/ISO2022 %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/R2L %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/XFONT %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/antenews-jp %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/canna-jp %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/cl %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/dired-x %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/egg %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/egg-jp %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/emacs %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/forms %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gnus %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/kbd-trans %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/languages %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/m2ps %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mule %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mule-jp %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/quail %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/sc %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/terminology %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/vip %D/info/dir info/CCL info/ISO2022 info/R2L @@ -97,28 +97,28 @@ info/terminology info/vip info/vip-1 info/vip-2 -@comment @exec install-info %D/info/CCL %D/info/dir -@comment @exec install-info %D/info/ISO2022 %D/info/dir -@comment @exec install-info %D/info/R2L %D/info/dir -@comment @exec install-info %D/info/XFONT %D/info/dir -@exec install-info %D/info/antenews-jp %D/info/dir -@exec install-info %D/info/canna-jp %D/info/dir -@exec install-info %D/info/cl %D/info/dir -@exec install-info %D/info/dired-x %D/info/dir -@comment @exec install-info %D/info/egg %D/info/dir -@exec install-info %D/info/egg-jp %D/info/dir -@exec install-info %D/info/emacs %D/info/dir -@exec install-info %D/info/forms %D/info/dir -@exec install-info %D/info/gnus %D/info/dir -@comment @exec install-info %D/info/kbd-trans %D/info/dir -@comment @exec install-info %D/info/languages %D/info/dir -@comment @exec install-info %D/info/m2ps %D/info/dir -@exec install-info %D/info/mule %D/info/dir -@exec install-info %D/info/mule-jp %D/info/dir -@comment @exec install-info %D/info/quail %D/info/dir -@exec install-info %D/info/sc %D/info/dir -@comment @exec install-info %D/info/terminology %D/info/dir -@exec install-info %D/info/vip %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/CCL %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/ISO2022 %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/R2L %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/XFONT %D/info/dir +@exec ${INSTALL_INFO} %D/info/antenews-jp %D/info/dir +@exec ${INSTALL_INFO} %D/info/canna-jp %D/info/dir +@exec ${INSTALL_INFO} %D/info/cl %D/info/dir +@exec ${INSTALL_INFO} %D/info/dired-x %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/egg %D/info/dir +@exec ${INSTALL_INFO} %D/info/egg-jp %D/info/dir +@exec ${INSTALL_INFO} %D/info/emacs %D/info/dir +@exec ${INSTALL_INFO} %D/info/forms %D/info/dir +@exec ${INSTALL_INFO} %D/info/gnus %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/kbd-trans %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/languages %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/m2ps %D/info/dir +@exec ${INSTALL_INFO} %D/info/mule %D/info/dir +@exec ${INSTALL_INFO} %D/info/mule-jp %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/quail %D/info/dir +@exec ${INSTALL_INFO} %D/info/sc %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/terminology %D/info/dir +@exec ${INSTALL_INFO} %D/info/vip %D/info/dir man/man1/coco.1 man/man1/ctags.1 man/man1/etags.1 -- cgit v1.2.3