* Remove dependency to teTeX. Auctex can be installed fine without any teTeX

  installed.  This addresses PR20532 by Christopher Richards <richards plus
  netbsd at CS dot Princeton dot EDU>

* Fix compilation for FSF Emacs 20.7.

The resulting binary package will have a different dependency info, so
different package content, so revision bump.

4 files changed, 42 insertions, 11 deletions

diff --git a/print/auctex/MESSAGE b/print/auctex/MESSAGE
index 11333f29209..d263aaf8c49 100644
--- a/print/auctex/MESSAGE
+++ b/print/auctex/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/16 03:31:26 uebayasi Exp $
+$NetBSD: MESSAGE,v 1.3 2003/03/01 03:49:50 uebayasi Exp $
 
 To customize AUC TeX you will need to edit the file
 
@@ -14,6 +14,13 @@ You may then put
 
 	(require 'tex-site)
 
-in you `.emacs.el' file.
+in your `${HOME}/.emacs.el' file.
+
+If your site TeX macro files and style files are put elsewhere than
+`${PREFIX}/share/texmf/tex', set `TeX-macro-global' to the directory in
+your `${HOME}/.emacs.el' file.
+
+	;;; Note that the directory name must end with a slash!
+	(setq TeX-macro-global "/home/foo/my/tex/")
 
 ===========================================================================
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 68fda42f1d7..05759d912dd 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/01/28 22:04:00 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/01 03:49:50 uebayasi Exp $
 
 DISTNAME=		auctex-11.13
+PKGREVISION=		1
 CATEGORIES=		print
 MASTER_SITES=		http://savannah.nongnu.org/download/auctex/stable.pkg/11.13/
 
@@ -8,8 +9,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.nongnu.org/auctex/
 COMMENT=		Enhanced LaTeX mode for Emacs
 
-DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
-
 USE_GMAKE=		yes
 USE_PKGINSTALL=		yes
 
diff --git a/print/auctex/distinfo b/print/auctex/distinfo
index b0991f2591c..c8fee7f4a1f 100644
--- a/print/auctex/distinfo
+++ b/print/auctex/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2003/01/11 10:02:03 uebayasi Exp $
+$NetBSD: distinfo,v 1.6 2003/03/01 03:49:50 uebayasi Exp $
 
 SHA1 (auctex-11.13.tar.gz) = 82004bc64a040cda9455356faab4b8c6866f2d49
 Size (auctex-11.13.tar.gz) = 294261 bytes
-SHA1 (patch-aa) = 4497d9f4d1e322af3aa4f558a4d39d4a7ec49590
+SHA1 (patch-aa) = 1b47ebf2a491cb0004f738058850cf010d3b2286
 SHA1 (patch-ab) = 08e32149fd6aa7d26c21f1881acdab54ce51b950
 SHA1 (patch-ac) = dc9ffad89255362ece66a446bcce6599d2595fb6
diff --git a/print/auctex/patches/patch-aa b/print/auctex/patches/patch-aa
index e585a11fcfa..04fc9900617 100644
--- a/print/auctex/patches/patch-aa
+++ b/print/auctex/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2003/01/11 10:02:04 uebayasi Exp $
+$NetBSD: patch-aa,v 1.5 2003/03/01 03:49:51 uebayasi Exp $
 
 --- Makefile.orig	Mon Nov 25 23:43:16 2002
 +++ Makefile
@@ -20,12 +20,37 @@ $NetBSD: patch-aa,v 1.4 2003/01/11 10:02:04 uebayasi Exp $
  
  ##----------------------------------------------------------------------
  ## YOU MAY NEED TO EDIT THESE
-@@ -112,7 +112,7 @@
+@@ -108,17 +108,17 @@
+ all:	lisp
  
- some:	$(AUCELC) $(STYLESRC:.el=.elc)
+ lisp:
+-	$(ELC) $(AUCSRC) $(STYLESRC)
++	-$(ELC) $(AUCSRC) $(STYLESRC)
+ 
+-some:	$(AUCELC) $(STYLESRC:.el=.elc)
++some:	-$(AUCELC) $(STYLESRC:.el=.elc)
  
 -install:	install-lisp
 +install:	install-lisp install-info
  
  contrib:
- 	$(ELC) bib-cite.el
+-	$(ELC) bib-cite.el
+-	$(ELC) font-latex.el
+-# 	$(ELC) tex-jp.el              # Doesn't compile without MULE
+-# 	$(ELC) hilit-LaTeX.el         # Doesn't compile without X
++	-$(ELC) bib-cite.el
++	-$(ELC) font-latex.el
++# 	-$(ELC) tex-jp.el              # Doesn't compile without MULE
++# 	-$(ELC) hilit-LaTeX.el         # Doesn't compile without X
+ 
+ install-lisp:	some
+ 	if [ ! -d $(lispdir) ]; then mkdir $(lispdir); else true; fi ;
+@@ -159,7 +159,7 @@
+ 
+ 
+ .el.elc:
+-	$(ELC) $<
++	-$(ELC) $<
+ 
+ clean:
+ 	rm -rf *~ #*# lex.yy.c idetex auctex