Added support for XEmacs.

5 files changed, 160 insertions, 145 deletions

diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 049321a9e4c..54a67ae2c75 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,54 +1,60 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:51:37 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/01 18:50:05 jtb Exp $
 
-DISTNAME=		auctex-9.9p
-CATEGORIES=		print
-MASTER_SITES=		ftp://ftp.sunsite.auc.dk/pub/emacs/auctex/ftp/auctex/
+DISTNAME=	auctex-9.9p
+CATEGORIES=	print
+MASTER_SITES=	ftp://ftp.sunsite.auc.dk/pub/emacs/auctex/ftp/auctex/
 
-MAINTAINER=		jtb@netbsd.org
-HOMEPAGE=		http://sunsite.auc.dk/auctex/
-COMMENT=		Enhanced LaTeX mode for Emacs
+MAINTAINER=	jtb@netbsd.org
+HOMEPAGE=	http://sunsite.auc.dk/auctex/
+COMMENT=	Enhanced LaTeX mode for Emacs
 
-DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
+DEPENDS+=	teTeX-[0-9]*:../../print/teTeX
 
-USE_GMAKE=		YES
-
-INFO_FILES+=		auctex
-
-EVAL_PREFIX+=		TEX_PREFIX=teTeX
+USE_GMAKE=	#defined
+EVAL_PREFIX+=	TEX_PREFIX=teTeX
 
 .if defined(USE_XEMACS)
-DEPENDS+=		xemacs-[0-9]*:../../editors/xemacs
-MAKE_ENV+=		EMACS=xemacs
+DEPENDS+=	xemacs-[0-9]*:../../editors/xemacs
+MAKE_ENV+=	EMACS=xemacs
+LISPDIR=	lib/xemacs/xemacs-packages/lisp
+INFODIR=	lib/xemacs/xemacs-packages/info
 .else
-DEPENDS+=		emacs-[0-9]*:../../editors/emacs
+DEPENDS+=	emacs-[0-9]*:../../editors/emacs
+MAKE_ENV+=	EMACS=emacs
+LISPDIR=	share/emacs/site-lisp
+INFODIR=	info
+INFO_FILES+=	auctex
 .endif
 
+PLIST_SUBST+=	LISPDIR=${LISPDIR} INFODIR=${INFODIR}
+
 post-patch:
-	@for t in ${WRKSRC}/tex-site.el ; do \
-	${SED} -e 's:%%PREFIX%%:'${PREFIX}':g;s:%%TEX_PREFIX%%:'${TEX_PREFIX}':g' \
-	< $$t > $$t.tmp && ${MV} $$t.tmp $$t ; done
-	@${CP} ${WRKSRC}/tex-site.el ${WRKSRC}/tex-site.el.dist
+	@for t in ${WRKSRC}/tex-site.el; do			\
+	${SED} -e 's:@LISPDIR@:'${LISPDIR}':g'			\
+		-e 's:@TEX_PREFIX@:'${TEX_PREFIX}':g'		\
+		< $$t > $$t.tmp && ${MV} $$t.tmp $$t;		\
+	done
+	${CP} ${WRKSRC}/tex-site.el ${WRKSRC}/tex-site.el.dist
 
 post-build:
