Added an option to install for XEmacs instead of GNU Emacs.

4 files changed, 114 insertions, 102 deletions

diff --git a/math/calc/Makefile b/math/calc/Makefile
index 0b9fffd5b0e..e1988dfc8b7 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/26 23:35:17 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2000/12/13 23:51:34 jtb Exp $
 
 DISTNAME=	calc-2.02f
 CATEGORIES=	math
@@ -7,17 +7,25 @@ MASTER_SITES=	${MASTER_SITE_GNU:=calc/}
 MAINTAINER=	jtb@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/calc/calc.html
 
-DEPENDS+=	emacs>=20.0:../../editors/emacs
+.include "../../mk/bsd.prefs.mk"
 
-EVAL_PREFIX+=	PREFIX=emacs
+.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
+
+PLIST_SUBST+=	SITE_LISP=${SITE_LISP}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp/calc
-	@(cd ${WRKSRC}; for i in *.el *.elc calccard.tex; do \
-	${INSTALL_DATA} $$i ${PREFIX}/share/emacs/site-lisp/calc ; \
-	done)
+	${INSTALL_DATA_DIR} ${PREFIX}/${SITE_LISP}
+	${INSTALL_DATA_DIR} ${PREFIX}/${SITE_LISP}/calc
+	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
+	${WRKSRC}/calccard.tex ${PREFIX}/${SITE_LISP}/calc
 	${INSTALL_DATA} ${WRKSRC}/calc.info* ${PREFIX}/info
-	@install-info --dir-file=${PREFIX}/info/dir \
-	--info-file=${PREFIX}/info/calc.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/calc/files/patch-sum b/math/calc/files/patch-sum
index 1aaf1c2a81b..9d7e0642c42 100644
--- a/math/calc/files/patch-sum
+++ b/math/calc/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/11/26 23:35:18 jtb Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/13 23:51:34 jtb Exp $
 
-MD5 (patch-aa) = 231f0f1125d297d751b3ae286c7c86fb
+MD5 (patch-aa) = 3d1abbaf9be5ebbc4b5e3a7e27c4ecee
 MD5 (patch-ab) = 681cc7458f9d632487e139d191c1d3cb
diff --git a/math/calc/patches/patch-aa b/math/calc/patches/patch-aa
index e9b7380d393..4bd04c828a0 100644
--- a/math/calc/patches/patch-aa
+++ b/math/calc/patches/patch-aa
@@ -1,9 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/26 23:35:19 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $
 
 --- Makefile.orig	Mon Dec 16 04:50:45 1996
 +++ Makefile
-@@ -32,7 +32,7 @@
- EMACS    = emacs
+@@ -29,10 +29,10 @@
+ 
+ 
+ # Programs.
+-EMACS    = emacs
++#EMACS    = xemacs
  TEX      = tex
  TEXINDEX = texindex
 -MAKEINFO = makeinfo
