Update to 2.6

PR:		52564
Submitted by:	Roland Jesse <roland.jesse@gmx.net>

6 files changed, 17 insertions, 34 deletions

diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index 1d18b3553789..e29080df5aa9 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -6,21 +6,27 @@
 #
 
 PORTNAME=	Hyperlatex
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.cs.uni-magdeburg.de/pub/ipe/
+MASTER_SITES=	http://www.cs.uu.nl/~otfried/Hyperlatex/
 
 MAINTAINER=	witr@rwwa.com
 COMMENT=	Produce HTML and printed documents from LaTeX source
 
-BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs20
-RUN_DEPENDS=	emacs:${PORTSDIR}/editors/emacs20 \
-		latex:${PORTSDIR}/print/latex
+BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs21
+RUN_DEPENDS=	emacs:${PORTSDIR}/editors/emacs21 \
+		latex:${PORTSDIR}/print/teTeX \
+		ppmtogif:${PORTSDIR}/graphics/netpbm
 
+USE_REINPLACE=	yes
 LATEX_DIR=	${PREFIX}/share/texmf/tex/latex
 HYPERLATEX_DIR=	${PREFIX}/share/texmf/tex/latex/hyperlatex
 
+do-configure:
+	@(cd ${WRKSRC} && \
+	${REINPLACE_CMD} -e 's|http://www.cs.uu.nl/\\~{}otfried/img/||' siteinit.hlx && \
+	${REINPLACE_CMD} -e 's|$$HOME/Hyperlatex/Hlx|${PREFIX}/share/texmf/tex/latex/hyperlatex|' hyperlatex)
+
 do-build:
 	cd ${WRKSRC}; emacs -batch -q -no-site-file -l hyperlatex.el -f hyperlatex-compile
 
diff --git a/print/hyperlatex/distinfo b/print/hyperlatex/distinfo
index 79e525a9d5ab..47c0caafdad9 100644
--- a/print/hyperlatex/distinfo
+++ b/print/hyperlatex/distinfo
@@ -1 +1 @@
-MD5 (Hyperlatex-2.5.tar.gz) = df1da9ffd46c9b3f6a15b792d66ca7a4
+MD5 (Hyperlatex-2.6.tar.gz) = b1d48a3b76ce5f5daf38bf69312cfddd
diff --git a/print/hyperlatex/files/patch-aa b/print/hyperlatex/files/patch-aa
deleted file mode 100644
index ff8275601a9c..000000000000
--- a/print/hyperlatex/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- siteinit.hlx~	Tue Sep 15 13:42:22 1998
-+++ siteinit.hlx	Mon Aug  2 12:49:53 1999
-@@ -11,7 +11,7 @@
- %% This should be the URL for the icons used in the navigation panels
- %% must end with a slash, unless you leave it empty
- %% (empty means the icons are in the same directory as the HTML file)
--\newcommand{\HlxIcons}{http://www.cs.ust.hk/\~{}otfried/img/}
-+\newcommand{\HlxIcons}{}
- 
- %%
- %% ----------------------------------------------------------------------
diff --git a/print/hyperlatex/files/patch-ab b/print/hyperlatex/files/patch-ab
deleted file mode 100644
index 1f7c849e25eb..000000000000
--- a/print/hyperlatex/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- hyperlatex~	Tue Sep 15 13:42:23 1998
-+++ hyperlatex	Mon Aug  2 12:58:49 1999
-@@ -7,7 +7,7 @@
- ## Edit the following line to reflect your choice of the
- ## Hyperlatex directory:
- 
--  HYPERLATEX_DIR="$HOME/Hyperlatex/Hlx"
-+  HYPERLATEX_DIR="/usr/local/share/texmf/tex/latex/hyperlatex"
- 
-   export HYPERLATEX_DIR
- fi
diff --git a/print/hyperlatex/pkg-descr b/print/hyperlatex/pkg-descr
index 4c06418ed5c7..42c4d137242d 100644
--- a/print/hyperlatex/pkg-descr
+++ b/print/hyperlatex/pkg-descr
@@ -12,6 +12,6 @@ The basic idea of Hyperlatex is to make it possible to write a
 document that will look like a flawless LaTeX document when printed
 and like a handwritten HTML document when viewed with an HTML browser.
 
-WWW: http://www.cs.ust.hk/~otfried/Hyperlatex/
+WWW: http://www.cs.uu.nl/~otfried/Hyperlatex/
 
 -- Robert Withrow <witr@rwwa.com>
diff --git a/print/hyperlatex/pkg-plist b/print/hyperlatex/pkg-plist
index 5a3db4e959e4..f62610cdbdb7 100644
--- a/print/hyperlatex/pkg-plist
+++ b/print/hyperlatex/pkg-plist
@@ -7,19 +7,16 @@ share/texmf/tex/latex/hyperlatex/bluepanels.hlx
 share/texmf/tex/latex/hyperlatex/book.hlx
 share/texmf/tex/latex/hyperlatex/color.hlx
 share/texmf/tex/latex/hyperlatex/colortbl.hlx
-share/texmf/tex/latex/hyperlatex/cppdoc.hlx
 share/texmf/tex/latex/hyperlatex/dutch.hlx
 share/texmf/tex/latex/hyperlatex/english.hlx
 share/texmf/tex/latex/hyperlatex/fancyhdr.hlx
 share/texmf/tex/latex/hyperlatex/frames.hlx
 share/texmf/tex/latex/hyperlatex/french.hlx
 share/texmf/tex/latex/hyperlatex/german.hlx
-share/texmf/tex/latex/hyperlatex/hyperlatex.el
-share/texmf/tex/latex/hyperlatex/hyperlatex.elc
+share/texmf/tex/latex/hyperlatex/hyperxml.hlx
 share/texmf/tex/latex/hyperlatex/italian.hlx
 share/texmf/tex/latex/hyperlatex/longtable.hlx
 share/texmf/tex/latex/hyperlatex/makeidx.hlx
-share/texmf/tex/latex/hyperlatex/normalize-eps.awk
 share/texmf/tex/latex/hyperlatex/portuges.hlx
 share/texmf/tex/latex/hyperlatex/pstcol.hlx
 share/texmf/tex/latex/hyperlatex/report.hlx
@@ -27,4 +24,6 @@ share/texmf/tex/latex/hyperlatex/sequential.hlx
 share/texmf/tex/latex/hyperlatex/simplepanels.hlx
 share/texmf/tex/latex/hyperlatex/siteinit.hlx
 share/texmf/tex/latex/hyperlatex/tabularx.hlx
+share/texmf/tex/latex/hyperlatex/hyperlatex.el
+share/texmf/tex/latex/hyperlatex/hyperlatex.elc
 @dirrm share/texmf/tex/latex/hyperlatex