- Update to 2.7

PR:		ports/72658
Submitted by:	David Bremner <bremner@unb.ca>

3 files changed, 46 insertions, 40 deletions

diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index 7cd128e..12fdd02 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	Hyperlatex
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 CATEGORIES=	print
-MASTER_SITES=	http://www.cs.uu.nl/~otfried/Hyperlatex/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=hyperlatex
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce HTML and printed documents from LaTeX source
@@ -19,23 +20,26 @@ RUN_DEPENDS=	emacs:${PORTSDIR}/editors/emacs \
 		ppmtogif:${PORTSDIR}/graphics/netpbm
 
 USE_REINPLACE=	yes
-LATEX_DIR=	${PREFIX}/share/texmf/tex/latex
-HYPERLATEX_DIR=	${PREFIX}/share/texmf/tex/latex/hyperlatex
+LATEX_DIR=	${PREFIX}/share/texmf/tex/latex/hyperlatex
+HYPERLATEX_DIR=	${PREFIX}/share/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)
+	${REINPLACE_CMD} -e 's|http://www.cs.uu.nl/\\~{}otfried/img/||' hlx/siteinit.hlx && \
+	${REINPLACE_CMD} -e 's|$$HOME/Hyperlatex/Hlx|${HYPERLATEX_DIR}|' bin/hyperlatex && \
+	${REINPLACE_CMD} -e '1s|^#$$|#\!/usr/bin/awk|' bin/normalize-eps.awk)
 
 do-build:
-	cd ${WRKSRC}; emacs -batch -q -no-site-file -l hyperlatex.el -f hyperlatex-compile
+	cd ${WRKSRC}/hlx; emacs -batch -q -no-site-file -l hyperlatex.el -f hyperlatex-compile
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/hyperlatex ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/ps2gif ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/hyperlatex.sty ${LATEX_DIR}
 	${MKDIR} ${HYPERLATEX_DIR}
-	cd ${WRKSRC}; for f in *.el *.elc *.hlx *.xbm *.awk ; do \
+	${MKDIR} ${LATEX_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/hyperlatex ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/ps2image ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/normalize-eps.awk ${PREFIX}/bin/normalize-eps
+	${INSTALL_DATA} ${WRKSRC}/etc/hyperlatex.sty ${LATEX_DIR}
+	cd ${WRKSRC}/hlx; for f in *.el *.elc *.hlx *.xbm *.awk ; do \
 	    if [ -f $$f ]; then ${INSTALL_DATA} $$f ${HYPERLATEX_DIR}; fi; done
 
 .include <bsd.port.mk>
diff --git a/print/hyperlatex/distinfo b/print/hyperlatex/distinfo
index 517d65b..cf2e950 100644
--- a/print/hyperlatex/distinfo
+++ b/print/hyperlatex/distinfo
@@ -1,2 +1,2 @@
-MD5 (Hyperlatex-2.6.tar.gz) = b1d48a3b76ce5f5daf38bf69312cfddd
-SIZE (Hyperlatex-2.6.tar.gz) = 86430
+MD5 (Hyperlatex-2.7.tar.gz) = 1d204f7985dfd0d7f314a6474e9eda39
+SIZE (Hyperlatex-2.7.tar.gz) = 108548
diff --git a/print/hyperlatex/pkg-plist b/print/hyperlatex/pkg-plist
index f62610c..2071233 100644
--- a/print/hyperlatex/pkg-plist
+++ b/print/hyperlatex/pkg-plist
@@ -1,29 +1,31 @@
 bin/hyperlatex
-bin/ps2gif
-share/texmf/tex/latex/hyperlatex.sty
-share/texmf/tex/latex/hyperlatex/article.hlx
-share/texmf/tex/latex/hyperlatex/babel.hlx
-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/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/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/portuges.hlx
-share/texmf/tex/latex/hyperlatex/pstcol.hlx
-share/texmf/tex/latex/hyperlatex/report.hlx
-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
+bin/ps2image
+bin/normalize-eps
+share/texmf/tex/latex/hyperlatex/hyperlatex.sty
+share/hyperlatex/article.hlx
+share/hyperlatex/babel.hlx
+share/hyperlatex/bluepanels.hlx
+share/hyperlatex/book.hlx
+share/hyperlatex/color.hlx
+share/hyperlatex/colortbl.hlx
+share/hyperlatex/dutch.hlx
+share/hyperlatex/english.hlx
+share/hyperlatex/fancyhdr.hlx
+share/hyperlatex/frames.hlx
+share/hyperlatex/french.hlx
+share/hyperlatex/german.hlx
+share/hyperlatex/hyperxml.hlx
+share/hyperlatex/italian.hlx
+share/hyperlatex/longtable.hlx
+share/hyperlatex/makeidx.hlx
+share/hyperlatex/portuges.hlx
+share/hyperlatex/pstcol.hlx
+share/hyperlatex/report.hlx
+share/hyperlatex/sequential.hlx
+share/hyperlatex/simplepanels.hlx
+share/hyperlatex/siteinit.hlx
+share/hyperlatex/tabularx.hlx
+share/hyperlatex/hyperlatex.el
+share/hyperlatex/hyperlatex.elc
 @dirrm share/texmf/tex/latex/hyperlatex
+@dirrm share/hyperlatex