diff --git a/math/calc/pkg/PLIST b/math/calc/pkg/PLIST
index 03776847f04..c5d6daa77c4 100644
--- a/math/calc/pkg/PLIST
+++ b/math/calc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/26 23:35:18 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/13 23:51:35 jtb 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
-share/emacs/site-lisp/calc/calc-aent.el
-share/emacs/site-lisp/calc/calc-aent.elc
-share/emacs/site-lisp/calc/calc-alg-2.el
-share/emacs/site-lisp/calc/calc-alg-2.elc
-share/emacs/site-lisp/calc/calc-alg-3.el
-share/emacs/site-lisp/calc/calc-alg-3.elc
-share/emacs/site-lisp/calc/calc-alg.el
-share/emacs/site-lisp/calc/calc-alg.elc
-share/emacs/site-lisp/calc/calc-arith.el
-share/emacs/site-lisp/calc/calc-arith.elc
-share/emacs/site-lisp/calc/calc-bin.el
-share/emacs/site-lisp/calc/calc-bin.elc
-share/emacs/site-lisp/calc/calc-comb.el
-share/emacs/site-lisp/calc/calc-comb.elc
-share/emacs/site-lisp/calc/calc-comp.el
-share/emacs/site-lisp/calc/calc-comp.elc
-share/emacs/site-lisp/calc/calc-cplx.el
-share/emacs/site-lisp/calc/calc-cplx.elc
-share/emacs/site-lisp/calc/calc-embed.el
-share/emacs/site-lisp/calc/calc-embed.elc
-share/emacs/site-lisp/calc/calc-ext.el
-share/emacs/site-lisp/calc/calc-ext.elc
-share/emacs/site-lisp/calc/calc-fin.el
-share/emacs/site-lisp/calc/calc-fin.elc
-share/emacs/site-lisp/calc/calc-forms.el
-share/emacs/site-lisp/calc/calc-forms.elc
-share/emacs/site-lisp/calc/calc-frac.el
-share/emacs/site-lisp/calc/calc-frac.elc
-share/emacs/site-lisp/calc/calc-funcs.el
-share/emacs/site-lisp/calc/calc-funcs.elc
-share/emacs/site-lisp/calc/calc-graph.el
-share/emacs/site-lisp/calc/calc-graph.elc
-share/emacs/site-lisp/calc/calc-help.el
-share/emacs/site-lisp/calc/calc-help.elc
-share/emacs/site-lisp/calc/calc-incom.el
-share/emacs/site-lisp/calc/calc-incom.elc
-share/emacs/site-lisp/calc/calc-keypd.el
-share/emacs/site-lisp/calc/calc-keypd.elc
-share/emacs/site-lisp/calc/calc-lang.el
-share/emacs/site-lisp/calc/calc-lang.elc
-share/emacs/site-lisp/calc/calc-macs.el
-share/emacs/site-lisp/calc/calc-macs.elc
-share/emacs/site-lisp/calc/calc-maint.el
-share/emacs/site-lisp/calc/calc-maint.elc
-share/emacs/site-lisp/calc/calc-map.el
-share/emacs/site-lisp/calc/calc-map.elc
-share/emacs/site-lisp/calc/calc-mat.el
-share/emacs/site-lisp/calc/calc-mat.elc
-share/emacs/site-lisp/calc/calc-math.el
-share/emacs/site-lisp/calc/calc-math.elc
-share/emacs/site-lisp/calc/calc-misc.el
-share/emacs/site-lisp/calc/calc-misc.elc
-share/emacs/site-lisp/calc/calc-mode.el
-share/emacs/site-lisp/calc/calc-mode.elc
-share/emacs/site-lisp/calc/calc-poly.el
-share/emacs/site-lisp/calc/calc-poly.elc
-share/emacs/site-lisp/calc/calc-prog.el
-share/emacs/site-lisp/calc/calc-prog.elc
-share/emacs/site-lisp/calc/calc-rewr.el
-share/emacs/site-lisp/calc/calc-rewr.elc
-share/emacs/site-lisp/calc/calc-rules.el
-share/emacs/site-lisp/calc/calc-rules.elc
-share/emacs/site-lisp/calc/calc-sel-2.el
-share/emacs/site-lisp/calc/calc-sel-2.elc
-share/emacs/site-lisp/calc/calc-sel.el
-share/emacs/site-lisp/calc/calc-sel.elc
-share/emacs/site-lisp/calc/calc-stat.el
-share/emacs/site-lisp/calc/calc-stat.elc
-share/emacs/site-lisp/calc/calc-store.el
-share/emacs/site-lisp/calc/calc-store.elc
-share/emacs/site-lisp/calc/calc-stuff.el
-share/emacs/site-lisp/calc/calc-stuff.elc
-share/emacs/site-lisp/calc/calc-trail.el
-share/emacs/site-lisp/calc/calc-trail.elc
-share/emacs/site-lisp/calc/calc-undo.el
-share/emacs/site-lisp/calc/calc-undo.elc
-share/emacs/site-lisp/calc/calc-units.el
-share/emacs/site-lisp/calc/calc-units.elc
-share/emacs/site-lisp/calc/calc-vec.el
-share/emacs/site-lisp/calc/calc-vec.elc
-share/emacs/site-lisp/calc/calc-yank.el
-share/emacs/site-lisp/calc/calc-yank.elc
-share/emacs/site-lisp/calc/calc.el
-share/emacs/site-lisp/calc/calc.elc
-share/emacs/site-lisp/calc/calccard.tex
-share/emacs/site-lisp/calc/macedit.el
-@dirrm share/emacs/site-lisp/calc
+${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