diff options
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/Makefile | 3 | ||||
| -rw-r--r-- | editors/emacs/PLIST | 58 | ||||
| -rw-r--r-- | editors/mule/Makefile | 6 | ||||
| -rw-r--r-- | editors/mule/PLIST | 90 | ||||
| -rw-r--r-- | editors/nano/Makefile | 3 | ||||
| -rw-r--r-- | editors/nano/PLIST | 6 | ||||
| -rw-r--r-- | editors/speedbar/Makefile | 3 | ||||
| -rw-r--r-- | editors/speedbar/PLIST | 5 | ||||
| -rw-r--r-- | editors/speedbar/distinfo | 3 | ||||
| -rw-r--r-- | editors/speedbar/patches/patch-aa | 21 |
10 files changed, 113 insertions, 85 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index b84bbd64332..d9a1ab9f6e6 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2001/10/06 22:04:22 hubertf Exp $ +# $NetBSD: Makefile,v 1.45 2002/02/18 15:14:17 seb Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp DISTNAME= emacs-20.7 @@ -47,4 +47,5 @@ pre-install: post-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST index 20766c6de0a..6891e8f6819 100644 --- a/editors/emacs/PLIST +++ b/editors/emacs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:36 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:17 seb Exp $ bin/emacs bin/emacs-${PKGVERSION} bin/emacs-b2m @@ -6,33 +6,33 @@ bin/emacs-ctags bin/emacs-etags bin/emacs-rcs-checkin bin/emacsclient -@unexec install-info --delete %D/info/ccmode %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/ccmode %D/info/dir info/ccmode -@exec install-info %D/info/ccmode %D/info/dir +@exec ${INSTALL_INFO} %D/info/ccmode %D/info/dir info/ccmode-1 info/ccmode-2 info/ccmode-3 -@unexec install-info --delete %D/info/cl %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/cl %D/info/dir info/cl -@exec install-info %D/info/cl %D/info/dir +@exec ${INSTALL_INFO} %D/info/cl %D/info/dir info/cl-1 info/cl-2 info/cl-3 info/cl-4 info/cl-5 info/cl-6 -@unexec install-info --delete %D/info/dired-x %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/dired-x %D/info/dir info/dired-x -@exec install-info %D/info/dired-x %D/info/dir -@unexec install-info --delete %D/info/ediff %D/info/dir +@exec ${INSTALL_INFO} %D/info/dired-x %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/ediff %D/info/dir info/ediff -@exec install-info %D/info/ediff %D/info/dir +@exec ${INSTALL_INFO} %D/info/ediff %D/info/dir info/ediff-1 info/ediff-2 info/ediff-3 -@unexec install-info --delete %D/info/emacs %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/emacs %D/info/dir info/emacs -@exec install-info %D/info/emacs %D/info/dir +@exec ${INSTALL_INFO} %D/info/emacs %D/info/dir info/emacs-1 info/emacs-10 info/emacs-11 @@ -65,12 +65,12 @@ info/emacs-6 info/emacs-7 info/emacs-8 info/emacs-9 -@unexec install-info --delete %D/info/forms %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/forms %D/info/dir info/forms -@exec install-info %D/info/forms %D/info/dir -@unexec install-info --delete %D/info/gnus %D/info/dir +@exec ${INSTALL_INFO} %D/info/forms %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gnus %D/info/dir info/gnus -@exec install-info %D/info/gnus %D/info/dir +@exec ${INSTALL_INFO} %D/info/gnus %D/info/dir info/gnus-1 info/gnus-10 info/gnus-11 @@ -87,44 +87,44 @@ info/gnus-6 info/gnus-7 info/gnus-8 info/gnus-9 -@unexec install-info --delete %D/info/message %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/message %D/info/dir info/message -@exec install-info %D/info/message %D/info/dir -@unexec install-info --delete %D/info/mh-e %D/info/dir +@exec ${INSTALL_INFO} %D/info/message %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mh-e %D/info/dir info/mh-e -@exec install-info %D/info/mh-e %D/info/dir +@exec ${INSTALL_INFO} %D/info/mh-e %D/info/dir info/mh-e-1 info/mh-e-2 info/mh-e-3 info/mh-e-4 -@unexec install-info --delete %D/info/reftex %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/reftex %D/info/dir info/reftex -@exec install-info %D/info/reftex %D/info/dir +@exec ${INSTALL_INFO} %D/info/reftex %D/info/dir info/reftex-1 info/reftex-2 info/reftex-3 -@unexec install-info --delete %D/info/sc %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/sc %D/info/dir info/sc -@exec install-info %D/info/sc %D/info/dir +@exec ${INSTALL_INFO} %D/info/sc %D/info/dir info/sc-1 info/sc-2 info/sc-3 -@unexec install-info --delete %D/info/vip %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/vip %D/info/dir info/vip -@exec install-info %D/info/vip %D/info/dir +@exec ${INSTALL_INFO} %D/info/vip %D/info/dir info/vip-1 info/vip-2 -@unexec install-info --delete %D/info/viper %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/viper %D/info/dir info/viper -@exec install-info %D/info/viper %D/info/dir +@exec ${INSTALL_INFO} %D/info/viper %D/info/dir info/viper-1 info/viper-2 info/viper-3 info/viper-4 info/viper-5 -@unexec install-info --delete %D/info/widget %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/widget %D/info/dir info/widget -@exec install-info %D/info/widget %D/info/dir +@exec ${INSTALL_INFO} %D/info/widget %D/info/dir libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver 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 diff --git a/editors/nano/Makefile b/editors/nano/Makefile index 47367685979..7c2b6b4d49b 100644 --- a/editors/nano/Makefile +++ b/editors/nano/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/01/26 07:16:59 martti Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:17 seb Exp $ DISTNAME= nano-1.0.8 CATEGORIES= editors @@ -13,4 +13,5 @@ USE_BUILDLINK_ONLY= yes .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/ncurses/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/nano/PLIST b/editors/nano/PLIST index 5ee11a028b7..3925ad15722 100644 --- a/editors/nano/PLIST +++ b/editors/nano/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2002/01/26 07:16:59 martti Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:17 seb Exp $ bin/nano -@unexec install-info --delete --info-dir=%D/info %D/info/nano.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/nano.info info/nano.info -@exec install-info --info-dir=%D/info %D/info/nano.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/nano.info man/man1/nano.1 share/locale/ca/LC_MESSAGES/nano.mo share/locale/cs/LC_MESSAGES/nano.mo diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile index 3b195cc6a79..7f83732aa68 100644 --- a/editors/speedbar/Makefile +++ b/editors/speedbar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:01 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:17 seb Exp $ # DISTNAME= speedbar-0.13a @@ -42,4 +42,5 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${IMAGES} ${PREFIX}/${LISPDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/speedbar/PLIST b/editors/speedbar/PLIST index c68e756ba4e..e64aec70ea3 100644 --- a/editors/speedbar/PLIST +++ b/editors/speedbar/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:36 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:18 seb Exp $ ${LISPDIR}/dframe.el ${LISPDIR}/dframe.elc ${LISPDIR}/sb-dir-minus.xpm @@ -17,7 +17,8 @@ ${LISPDIR}/sb-tag-v.xpm ${LISPDIR}/sb-tag.xpm ${LISPDIR}/speedbar.el ${LISPDIR}/speedbar.elc -@unexec install-info --delete %D/info/speedbar.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/speedbar.info %D/info/dir info/speedbar.info +@exec ${INSTALL_INFO} %D/info/speedbar.info %D/info/dir @exec install-info %D/info/speedbar.info %D/info/dir @unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true diff --git a/editors/speedbar/distinfo b/editors/speedbar/distinfo index f8e56b47a75..85279ed0b31 100644 --- a/editors/speedbar/distinfo +++ b/editors/speedbar/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/08 20:50:11 cjones Exp $ +$NetBSD: distinfo,v 1.2 2002/02/18 15:14:18 seb Exp $ SHA1 (speedbar-0.13a.tar.gz) = 10adb4af2bef3cd1bd301103f79143fa0b21b231 Size (speedbar-0.13a.tar.gz) = 79535 bytes +SHA1 (patch-aa) = 70473a7400582616e70be72215cf50e1fbb7722b diff --git a/editors/speedbar/patches/patch-aa b/editors/speedbar/patches/patch-aa new file mode 100644 index 00000000000..f4c7a20d2d3 --- /dev/null +++ b/editors/speedbar/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:18 seb Exp $ + +--- Makefile.orig Mon Oct 9 06:21:34 2000 ++++ Makefile +@@ -11,7 +11,6 @@ + speedbar_LISP=dframe.el speedbar.el + EMACS=emacs + info_TEXINFOS=speedbar.texi +-MAKEINFO=makeinfo + opt_LISP=rpm.el sb-gud.el sb-info.el sb-rmail.el sb-w3.el sb-texinfo.el bigclock.el + aux_AUX=INSTALL + images_MISC=sb-dir-plus.xpm sb-dir-minus.xpm sb-dir.xpm sb-pg-plus.xpm sb-pg-minus.xpm sb-pg.xpm sb-mail.xpm sb-tag-plus.xpm sb-tag-minus.xpm sb-tag.xpm sb-tag-gt.xpm sb-tag-v.xpm sb-tag-type.xpm sb-image.el +@@ -35,7 +34,7 @@ + $(EMACS) -batch -l $@-compile-script -f batch-byte-compile $^ + + speedbar.info: $(info_TEXINFOS) +- makeinfo -o $@ $< ++ $(MAKEINFO) -o $@ $< + + opt: $(opt_LISP) + @echo "(add-to-list 'load-path nil)" > $@-compile-script |