-	@${RM} -fr ${WRKSRC}/doc/auctex*
-	@cd ${WRKSRC}/doc && ${MAKE} auctex
+	${RM} -f ${WRKSRC}/doc/auctex*
+	cd ${WRKSRC}/doc && ${MAKE} auctex
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp/auctex
-	${INSTALL_DATA} ${WRKSRC}/tex-site.el ${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKSRC}/tex-site.el.dist \
-	${PREFIX}/share/emacs/site-lisp
-.if !exists(${PREFIX}/share/emacs/site-lisp/tex-site.el)
-	${INSTALL_DATA} ${WRKSRC}/tex-site.el ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}/auctex
+	${INSTALL_DATA} ${WRKSRC}/tex-site.el ${PREFIX}/${LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/tex-site.el.dist ${PREFIX}/${LISPDIR}
+.if !exists(${PREFIX}/${LISPDIR}/tex-site.el)
+	${INSTALL_DATA} ${WRKSRC}/tex-site.el ${PREFIX}/${LISPDIR}
 .endif
-	@for e in auc-old.el bib-cite.el font-latex.el hilit-LaTeX.el \
+	@for e in auc-old.el bib-cite.el font-latex.el hilit-LaTeX.el	   \
 	latex.el lpath.el multi-prompt.el tex-buf.el tex-info.el tex-jp.el \
-	tex.el texmathp.el ; do \
-	${INSTALL_DATA} ${WRKSRC}/$$e* ${PREFIX}/share/emacs/site-lisp/auctex; \
+	tex.el texmathp.el; do						   \
+	i="${INSTALL_DATA} ${WRKSRC}/$$e* ${PREFIX}/${LISPDIR}/auctex/";   \
+	${ECHO} $$i; $$i;						   \
 	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp/auctex/style
-	${INSTALL_DATA} ${WRKSRC}/style/*.el* \
-	${PREFIX}/share/emacs/site-lisp/auctex/style
-	${INSTALL_DATA} ${WRKSRC}/doc/auctex* ${PREFIX}/info
+	${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}/auctex/style
+	${INSTALL_DATA} ${WRKSRC}/style/*.el* ${PREFIX}/${LISPDIR}/auctex/style
+	${INSTALL_DATA} ${WRKSRC}/doc/auctex* ${PREFIX}/${INFODIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/auctex/files/patch-sum b/print/auctex/files/patch-sum
index dc1965bb2ac..ae579d4edc3 100644
--- a/print/auctex/files/patch-sum
+++ b/print/auctex/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/12/02 07:49:27 jtb Exp $
+$NetBSD: patch-sum,v 1.2 2001/03/01 18:50:06 jtb Exp $
 
-MD5 (patch-aa) = e27ba9370299d6b808cb8179d03058ae
+MD5 (patch-aa) = 779904f643000532737e47032837fc1b
 MD5 (patch-ab) = 2608eaafcd2e8109f0b126c6e59c8059
-MD5 (patch-ac) = b8cffe978c7b67d248dde6ba4d45171e
+MD5 (patch-ac) = a106a5bde0b5b9c984e728a7d08c3642
diff --git a/print/auctex/patches/patch-aa b/print/auctex/patches/patch-aa
index 0bd56672bb4..888b75c5d20 100644
--- a/print/auctex/patches/patch-aa
+++ b/print/auctex/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/02 07:49:27 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/01 18:50:06 jtb Exp $
 
---- Makefile.orig	Sun Nov  5 20:54:41 2000
+--- Makefile.orig	Thu Feb 11 10:19:48 1999
 +++ Makefile
 @@ -10,7 +10,7 @@
  ##----------------------------------------------------------------------
@@ -11,7 +11,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/02 07:49:27 jtb Exp $
  
  # Where info files go.
  infodir = $(prefix)/info
-@@ -109,7 +109,7 @@
+@@ -22,7 +22,7 @@
+ aucdir=$(lispdir)/auctex
+ 
+ # Name of your emacs binary
+-EMACS=emacs
++#EMACS=emacs
+ 
+ ##----------------------------------------------------------------------
+ ## YOU MAY NEED TO EDIT THESE
+@@ -106,7 +106,7 @@
  
  some:	$(AUCELC) $(STYLESRC:.el=.elc)
  
diff --git a/print/auctex/patches/patch-ac b/print/auctex/patches/patch-ac
index 4245a6ff783..93b937de695 100644
--- a/print/auctex/patches/patch-ac
+++ b/print/auctex/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/02 07:49:27 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2001/03/01 18:50:06 jtb Exp $
 
 --- tex-site.el.orig	Sat Dec  2 07:30:00 2000
 +++ tex-site.el
@@ -7,10 +7,10 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/12/02 07:49:27 jtb Exp $
  ;; insert them here.
  
 -(defvar TeX-lisp-directory "@AUCDIR"
-+(defvar TeX-lisp-directory "%%PREFIX%%/share/emacs/site-lisp/auctex/"
++(defvar TeX-lisp-directory "@LISPDIR@/auctex/"
    "*The directory where the AUC TeX lisp files are located.")
 +
-+(defvar TeX-macro-global '("%%TEX_PREFIX%%/share/texmf/tex/")
++(defvar TeX-macro-global '("@TEX_PREFIX@/share/texmf/tex/")
 +  "Directories containing the sites TeX macro files and style files.
 +   The directory names *must* end with a slash.")
  
diff --git a/print/auctex/pkg/PLIST b/print/auctex/pkg/PLIST
index 8158717ada1..fd5371de199 100644
--- a/print/auctex/pkg/PLIST
+++ b/print/auctex/pkg/PLIST
@@ -1,101 +1,101 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/02 07:49:26 jtb Exp $
-@unexec install-info --delete --info-dir=%D/info %D/info/auctex
-info/auctex
-info/auctex-1
-info/auctex-2
-info/auctex-3
-@exec install-info --info-dir=%D/info %D/info/auctex
-share/emacs/site-lisp/auctex/auc-old.el
-share/emacs/site-lisp/auctex/auc-old.elc
-share/emacs/site-lisp/auctex/bib-cite.el
-share/emacs/site-lisp/auctex/font-latex.el
-share/emacs/site-lisp/auctex/hilit-LaTeX.el
-share/emacs/site-lisp/auctex/latex.el
-share/emacs/site-lisp/auctex/latex.elc
-share/emacs/site-lisp/auctex/lpath.el
-share/emacs/site-lisp/auctex/multi-prompt.el
-share/emacs/site-lisp/auctex/multi-prompt.elc
-share/emacs/site-lisp/auctex/tex-buf.el
-share/emacs/site-lisp/auctex/tex-buf.elc
-share/emacs/site-lisp/auctex/tex-info.el
-share/emacs/site-lisp/auctex/tex-info.elc
-share/emacs/site-lisp/auctex/tex-jp.el
-share/emacs/site-lisp/auctex/tex.el
-share/emacs/site-lisp/auctex/tex.elc
-share/emacs/site-lisp/auctex/texmathp.el
-share/emacs/site-lisp/auctex/texmathp.elc
-share/emacs/site-lisp/auctex/style/amsart.el
-share/emacs/site-lisp/auctex/style/amsart.elc
-share/emacs/site-lisp/auctex/style/amsbook.el
-share/emacs/site-lisp/auctex/style/amsbook.elc
-share/emacs/site-lisp/auctex/style/amsbsy.el
-share/emacs/site-lisp/auctex/style/amsbsy.elc
-share/emacs/site-lisp/auctex/style/amsmath.el
-share/emacs/site-lisp/auctex/style/amsmath.elc
-share/emacs/site-lisp/auctex/style/amsopn.el
-share/emacs/site-lisp/auctex/style/amsopn.elc
-share/emacs/site-lisp/auctex/style/amstex.el
-share/emacs/site-lisp/auctex/style/amstex.elc
-share/emacs/site-lisp/auctex/style/amstext.el
-share/emacs/site-lisp/auctex/style/amstext.elc
-share/emacs/site-lisp/auctex/style/amsthm.el
-share/emacs/site-lisp/auctex/style/amsthm.elc
-share/emacs/site-lisp/auctex/style/article.el
-share/emacs/site-lisp/auctex/style/article.elc
-share/emacs/site-lisp/auctex/style/book.el
-share/emacs/site-lisp/auctex/style/book.elc
-share/emacs/site-lisp/auctex/style/czech.el
-share/emacs/site-lisp/auctex/style/czech.elc
-share/emacs/site-lisp/auctex/style/danish.el
-share/emacs/site-lisp/auctex/style/danish.elc
-share/emacs/site-lisp/auctex/style/dinbrief.el
-share/emacs/site-lisp/auctex/style/dinbrief.elc
-share/emacs/site-lisp/auctex/style/dk.el
-share/emacs/site-lisp/auctex/style/dk.elc
-share/emacs/site-lisp/auctex/style/dutch.el
-share/emacs/site-lisp/auctex/style/dutch.elc
-share/emacs/site-lisp/auctex/style/epsf.el
-share/emacs/site-lisp/auctex/style/epsf.elc
-share/emacs/site-lisp/auctex/style/foils.el
-share/emacs/site-lisp/auctex/style/foils.elc
-share/emacs/site-lisp/auctex/style/german.el
-share/emacs/site-lisp/auctex/style/german.elc
-share/emacs/site-lisp/auctex/style/harvard.el
-share/emacs/site-lisp/auctex/style/harvard.elc
-share/emacs/site-lisp/auctex/style/j-article.el
-share/emacs/site-lisp/auctex/style/j-article.elc
-share/emacs/site-lisp/auctex/style/j-book.el
-share/emacs/site-lisp/auctex/style/j-book.elc
-share/emacs/site-lisp/auctex/style/j-report.el
-share/emacs/site-lisp/auctex/style/j-report.elc
-share/emacs/site-lisp/auctex/style/jarticle.el
-share/emacs/site-lisp/auctex/style/jarticle.elc
-share/emacs/site-lisp/auctex/style/jbook.el
-share/emacs/site-lisp/auctex/style/jbook.elc
-share/emacs/site-lisp/auctex/style/jreport.el
-share/emacs/site-lisp/auctex/style/jreport.elc
-share/emacs/site-lisp/auctex/style/latexinfo.el
-share/emacs/site-lisp/auctex/style/latexinfo.elc
-share/emacs/site-lisp/auctex/style/letter.el
-share/emacs/site-lisp/auctex/style/letter.elc
-share/emacs/site-lisp/auctex/style/natbib.el
-share/emacs/site-lisp/auctex/style/natbib.elc
-share/emacs/site-lisp/auctex/style/plfonts.el
-share/emacs/site-lisp/auctex/style/plfonts.elc
-share/emacs/site-lisp/auctex/style/plhb.el
-share/emacs/site-lisp/auctex/style/plhb.elc
-share/emacs/site-lisp/auctex/style/psfig.el
-share/emacs/site-lisp/auctex/style/psfig.elc
-share/emacs/site-lisp/auctex/style/report.el
-share/emacs/site-lisp/auctex/style/report.elc
-share/emacs/site-lisp/auctex/style/slides.el
-share/emacs/site-lisp/auctex/style/slides.elc
-share/emacs/site-lisp/auctex/style/slovak.el
-share/emacs/site-lisp/auctex/style/slovak.elc
-share/emacs/site-lisp/auctex/style/swedish.el
-share/emacs/site-lisp/auctex/style/swedish.elc
-share/emacs/site-lisp/auctex/style/virtex.el
-share/emacs/site-lisp/auctex/style/virtex.elc
-share/emacs/site-lisp/tex-site.el.dist
-@dirrm share/emacs/site-lisp/auctex/style
-@dirrm share/emacs/site-lisp/auctex
+@comment $NetBSD: PLIST,v 1.2 2001/03/01 18:50:06 jtb Exp $
+@unexec install-info --delete --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex
+${INFODIR}/auctex
+${INFODIR}/auctex-1
+${INFODIR}/auctex-2
+${INFODIR}/auctex-3
+@exec install-info --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex
+${LISPDIR}/auctex/auc-old.el
+${LISPDIR}/auctex/auc-old.elc
+${LISPDIR}/auctex/bib-cite.el
+${LISPDIR}/auctex/font-latex.el
+${LISPDIR}/auctex/hilit-LaTeX.el
+${LISPDIR}/auctex/latex.el
+${LISPDIR}/auctex/latex.elc
+${LISPDIR}/auctex/lpath.el
+${LISPDIR}/auctex/multi-prompt.el
+${LISPDIR}/auctex/multi-prompt.elc
+${LISPDIR}/auctex/tex-buf.el
+${LISPDIR}/auctex/tex-buf.elc
+${LISPDIR}/auctex/tex-info.el
+${LISPDIR}/auctex/tex-info.elc
+${LISPDIR}/auctex/tex-jp.el
+${LISPDIR}/auctex/tex.el
+${LISPDIR}/auctex/tex.elc
+${LISPDIR}/auctex/texmathp.el
+${LISPDIR}/auctex/texmathp.elc
+${LISPDIR}/auctex/style/amsart.el
+${LISPDIR}/auctex/style/amsart.elc
+${LISPDIR}/auctex/style/amsbook.el
+${LISPDIR}/auctex/style/amsbook.elc
+${LISPDIR}/auctex/style/amsbsy.el
+${LISPDIR}/auctex/style/amsbsy.elc
+${LISPDIR}/auctex/style/amsmath.el
+${LISPDIR}/auctex/style/amsmath.elc
+${LISPDIR}/auctex/style/amsopn.el
+${LISPDIR}/auctex/style/amsopn.elc
+${LISPDIR}/auctex/style/amstex.el
+${LISPDIR}/auctex/style/amstex.elc
+${LISPDIR}/auctex/style/amstext.el
+${LISPDIR}/auctex/style/amstext.elc
+${LISPDIR}/auctex/style/amsthm.el
+${LISPDIR}/auctex/style/amsthm.elc
+${LISPDIR}/auctex/style/article.el
+${LISPDIR}/auctex/style/article.elc
+${LISPDIR}/auctex/style/book.el
+${LISPDIR}/auctex/style/book.elc
+${LISPDIR}/auctex/style/czech.el
+${LISPDIR}/auctex/style/czech.elc
+${LISPDIR}/auctex/style/danish.el
+${LISPDIR}/auctex/style/danish.elc
+${LISPDIR}/auctex/style/dinbrief.el
+${LISPDIR}/auctex/style/dinbrief.elc
+${LISPDIR}/auctex/style/dk.el
+${LISPDIR}/auctex/style/dk.elc
+${LISPDIR}/auctex/style/dutch.el
+${LISPDIR}/auctex/style/dutch.elc
+${LISPDIR}/auctex/style/epsf.el
+${LISPDIR}/auctex/style/epsf.elc
+${LISPDIR}/auctex/style/foils.el
+${LISPDIR}/auctex/style/foils.elc
+${LISPDIR}/auctex/style/german.el
+${LISPDIR}/auctex/style/german.elc
+${LISPDIR}/auctex/style/harvard.el
+${LISPDIR}/auctex/style/harvard.elc
+${LISPDIR}/auctex/style/j-article.el
+${LISPDIR}/auctex/style/j-article.elc
+${LISPDIR}/auctex/style/j-book.el
+${LISPDIR}/auctex/style/j-book.elc
+${LISPDIR}/auctex/style/j-report.el
+${LISPDIR}/auctex/style/j-report.elc
+${LISPDIR}/auctex/style/jarticle.el
+${LISPDIR}/auctex/style/jarticle.elc
+${LISPDIR}/auctex/style/jbook.el
+${LISPDIR}/auctex/style/jbook.elc
+${LISPDIR}/auctex/style/jreport.el
+${LISPDIR}/auctex/style/jreport.elc
+${LISPDIR}/auctex/style/latexinfo.el
+${LISPDIR}/auctex/style/latexinfo.elc
+${LISPDIR}/auctex/style/letter.el
+${LISPDIR}/auctex/style/letter.elc
+${LISPDIR}/auctex/style/natbib.el
+${LISPDIR}/auctex/style/natbib.elc
+${LISPDIR}/auctex/style/plfonts.el
+${LISPDIR}/auctex/style/plfonts.elc
+${LISPDIR}/auctex/style/plhb.el
+${LISPDIR}/auctex/style/plhb.elc
+${LISPDIR}/auctex/style/psfig.el
+${LISPDIR}/auctex/style/psfig.elc
+${LISPDIR}/auctex/style/report.el
+${LISPDIR}/auctex/style/report.elc
+${LISPDIR}/auctex/style/slides.el
+${LISPDIR}/auctex/style/slides.elc
+${LISPDIR}/auctex/style/slovak.el
+${LISPDIR}/auctex/style/slovak.elc
+${LISPDIR}/auctex/style/swedish.el
+${LISPDIR}/auctex/style/swedish.elc
+${LISPDIR}/auctex/style/virtex.el
+${LISPDIR}/auctex/style/virtex.elc
+${LISPDIR}/tex-site.el.dist
+@dirrm ${LISPDIR}/auctex/style
+@dirrm ${LISPDIR}/auctex