- Update to 1.2.8

PR:		158472
Submitted by:	Ports Fury

4 files changed, 55 insertions, 33 deletions

diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile
index 809e8022342a..ae05c1b5f7ee 100644
--- a/graphics/epix/Makefile
+++ b/graphics/epix/Makefile
@@ -7,27 +7,50 @@
 #
 
 PORTNAME=	epix
-PORTVERSION=	1.2.7
-PORTREVISION=	2
+PORTVERSION=	1.2.8
 CATEGORIES=	graphics
 MASTER_SITES=	http://mathcs.holycross.edu/~ahwang/epix/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates math plots and line figures using easy-to-learn syntax
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		dvips:${PORTSDIR}/print/dvipsk-tetex \
-		latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	dvips:${PORTSDIR}/print/dvipsk-tetex \
+		latex-pgf>=0:${PORTSDIR}/print/latex-pgf \
+		latex:${PORTSDIR}/print/teTeX-base \
+		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		bash:${PORTSDIR}/shells/bash
+
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--prefix="${PREFIX}" --mandir="${PREFIX}/man" \
-		--infodir="${PREFIX}/info" --with-bash=${LOCALBASE}/bin/bash
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-bash=${LOCALBASE}/bin/bash \
+		--with-runtime=${CXX}
 
 MAN1=		elaps.1 epix.1 flix.1 laps.1
 INFO=		epix
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^install-data-am:/s|install-data-local||' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^install-data-am:/s|install-docDATA||' \
+		${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e '/usepackage/s|pstricks,xcolor|pstricks,tikz,xcolor|' \
+		${WRKSRC}/doc/manual.tex
+	@${REINPLACE_CMD} -e '/^install-data-am:/s|install-docDATA||' \
+		${WRKSRC}/samples/Makefile.in
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} install-data-local)
+	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} install-docDATA)
+	@(cd ${WRKSRC}/samples && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} install-docDATA)
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/epix/distinfo b/graphics/epix/distinfo
index c79b3fa83522..7d17d9ca19a2 100644
--- a/graphics/epix/distinfo
+++ b/graphics/epix/distinfo
@@ -1,3 +1,2 @@
-MD5 (epix-1.2.7.tar.bz2) = bbd83e83148f572dc64d3c737ceaa49b
-SHA256 (epix-1.2.7.tar.bz2) = b114393fd7b1457b280b66ed9ea75ce795e6c54159803ce186d573fbbf028880
-SIZE (epix-1.2.7.tar.bz2) = 494954
+SHA256 (epix-1.2.8.tar.bz2) = 8d8f2b5360f6c2ec28c9b2428ba8c56047b9f2ce1272012edc7b5ee91cd82021
+SIZE (epix-1.2.8.tar.bz2) = 493856
diff --git a/graphics/epix/pkg-descr b/graphics/epix/pkg-descr
index 382c361b1952..311844635076 100644
--- a/graphics/epix/pkg-descr
+++ b/graphics/epix/pkg-descr
@@ -6,4 +6,4 @@ Because the output is plain text, the output can be edited manually if
 necessary. However, for most visual tweaking it is easier and safer to change
 the source and re-run ePiX.
 
-WWW: http://mathcs.holycross.edu/~ahwang/current/ePiX.html
+WWW: http://mathcs.holycross.edu/~ahwang/epix/ePiX.html
diff --git a/graphics/epix/pkg-plist b/graphics/epix/pkg-plist
index 70af357c3e4b..c79b7ca246ab 100644
--- a/graphics/epix/pkg-plist
+++ b/graphics/epix/pkg-plist
@@ -90,24 +90,24 @@ include/epix/utils.h
 include/epix/verbatim.h
 lib/epix/epix-lib.sh
 lib/epix/libepix.a
-%%DOCSDIR%%/config/bash_completions
-%%DOCSDIR%%/config/epix.el
-%%DOCSDIR%%/manual.pdf.gz
-%%DOCSDIR%%/manual.ps.gz
-%%DOCSDIR%%/manual_src.tar.gz
-%%DOCSDIR%%/notes/AUTHORS
-%%DOCSDIR%%/notes/BUGS
-%%DOCSDIR%%/notes/COPYING
-%%DOCSDIR%%/notes/ChangeLog
-%%DOCSDIR%%/notes/INSTALL
-%%DOCSDIR%%/notes/NEWS
-%%DOCSDIR%%/notes/POST-INSTALL
-%%DOCSDIR%%/notes/README
-%%DOCSDIR%%/notes/THANKS
-%%DOCSDIR%%/notes/VERSION
-%%DOCSDIR%%/sample_src.tar.gz
-@dirrm %%DOCSDIR%%/notes
-@dirrm %%DOCSDIR%%/config
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/config/bash_completions
+%%PORTDOCS%%%%DOCSDIR%%/config/epix.el
+%%PORTDOCS%%%%DOCSDIR%%/manual.pdf.gz
+%%PORTDOCS%%%%DOCSDIR%%/manual.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/manual_src.tar.gz
+%%PORTDOCS%%%%DOCSDIR%%/notes/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/notes/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/notes/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/notes/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/notes/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/notes/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/notes/POST-INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/notes/README
+%%PORTDOCS%%%%DOCSDIR%%/notes/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/notes/VERSION
+%%PORTDOCS%%%%DOCSDIR%%/sample_src.tar.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/notes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/config
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/epix
 @dirrm include/epix