diff options
| -rw-r--r-- | math/calc/Makefile | 20 | ||||
| -rw-r--r-- | math/calc/PLIST | 176 | ||||
| -rw-r--r-- | math/calc/distinfo | 4 | ||||
| -rw-r--r-- | math/calc/patches/patch-aa | 17 |
4 files changed, 109 insertions, 108 deletions
diff --git a/math/calc/Makefile b/math/calc/Makefile index 1b459219b89..79271e3c9c6 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2002/02/20 18:10:29 seb Exp $ +# $NetBSD: Makefile,v 1.7 2002/12/23 12:50:12 seb Exp $ DISTNAME= calc-2.02f +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU:=calc/} @@ -10,25 +11,16 @@ COMMENT= Advanced Calculator for GNU Emacs .include "../../mk/bsd.prefs.mk" -.if defined(USE_XEMACS) -MAKE_ENV+= EMACS=xemacs -DEPENDS+= xemacs-[0-9]*:../../editors/xemacs -SITE_LISP= lib/xemacs/xemacs-packages/lisp -.else -MAKE_ENV+= EMACS=emacs -DEPENDS+= emacs-[0-9]*:../../editors/emacs -SITE_LISP= share/emacs/site-lisp -.endif +.include "../../mk/emacs.mk" -PLIST_SUBST+= SITE_LISP=${SITE_LISP} +MAKE_ENV+= EMACS=${EMACS_FLAVOR} INFO_FILES= calc.info do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/${SITE_LISP} - ${INSTALL_DATA_DIR} ${PREFIX}/${SITE_LISP}/calc + ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/calc ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \ - ${WRKSRC}/calccard.tex ${PREFIX}/${SITE_LISP}/calc + ${WRKSRC}/calccard.tex ${EMACS_LISPPREFIX}/calc ${INSTALL_DATA} ${WRKSRC}/calc.info* ${PREFIX}/info .include "../../mk/texinfo.mk" diff --git a/math/calc/PLIST b/math/calc/PLIST index 420a89f6602..68cddc160bf 100644 --- a/math/calc/PLIST +++ b/math/calc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:29 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/12/23 12:50:12 seb Exp $ @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/calc.info info/calc.info info/calc.info-1 @@ -36,90 +36,90 @@ info/calc.info-7 info/calc.info-8 info/calc.info-9 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/calc.info -${SITE_LISP}/calc/calc-aent.el -${SITE_LISP}/calc/calc-aent.elc -${SITE_LISP}/calc/calc-alg-2.el -${SITE_LISP}/calc/calc-alg-2.elc -${SITE_LISP}/calc/calc-alg-3.el -${SITE_LISP}/calc/calc-alg-3.elc -${SITE_LISP}/calc/calc-alg.el -${SITE_LISP}/calc/calc-alg.elc -${SITE_LISP}/calc/calc-arith.el -${SITE_LISP}/calc/calc-arith.elc -${SITE_LISP}/calc/calc-bin.el -${SITE_LISP}/calc/calc-bin.elc -${SITE_LISP}/calc/calc-comb.el -${SITE_LISP}/calc/calc-comb.elc -${SITE_LISP}/calc/calc-comp.el -${SITE_LISP}/calc/calc-comp.elc -${SITE_LISP}/calc/calc-cplx.el -${SITE_LISP}/calc/calc-cplx.elc -${SITE_LISP}/calc/calc-embed.el -${SITE_LISP}/calc/calc-embed.elc -${SITE_LISP}/calc/calc-ext.el -${SITE_LISP}/calc/calc-ext.elc -${SITE_LISP}/calc/calc-fin.el -${SITE_LISP}/calc/calc-fin.elc -${SITE_LISP}/calc/calc-forms.el -${SITE_LISP}/calc/calc-forms.elc -${SITE_LISP}/calc/calc-frac.el -${SITE_LISP}/calc/calc-frac.elc -${SITE_LISP}/calc/calc-funcs.el -${SITE_LISP}/calc/calc-funcs.elc -${SITE_LISP}/calc/calc-graph.el -${SITE_LISP}/calc/calc-graph.elc -${SITE_LISP}/calc/calc-help.el -${SITE_LISP}/calc/calc-help.elc -${SITE_LISP}/calc/calc-incom.el -${SITE_LISP}/calc/calc-incom.elc -${SITE_LISP}/calc/calc-keypd.el -${SITE_LISP}/calc/calc-keypd.elc -${SITE_LISP}/calc/calc-lang.el -${SITE_LISP}/calc/calc-lang.elc -${SITE_LISP}/calc/calc-macs.el -${SITE_LISP}/calc/calc-macs.elc -${SITE_LISP}/calc/calc-maint.el -${SITE_LISP}/calc/calc-maint.elc -${SITE_LISP}/calc/calc-map.el -${SITE_LISP}/calc/calc-map.elc -${SITE_LISP}/calc/calc-mat.el -${SITE_LISP}/calc/calc-mat.elc -${SITE_LISP}/calc/calc-math.el -${SITE_LISP}/calc/calc-math.elc -${SITE_LISP}/calc/calc-misc.el -${SITE_LISP}/calc/calc-misc.elc -${SITE_LISP}/calc/calc-mode.el -${SITE_LISP}/calc/calc-mode.elc -${SITE_LISP}/calc/calc-poly.el -${SITE_LISP}/calc/calc-poly.elc -${SITE_LISP}/calc/calc-prog.el -${SITE_LISP}/calc/calc-prog.elc -${SITE_LISP}/calc/calc-rewr.el -${SITE_LISP}/calc/calc-rewr.elc -${SITE_LISP}/calc/calc-rules.el -${SITE_LISP}/calc/calc-rules.elc -${SITE_LISP}/calc/calc-sel-2.el -${SITE_LISP}/calc/calc-sel-2.elc -${SITE_LISP}/calc/calc-sel.el -${SITE_LISP}/calc/calc-sel.elc -${SITE_LISP}/calc/calc-stat.el -${SITE_LISP}/calc/calc-stat.elc -${SITE_LISP}/calc/calc-store.el -${SITE_LISP}/calc/calc-store.elc -${SITE_LISP}/calc/calc-stuff.el -${SITE_LISP}/calc/calc-stuff.elc -${SITE_LISP}/calc/calc-trail.el -${SITE_LISP}/calc/calc-trail.elc -${SITE_LISP}/calc/calc-undo.el -${SITE_LISP}/calc/calc-undo.elc -${SITE_LISP}/calc/calc-units.el -${SITE_LISP}/calc/calc-units.elc -${SITE_LISP}/calc/calc-vec.el -${SITE_LISP}/calc/calc-vec.elc -${SITE_LISP}/calc/calc-yank.el -${SITE_LISP}/calc/calc-yank.elc -${SITE_LISP}/calc/calc.el -${SITE_LISP}/calc/calc.elc -${SITE_LISP}/calc/calccard.tex -${SITE_LISP}/calc/macedit.el -@dirrm ${SITE_LISP}/calc +${EMACS_LISPPREFIX}/calc/calc-aent.el +${EMACS_LISPPREFIX}/calc/calc-aent.elc +${EMACS_LISPPREFIX}/calc/calc-alg-2.el +${EMACS_LISPPREFIX}/calc/calc-alg-2.elc +${EMACS_LISPPREFIX}/calc/calc-alg-3.el +${EMACS_LISPPREFIX}/calc/calc-alg-3.elc +${EMACS_LISPPREFIX}/calc/calc-alg.el +${EMACS_LISPPREFIX}/calc/calc-alg.elc +${EMACS_LISPPREFIX}/calc/calc-arith.el +${EMACS_LISPPREFIX}/calc/calc-arith.elc +${EMACS_LISPPREFIX}/calc/calc-bin.el +${EMACS_LISPPREFIX}/calc/calc-bin.elc +${EMACS_LISPPREFIX}/calc/calc-comb.el +${EMACS_LISPPREFIX}/calc/calc-comb.elc +${EMACS_LISPPREFIX}/calc/calc-comp.el +${EMACS_LISPPREFIX}/calc/calc-comp.elc +${EMACS_LISPPREFIX}/calc/calc-cplx.el +${EMACS_LISPPREFIX}/calc/calc-cplx.elc +${EMACS_LISPPREFIX}/calc/calc-embed.el +${EMACS_LISPPREFIX}/calc/calc-embed.elc +${EMACS_LISPPREFIX}/calc/calc-ext.el +${EMACS_LISPPREFIX}/calc/calc-ext.elc +${EMACS_LISPPREFIX}/calc/calc-fin.el +${EMACS_LISPPREFIX}/calc/calc-fin.elc +${EMACS_LISPPREFIX}/calc/calc-forms.el +${EMACS_LISPPREFIX}/calc/calc-forms.elc +${EMACS_LISPPREFIX}/calc/calc-frac.el +${EMACS_LISPPREFIX}/calc/calc-frac.elc +${EMACS_LISPPREFIX}/calc/calc-funcs.el +${EMACS_LISPPREFIX}/calc/calc-funcs.elc +${EMACS_LISPPREFIX}/calc/calc-graph.el +${EMACS_LISPPREFIX}/calc/calc-graph.elc +${EMACS_LISPPREFIX}/calc/calc-help.el +${EMACS_LISPPREFIX}/calc/calc-help.elc +${EMACS_LISPPREFIX}/calc/calc-incom.el +${EMACS_LISPPREFIX}/calc/calc-incom.elc +${EMACS_LISPPREFIX}/calc/calc-keypd.el +${EMACS_LISPPREFIX}/calc/calc-keypd.elc +${EMACS_LISPPREFIX}/calc/calc-lang.el +${EMACS_LISPPREFIX}/calc/calc-lang.elc +${EMACS_LISPPREFIX}/calc/calc-macs.el +${EMACS_LISPPREFIX}/calc/calc-macs.elc +${EMACS_LISPPREFIX}/calc/calc-maint.el +${EMACS_LISPPREFIX}/calc/calc-maint.elc +${EMACS_LISPPREFIX}/calc/calc-map.el +${EMACS_LISPPREFIX}/calc/calc-map.elc +${EMACS_LISPPREFIX}/calc/calc-mat.el +${EMACS_LISPPREFIX}/calc/calc-mat.elc +${EMACS_LISPPREFIX}/calc/calc-math.el +${EMACS_LISPPREFIX}/calc/calc-math.elc +${EMACS_LISPPREFIX}/calc/calc-misc.el +${EMACS_LISPPREFIX}/calc/calc-misc.elc +${EMACS_LISPPREFIX}/calc/calc-mode.el +${EMACS_LISPPREFIX}/calc/calc-mode.elc +${EMACS_LISPPREFIX}/calc/calc-poly.el +${EMACS_LISPPREFIX}/calc/calc-poly.elc +${EMACS_LISPPREFIX}/calc/calc-prog.el +${EMACS_LISPPREFIX}/calc/calc-prog.elc +${EMACS_LISPPREFIX}/calc/calc-rewr.el +${EMACS_LISPPREFIX}/calc/calc-rewr.elc +${EMACS_LISPPREFIX}/calc/calc-rules.el +${EMACS_LISPPREFIX}/calc/calc-rules.elc +${EMACS_LISPPREFIX}/calc/calc-sel-2.el +${EMACS_LISPPREFIX}/calc/calc-sel-2.elc +${EMACS_LISPPREFIX}/calc/calc-sel.el +${EMACS_LISPPREFIX}/calc/calc-sel.elc +${EMACS_LISPPREFIX}/calc/calc-stat.el +${EMACS_LISPPREFIX}/calc/calc-stat.elc +${EMACS_LISPPREFIX}/calc/calc-store.el +${EMACS_LISPPREFIX}/calc/calc-store.elc +${EMACS_LISPPREFIX}/calc/calc-stuff.el +${EMACS_LISPPREFIX}/calc/calc-stuff.elc +${EMACS_LISPPREFIX}/calc/calc-trail.el +${EMACS_LISPPREFIX}/calc/calc-trail.elc +${EMACS_LISPPREFIX}/calc/calc-undo.el +${EMACS_LISPPREFIX}/calc/calc-undo.elc +${EMACS_LISPPREFIX}/calc/calc-units.el +${EMACS_LISPPREFIX}/calc/calc-units.elc +${EMACS_LISPPREFIX}/calc/calc-vec.el +${EMACS_LISPPREFIX}/calc/calc-vec.elc +${EMACS_LISPPREFIX}/calc/calc-yank.el +${EMACS_LISPPREFIX}/calc/calc-yank.elc +${EMACS_LISPPREFIX}/calc/calc.el +${EMACS_LISPPREFIX}/calc/calc.elc +${EMACS_LISPPREFIX}/calc/calccard.tex +${EMACS_LISPPREFIX}/calc/macedit.el +@dirrm ${EMACS_LISPPREFIX}/calc diff --git a/math/calc/distinfo b/math/calc/distinfo index abc9f5d13ad..41ffb2f2a63 100644 --- a/math/calc/distinfo +++ b/math/calc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2002/02/18 15:14:29 seb Exp $ +$NetBSD: distinfo,v 1.4 2002/12/23 12:50:12 seb Exp $ SHA1 (calc-2.02f.tar.gz) = 1a1d54fb90725aacaf1c9308a94be4b813ac4880 Size (calc-2.02f.tar.gz) = 831865 bytes -SHA1 (patch-aa) = 38688806fb5b62e7ac3ca1783376abfb79fd2bfe +SHA1 (patch-aa) = 2096bcc555989638f25f3e845e065a62d505b274 SHA1 (patch-ab) = f8634afae8f7236bcf2e4c232e5cd60d5500e0cb diff --git a/math/calc/patches/patch-aa b/math/calc/patches/patch-aa index b632b4b4d9a..14926dd9d96 100644 --- a/math/calc/patches/patch-aa +++ b/math/calc/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2002/02/18 15:14:29 seb Exp $ +$NetBSD: patch-aa,v 1.4 2002/12/23 12:50:12 seb Exp $ ---- Makefile.orig Mon Dec 16 05:50:45 1996 +--- Makefile.orig Mon Dec 16 04:50:45 1996 +++ Makefile @@ -29,10 +29,9 @@ @@ -14,7 +14,16 @@ $NetBSD: patch-aa,v 1.3 2002/02/18 15:14:29 seb Exp $ MAKE = make ECHO = @echo REMOVE = -rm -f -@@ -54,13 +53,10 @@ +@@ -41,7 +40,7 @@ REMOVE = -rm -f + + # Other macros. + EFLAGS = -batch +-MAINT = -l calc-maint.elc ++MAINT = -l calc-maint.el + + # Control whether intermediate files are kept. + PURGE = -rm -f +@@ -54,13 +53,10 @@ PURGE = -rm -f # to make the steps more explicit while the `make' is in progress. all: $(MAKE) compile @@ -28,7 +37,7 @@ $NetBSD: patch-aa,v 1.3 2002/02/18 15:14:29 seb Exp $ $(MAKE) info $(ECHO) "Calc is now installed." -@@ -83,9 +79,9 @@ +@@ -83,9 +79,9 @@ private: maint # Format the Calc manual for the Info system using makeinfo. info: calc.info calc.info: calc.texinfo |