- Update to 11.14

PR:		ports/67043
Submitted by:	KIMURA Yasuhiro <yasu@utahime.org>

7 files changed, 75 insertions, 29 deletions

diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index ea897e6f14ad..3aac2c4a6bc9 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=		auctex
-PORTVERSION=		11.13
+PORTVERSION=		11.14
 CATEGORIES=		print elisp
-MASTER_SITES=		${MASTER_SITE_SAVANNAH} \
-			http://wuarchive.wustl.edu/mirrors/gnu/auctex/ \
-			http://mirror.telentente.com/pub/gnu/auctex/
-MASTER_SITE_SUBDIR=	${PORTNAME}/stable.pkg/${PORTVERSION}
+MASTER_SITES=		${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=	Integrated environment for writing LaTeX using GNU Emacs
@@ -22,25 +20,22 @@ EMACS_PORT_NAME?=	emacs21
 EMACS_NO_RUN_DEPENDS=	yes
 LISPDIR=	${EMACS_SITE_LISPDIR}
 ALL_TARGET=	all contrib
-INSTALL_TARGET=	install install-contrib
+INSTALL_TARGET=	install install-contrib install-info
 MAKE_ARGS+=	lispdir=${PREFIX}/${LISPDIR}
 PLIST_SUB+=	LISPDIR=${LISPDIR}
 USE_REINPLACE=	yes
+INFO=		auctex
 
-# adjust a hardcoded '/usr/local' string
 post-patch:
-	@${ECHO_MSG} "===>  Substituting hardcoded '/usr/local' paths"
-	${REINPLACE_CMD} -e 's?/usr/local?${PREFIX}?g' ${WRKSRC}/tex.el
+	${REINPLACE_CMD} -e 's?%%PREFIX%%?${PREFIX}?g' ${WRKSRC}/tex.el
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/auctex
+	${MKDIR} ${DOCSDIR}
 .for file in CHANGES INSTALLATION README
-	${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/share/doc/auctex
+	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
-	cd ${WRKSRC} &&  ${SETENV} ${MAKE_ENV} ${MAKE} install-info >/dev/null
-	install-info --entry='* AUC-Tex mode: (auctex).	Emacs mode for editing TeX and LaTeX files.' --section='TeX' ${PREFIX}/info/auctex ${PREFIX}/info/dir
 .endif
-	@${CAT} ${PKGMESSAGE} | ${SED} 's?/usr/local?${PREFIX}?g'
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/print/auctex/distinfo b/print/auctex/distinfo
index f5810c9d79c0..6e5c00c3d460 100644
--- a/print/auctex/distinfo
+++ b/print/auctex/distinfo
@@ -1,2 +1,2 @@
-MD5 (auctex-11.13.tar.gz) = 6abe89698b9f03bfbd8745794c06d4b6
-SIZE (auctex-11.13.tar.gz) = 294261
+MD5 (auctex-11.14.tar.gz) = 8b0dd6adedfd3c84f94e30b07011f0c9
+SIZE (auctex-11.14.tar.gz) = 296045
diff --git a/print/auctex/files/patch-ab b/print/auctex/files/patch-ab
index 134354744d27..326950c5dcdc 100644
--- a/print/auctex/files/patch-ab
+++ b/print/auctex/files/patch-ab
@@ -5,7 +5,7 @@
  ;; Change this to point to the place where the TeX macros are stored
  ;; at yourt site.
 -(defcustom TeX-macro-global '("/usr/local/lib/texmf/tex/")
-+(defcustom TeX-macro-global '("/usr/local/share/texmf/tex/")
++(defcustom TeX-macro-global '("%%PREFIX%%/share/texmf/tex/")
    "Directories containing the sites TeX macro files and style files.
  The directory names *must* end with a slash."
    :group 'TeX-file
diff --git a/print/auctex/files/patch-doc-Makefile b/print/auctex/files/patch-doc-Makefile
new file mode 100644
index 000000000000..65b907f16945
--- /dev/null
+++ b/print/auctex/files/patch-doc-Makefile
@@ -0,0 +1,46 @@
+--- doc/Makefile.dist	Sun Dec 15 11:15:43 2002
++++ doc/Makefile	Sat May 22 22:32:39 2004
+@@ -1,10 +1,9 @@
+-
+-infodir=/usr/local/info
++MKDIR=mkdir -p -m 0755
+ TEX=tex
+ 
+-all: auc-tex.dvi tex-ref.dvi math-ref.dvi auctex
++all: auc-tex.dvi tex-ref.dvi math-ref.dvi auctex.info
+ 
+-dist: auctex INSTALLATION README CHANGES auc-tex_toc.html auc-tex.ps
++dist: auctex.info INSTALLATION README CHANGES auc-tex_toc.html auc-tex.ps
+ 
+ auc-tex_toc.html: auc-tex.texi
+ 	texi2html -split_node auc-tex.texi
+@@ -38,8 +37,8 @@
+ auc-tex.ps: auc-tex.dvi
+ 	dvips auc-tex.dvi -o auc-tex.ps
+ 
+-auctex: auc-tex.texi install.texi intro.texi changes.texi
+-	-makeinfo auc-tex.texi
++auctex.info: auc-tex.texi install.texi intro.texi changes.texi
++	-makeinfo --no-split auc-tex.texi
+ 	@echo "**********************************************************"
+ 	@echo "** If this gave trouble, maybe you need to install"
+ 	@echo "** a newer version of texinfo?"
+@@ -57,14 +56,10 @@
+ HISTORY: history.texi
+ 	-makeinfo --no-headers history.texi --output HISTORY
+ 
+-install: auctex
+-	-mkdir -p $(infodir)
+-	cp auctex auctex-* $(infodir)
+-	@echo "**********************************************************"
+-	@echo "** The \`auctex' info files are now installed."
+-	@echo "** Edit \`$(infodir)/dir'"
+-	@echo "** to add an entry for file \`auctex'"
+-	@echo "**********************************************************"
++install: auctex.info
++	$(MKDIR) $(infodir)
++	$(BSD_INSTALL_DATA) auctex.info $(infodir)
++	install-info $(infodir)/auctex.info $(infodir)/dir
+ 
+ clean: allways
+ 	rm -f *.dvi *.ps *.aux *.cp *.fn *.info *.ky *.log *~ \#*\# *.tp *.vr *.pg *.toc *.tp *.bak *.cps *.kys *.tps *.fns *.vrs *.pgs auctex auctex-? *.html INSTALLATION README CHANGES
diff --git a/print/auctex/files/patch-doc-auc-tex.texi b/print/auctex/files/patch-doc-auc-tex.texi
new file mode 100644
index 000000000000..7c04c4dc47af
--- /dev/null
+++ b/print/auctex/files/patch-doc-auc-tex.texi
@@ -0,0 +1,11 @@
+--- doc/auc-tex.texi.dist	Sun Dec 15 11:15:43 2002
++++ doc/auc-tex.texi	Sat May 22 22:13:03 2004
+@@ -1,6 +1,7 @@
+ \input texinfo
+-@setfilename auctex
++@setfilename auctex.info
+ @settitle AUC TeX
++@dircategory TeX
+ @direntry
+ * AUCTeX: (auctex).      A much enhanced LaTeX mode for GNU Emacs.
+ @end direntry
diff --git a/print/auctex/pkg-message b/print/auctex/pkg-message
index a32befd5c5ad..6e6fa90ee783 100644
--- a/print/auctex/pkg-message
+++ b/print/auctex/pkg-message
@@ -2,9 +2,9 @@
 Customizing
 ===========
    Next, you should edit the file
-`/usr/local/share/emacs/site-lisp/tex-site.el' to fit your local site.
+`${PREFIX}/share/emacs/site-lisp/tex-site.el' to fit your local site.
 You do this by looking at the customization section in the beginning
-of `/usr/local/share/emacs/site-lisp/auctex/tex.el' and copy the
+of `${PREFIX}/share/emacs/site-lisp/auctex/tex.el' and copy the
 definitions that are wrong for your site to `tex-site.el'.  Do *not*
 edit `tex.el' directly, or you will have to do all the work over again
 when you upgrade AUC TeX.  AUC TeX will not overwrite your old
diff --git a/print/auctex/pkg-plist b/print/auctex/pkg-plist
index 4e112ff1ef0a..83a9021dbf8f 100644
--- a/print/auctex/pkg-plist
+++ b/print/auctex/pkg-plist
@@ -1,13 +1,7 @@
-@unexec install-info --delete --entry='* AUC-Tex mode: (auctex).	Emacs mode for editing TeX and LaTeX files.' --section='TeX' %D/info/auctex %D/info/dir
-info/auctex
-info/auctex-1
-info/auctex-2
-info/auctex-3
-@exec install-info --entry='* AUC-Tex mode: (auctex).	Emacs mode for editing TeX and LaTeX files.' --section='TeX' %D/info/auctex %D/info/dir
-share/doc/auctex/CHANGES
-share/doc/auctex/INSTALLATION
-share/doc/auctex/README
-@dirrm share/doc/auctex
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/INSTALLATION
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%LISPDIR%%/tex-site.el
 %%LISPDIR%%/auctex/auc-old.el
 %%LISPDIR%%/auctex/auc-old.elc