- Separate TeX style files from math/gnuplot into math/gnuplot-tex-extras

  to eliminate huge TeXLive dependency.  Note that TeX terminal support is
  still enabled by default because it works without them.

- Add Lua dependency to support TeX/Tikz terminal.

Approved by:	glewis (maintainer)

7 files changed, 155 insertions, 17 deletions

diff --git a/math/Makefile b/math/Makefile
index 238ffd66c0ca..87bd2d3a6bb5 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -150,6 +150,7 @@
     SUBDIR += gnubc
     SUBDIR += gnumeric
     SUBDIR += gnuplot
+    SUBDIR += gnuplot-tex-extras
     SUBDIR += goblin
     SUBDIR += gotoblas
     SUBDIR += grace
diff --git a/math/gnuplot-tex-extras/Makefile b/math/gnuplot-tex-extras/Makefile
new file mode 100644
index 000000000000..e69944991dcb
--- /dev/null
+++ b/math/gnuplot-tex-extras/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+PORTNAME=	gnuplot
+PORTVERSION=	4.6.6
+CATEGORIES=	math graphics
+MASTER_SITES=	SF
+PKGNAMESUFFIX=	-tex-extras
+
+MAINTAINER=	glewis@FreeBSD.org
+COMMENT=	Extra files for Gnuplot TeX support
+
+RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+
+USE_TEX=	texmf
+NO_BUILD=	yes
+PLIST_FILES=	${TEX_FILES:S,^,${TEX_DIR}/,}
+
+TEX_DIR=	${LOCALBASE}/${TEXMFDIR}/tex/latex/gnuplot
+TEX_FILES=	gnuplot-lua-tikz.sty \
+		gnuplot-lua-tikz-common.tex \
+		gnuplot-lua-tikz.tex \
+		t-gnuplot-lua-tikz.tex \
+		gnuplot.cfg
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${TEX_DIR}
+	cd ${WRKSRC}/share/LaTeX && ${INSTALL_DATA} ${TEX_FILES} \
+	    ${STAGEDIR}${TEX_DIR}
+
+.include <bsd.port.mk>
diff --git a/math/gnuplot-tex-extras/distinfo b/math/gnuplot-tex-extras/distinfo
new file mode 100644
index 000000000000..efcfdf4c9fb2
--- /dev/null
+++ b/math/gnuplot-tex-extras/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnuplot-4.6.6.tar.gz) = 1f19596fd09045f22225afbfec11fa91b9ad1d95b9f48406362f517d4f130274
+SIZE (gnuplot-4.6.6.tar.gz) = 5059214
diff --git a/math/gnuplot-tex-extras/pkg-descr b/math/gnuplot-tex-extras/pkg-descr
new file mode 100644
index 000000000000..cb772dc40dc4
--- /dev/null
+++ b/math/gnuplot-tex-extras/pkg-descr
@@ -0,0 +1,10 @@
+Gnuplot is a portable multi-platform command-line driven graphing utility. It
+was originally created to allow scientists and students to visualize
+mathematical functions and data interactively, but has grown to support many
+non-interactive uses such as web scripting. It is also used as a plotting engine
+by third-party applications like Octave. Gnuplot has been supported and under
+active development since 1986.
+
+This port installs extra files for TeX terminals (latex, epslatex, Tikz, etc). 
+
+WWW: http://www.gnuplot.info/
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index ce410783e67f..d94d31ce6a73 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -2,32 +2,39 @@
 
 PORTNAME=	gnuplot
 PORTVERSION=	4.6.6
+PORTREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Command-line driven graphing utility
 
-USES=		iconv
+USES=		iconv lua
+USE_TEX=	kpathsea
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+CONFIGURE_ENV=	LUA_VER="${LUA_VER}"
 CONFIGURE_ARGS+=--with-lasergnu \
 		--with-readline=gnu \
+		--with-kpsexpand \
 		--without-linux-vga \
 		--without-lisp-files \
 		--without-tutorial \
-		--with-bitmap-terminals
+		--with-bitmap-terminals \
+		--with-latex \
+		ac_cv_prog_PLAINTEX=${LOCALBASE}/bin/tex \
+		ac_cv_prog_LATEX=${LOCALBASE}/bin/latex \
+		ac_cv_prog_PDFLATEX=${LOCALBASE}/bin/pdflatex
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	CAIRO DOCS EXAMPLES GD GRIDBOX PDF PLOT TEX THINSPLINES WX X11
+OPTIONS_DEFINE=	CAIRO DOCS EXAMPLES GD GRIDBOX PDF PLOT THINSPLINES WX X11
 GRIDBOX_DESC=		Use the gridbox optimization for hidden3d
 PLOT_DESC=		Enable plot support
