4 files changed, 51 insertions, 19 deletions

diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index ddc31e56acc7..555f54989c02 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=		auctex
-PORTVERSION=		9.9p
+PORTVERSION=		10.0g
 CATEGORIES=		print elisp
 MASTER_SITES=		${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/auctex
 
 MAINTAINER=		mkamm@gmx.net
 
+# NOTE: AUC TeX 10 requires Emacs version to be >= 20
 # EMACS_NAME must be 'emacs' or 'xemacs' - it is used for byte compiling
 #    emacs lisp files (*.el => *.elc)
 # EMACS_PORT is only used for dependency registration, the installed bits
diff --git a/print/auctex/distinfo b/print/auctex/distinfo
index 0ed66bb71a9b..82241b9861cf 100644
--- a/print/auctex/distinfo
+++ b/print/auctex/distinfo
@@ -1 +1 @@
-MD5 (auctex-9.9p.tar.gz) = d20c048f8f90c9281dbef4d51b707e09
+MD5 (auctex-10.0g.tar.gz) = 5b115bf49f79b63b9a71dec3301c4707
diff --git a/print/auctex/files/patch-aa b/print/auctex/files/patch-aa
index 644c7f98ec2e..fda55cfbb09f 100644
--- a/print/auctex/files/patch-aa
+++ b/print/auctex/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Feb 11 11:19:48 1999
-+++ Makefile	Sun Nov 21 16:41:46 1999
+--- Makefile.orig	Wed Apr 11 13:54:00 2001
++++ Makefile	Thu Apr 19 20:32:08 2001
 @@ -10,7 +10,7 @@
  ##----------------------------------------------------------------------
  
@@ -35,7 +35,7 @@
  
  ##----------------------------------------------------------------------
  ##  BELOW THIS LINE ON YOUR OWN RISK!
-@@ -115,7 +118,7 @@
+@@ -118,7 +121,7 @@
  # 	$(ELC) hilit-LaTeX.el         # Doesn't compile without X
  
  install-lisp:	some
@@ -44,7 +44,7 @@
  	if [ -f $(lispdir)/tex-site.el ]; \
  	then \
  	    echo "Leaving old tex-site.el alone."; \
-@@ -123,10 +126,10 @@
+@@ -126,17 +129,17 @@
  	    sed -e 's#@AUCDIR#$(aucdir)/#' tex-site.el \
  	    > $(lispdir)/tex-site.el ; \
          fi
@@ -57,10 +57,18 @@
  	                                 else true; fi ; \
  	    $(MV) $(AUCELC) $(aucdir) ; \
  	    $(MV) style/*.elc $(aucdir)/style ; \
-@@ -189,9 +192,9 @@
- 	-(cd style; cvs add `echo $(STYLESRC) | sed -e s@style/@@g` )
- 	cvs commit -m "Release $(TAG)"
- 	cvs tag release_`echo $(TAG) | sed -e 's/[.]/_/g'`
+ 	    $(CP) $(AUCSRC) $(aucdir) ; \
+ 	    $(CP) style/*.el $(aucdir)/style ; \
+ 	    touch $(aucdir)/style/.nosearch ; \
+-	    if [ ! -d $(aucdir)/auto ]; then mkdir $(aucdir)/auto; \
++	    if [ ! -d $(aucdir)/auto ]; then $(MKDIR) $(aucdir)/auto; \
+ 	                                else true; fi ; \
+ 	    touch $(aucdir)/auto/.nosearch ; \
+ 	else \
+@@ -196,9 +199,9 @@
+ 	-(cd style; auc add `echo $(STYLESRC) | sed -e s@style/@@g` )
+ 	auc commit -m 'Release_$(TAG)'
+ 	auc tag release_`echo $(TAG) | sed -e 's/[.]/_/g'`
 -	mkdir auctex-$(TAG) 
 -	mkdir auctex-$(TAG)/style
 -	mkdir auctex-$(TAG)/doc 
@@ -69,4 +77,4 @@
 +	$(MKDIR) auctex-$(TAG)/doc 
  	cp $(AUCSRC) $(EXTRAFILES) auctex-$(TAG)
  	cp $(STYLESRC) auctex-$(TAG)/style
- 	cp $(DOCFILES)  auctex-$(TAG)/doc
+ 	touch auctex-$(TAG)/style/.nosearch
diff --git a/print/auctex/pkg-plist b/print/auctex/pkg-plist
index 325d2c952ea2..789aefa44335 100644
--- a/print/auctex/pkg-plist
+++ b/print/auctex/pkg-plist
@@ -11,18 +11,13 @@ share/doc/auctex/README
 share/emacs/site-lisp/tex-site.el
 share/emacs/site-lisp/auctex/auc-old.el
 share/emacs/site-lisp/auctex/auc-old.elc
+share/emacs/site-lisp/auctex/auto/.nosearch
+@dirrm share/emacs/site-lisp/auctex/auto
 share/emacs/site-lisp/auctex/latex.el
 share/emacs/site-lisp/auctex/latex.elc
 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.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/.nosearch
 share/emacs/site-lisp/auctex/style/amsart.el
 share/emacs/site-lisp/auctex/style/amsart.elc
 share/emacs/site-lisp/auctex/style/amsbook.el
@@ -55,12 +50,20 @@ 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/fancyref.el
+share/emacs/site-lisp/auctex/style/fancyref.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/graphics.el
+share/emacs/site-lisp/auctex/style/graphics.elc
+share/emacs/site-lisp/auctex/style/graphicx.el
+share/emacs/site-lisp/auctex/style/graphicx.elc
 share/emacs/site-lisp/auctex/style/harvard.el
 share/emacs/site-lisp/auctex/style/harvard.elc
+share/emacs/site-lisp/auctex/style/index.el
+share/emacs/site-lisp/auctex/style/index.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
@@ -77,8 +80,16 @@ 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/makeidx.el
+share/emacs/site-lisp/auctex/style/makeidx.elc
+share/emacs/site-lisp/auctex/style/mdwlist.el
+share/emacs/site-lisp/auctex/style/mdwlist.elc
+share/emacs/site-lisp/auctex/style/multind.el
+share/emacs/site-lisp/auctex/style/multind.elc
 share/emacs/site-lisp/auctex/style/natbib.el
 share/emacs/site-lisp/auctex/style/natbib.elc
+share/emacs/site-lisp/auctex/style/ngerman.el
+share/emacs/site-lisp/auctex/style/ngerman.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
@@ -93,7 +104,19 @@ 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/varioref.el
+share/emacs/site-lisp/auctex/style/varioref.elc
 share/emacs/site-lisp/auctex/style/virtex.el
 share/emacs/site-lisp/auctex/style/virtex.elc
 @dirrm share/emacs/site-lisp/auctex/style
+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-mik.el
+share/emacs/site-lisp/auctex/tex-mik.elc
+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
 @dirrm share/emacs/site-lisp/auctex