-TEX_DESC=		Search kpsexpand at run-time
 THINSPLINES_DESC=	Enable thin plate splines for grids in dgrid3d
 WX_DESC=		wxWidgets (formerly wxWindows) support
 
-OPTIONS_DEFAULT=CAIRO GD PLOT TEX WX X11
+OPTIONS_DEFAULT=CAIRO GD PLOT WX X11
 OPTIONS_SUB=	yes
 
 CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
@@ -49,11 +56,6 @@ PLOT_LIB_DEPENDS=	libplot.so:${PORTSDIR}/graphics/plotutils
 PLOT_CONFIGURE_ON=	--with-plot=${LOCALBASE}
 PLOT_CONFIGURE_OFF=	--without-plot
 
-TEX_USE=	TEX=base,texmf,latex,dvipsk
-TEX_CONFIGURE_ON=	--with-kpsexpand \
-			--with-texdir=${LOCALBASE}/share/texmf/tex/latex/gnuplot
-TEX_CONFIGURE_OFF=	--without-kpexpand
-
 THINSPLINES_CONFIGURE_ENABLE=	thin-splines
 
 X11_USE=	XORG=x11
@@ -71,13 +73,10 @@ CONFIGURE_ARGS+=	--disable-wxwidgets
 .endif
 
 post-patch:
-.if ! ${PORT_OPTIONS:MTEX}
 	@${REINPLACE_CMD} -e \
 		'/^install:/s/install-am//' ${WRKSRC}/share/LaTeX/Makefile.in
-.endif
 	@${REINPLACE_CMD} -e \
 		's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in
-	@${FIND} "${WRKSRC}" -name '*.orig' -delete
 
 .if ${PORT_OPTIONS:MDOCS}
 post-build:
diff --git a/math/gnuplot/files/patch-configure b/math/gnuplot/files/patch-configure
index 8d0a38c707c9..e13ef060cef1 100644
--- a/math/gnuplot/files/patch-configure
+++ b/math/gnuplot/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig
-+++ configure
-@@ -5919,7 +5919,7 @@
+--- configure.orig	2014-09-22 03:26:10.000000000 +0900
++++ configure	2014-12-06 14:27:21.000000000 +0900
+@@ -5982,7 +5982,7 @@
  fi
  
  
@@ -9,3 +9,100 @@
  then
    CC=${CC-${host_alias-gcc}}
    CFLAGS=${CFLAGS-"-g -O2"}
+@@ -10844,12 +10844,12 @@
+         pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null`
++  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-${LUA_VER}" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -10862,12 +10862,12 @@
+         pkg_cv_LUA_LIBS="$LUA_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null`
++  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-${LUA_VER}" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -10886,9 +10886,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1"`
++	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-${LUA_VER}"`
+         else
+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"`
++	        LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-${LUA_VER}"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LUA_PKG_ERRORS" >&5
+@@ -10920,12 +10920,12 @@
+         pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null`
++  pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-${LUA_VER}" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -10938,12 +10938,12 @@
+         pkg_cv_LUA_LIBS="$LUA_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null`
++  pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-${LUA_VER}" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -10962,9 +10962,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1"`
++	        LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-${LUA_VER}"`
+         else
+-	        LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"`
++	        LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-${LUA_VER}"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LUA_PKG_ERRORS" >&5
+@@ -11024,7 +11024,7 @@
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' lua lua5.1; do
++for ac_lib in '' lua lua-${LUA_VER}; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist
index dff68a92da20..4af6cd3fafa0 100644
--- a/math/gnuplot/pkg-plist
+++ b/math/gnuplot/pkg-plist
@@ -38,4 +38,3 @@ man/man1/lasergnu.1.gz
 %%DATADIR%%/4.6/js/previouszoom.png
 %%DATADIR%%/4.6/js/textzoom.png
 %%DATADIR%%/4.6/lua/gnuplot-tikz.lua
-%%TEX%%share/texmf/tex/latex/gnuplot/gnuplot.cfg