[Midnightbsd-cvs] mports [20736] trunk/math/gnuplot: gnuplot 4.6.6
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Nov 12 08:19:46 EST 2015
Revision: 20736
http://svnweb.midnightbsd.org/mports/?rev=20736
Author: laffer1
Date: 2015-11-12 08:19:45 -0500 (Thu, 12 Nov 2015)
Log Message:
-----------
gnuplot 4.6.6
Modified Paths:
--------------
trunk/math/gnuplot/Makefile
trunk/math/gnuplot/distinfo
trunk/math/gnuplot/files/patch-configure
trunk/math/gnuplot/files/patch-docs-Makefile.in
trunk/math/gnuplot/pkg-plist
Modified: trunk/math/gnuplot/Makefile
===================================================================
--- trunk/math/gnuplot/Makefile 2015-11-12 13:11:23 UTC (rev 20735)
+++ trunk/math/gnuplot/Makefile 2015-11-12 13:19:45 UTC (rev 20736)
@@ -1,115 +1,86 @@
# $MidnightBSD$
PORTNAME= gnuplot
-PORTVERSION= 4.6.5
+PORTVERSION= 4.6.6
CATEGORIES= math graphics
MASTER_SITES= SF
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Command-line driven interactive function plotting program
+COMMENT= Command-line driven graphing utility
LICENSE= other
-USES= iconv
+USES= iconv lua pkgconfig readline
+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_KPSEXPAND=${LOCALBASE}/bin/kpsexpand \
+ 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 PDF PLOT TEX WX X11
+OPTIONS_DEFAULT=CAIRO GD PLOT WX X11
+OPTIONS_SUB= yes
-MAN1= gnuplot.1 lasergnu.1
+CAIRO_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo
+CAIRO_USE= GNOME=pango
+CAIRO_CONFIGURE_WITH= cairo
-.include <bsd.mport.options.mk>
+GD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd
+GD_CONFIGURE_ON= --with-gd=${LOCALBASE}
+GD_CONFIGURE_OFF+= --without-gd
-.if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo
-USE_GNOME+= pango
-.else
-CONFIGURE_ARGS+= --without-cairo
-.endif
+GRIDBOX_CONFIGURE_OFF= --disable-h3d-quadtree --enable-h3d-gridbox
-.if ${PORT_OPTIONS:MGD}
-LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd
-CONFIGURE_ARGS+= --with-gd=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-gd
-.endif
+PDF_LIB_DEPENDS= libpdf.so:${PORTSDIR}/print/pdflib
+PDF_CONFIGURE_ON= --with-pdf=${LOCALBASE}
+PDF_CONFIGURE_OFF= --without-pdf
-.if ! ${PORT_OPTIONS:MGRIDBOX}
-CONFIGURE_ARGS+= --disable-h3d-quadtree --enable-h3d-gridbox
-.endif
+PLOT_USE= XORG=xaw,xmu,xt,xext
+PLOT_LIB_DEPENDS= libplot.so:${PORTSDIR}/graphics/plotutils
+PLOT_CONFIGURE_ON= --with-plot=${LOCALBASE}
+PLOT_CONFIGURE_OFF= --without-plot
-.if ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS+= pdf:${PORTSDIR}/print/pdflib
-CONFIGURE_ARGS+= --with-pdf=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-pdf
-.endif
+THINSPLINES_CONFIGURE_ENABLE= thin-splines
-.if ${PORT_OPTIONS:MPLOT}
-USE_XORG+= xaw xmu xt xext
-LIB_DEPENDS+= plot:${PORTSDIR}/graphics/plotutils
-CONFIGURE_ARGS+= --with-plot=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-plot
-.endif
+X11_USE= XORG=x11
-.if ${PORT_OPTIONS:MTEX}
-USE_TEX= base texmf latex
-CONFIGURE_ARGS+= --with-kpsexpand \
- --with-texdir=${LOCALBASE}/share/texmf/tex/latex/gnuplot
-PLIST_SUB+= TEX=""
-.else
-PLIST_SUB+= TEX="@comment "
-.endif
+.include <bsd.mport.options.mk>
-.if ${PORT_OPTIONS:MTHINSPLINES}
-CONFIGURE_ARGS+= --enable-thin-splines
-.else
-CONFIGURE_ARGS+= --disable-thin-splines
-.endif
-
.if ${PORT_OPTIONS:MWX}
-USE_WX= 2.5-2.8
+# Version 3.x of WX currently cause gnuplot to crash.
+# Do not update without this without testing.
+USE_WX= 2.8
+WX_UNICODE= yes
WX_CONF_ARGS= absolute
.else
CONFIGURE_ARGS+= --disable-wxwidgets
.endif
-.if ${PORT_OPTIONS:MX11}
-USE_XORG= x11
-PLIST_SUB+= X11=""
-.else
-CONFIGURE_ARGS+= --without-x
-PLIST_SUB+= X11="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS= *
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-PORTEXAMPLES= *
-.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
+ @${REINPLACE_CMD} -e \
+ 's|luaL_checkint(|(int)luaL_checkinteger(|' ${WRKSRC}/term/lua.trm
.if ${PORT_OPTIONS:MDOCS}
post-build:
@@ -117,18 +88,14 @@
.endif
post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin
-.if !defined(NOPORTEXAMPLES)
- @${MKDIR} ${EXAMPLESDIR}
- cd ${WRKSRC}/demo && ${FIND} . \
- | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
-.endif
-
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${STAGEDIR}${PREFIX}/bin
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}/psdoc
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/psdoc
cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.dvi \
- gnuplot.ps ${DOCSDIR}
- cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${DOCSDIR}/psdoc
+ gnuplot.ps ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${STAGEDIR}${DOCSDIR}/psdoc
.endif
check test: build
Modified: trunk/math/gnuplot/distinfo
===================================================================
--- trunk/math/gnuplot/distinfo 2015-11-12 13:11:23 UTC (rev 20735)
+++ trunk/math/gnuplot/distinfo 2015-11-12 13:19:45 UTC (rev 20736)
@@ -1,2 +1,2 @@
-SHA256 (gnuplot-4.6.5.tar.gz) = e550f030c7d04570e89c3d4e3f6e82296816508419c86ab46c4dd73156519a2d
-SIZE (gnuplot-4.6.5.tar.gz) = 5035657
+SHA256 (gnuplot-4.6.6.tar.gz) = 1f19596fd09045f22225afbfec11fa91b9ad1d95b9f48406362f517d4f130274
+SIZE (gnuplot-4.6.6.tar.gz) = 5059214
Modified: trunk/math/gnuplot/files/patch-configure
===================================================================
--- trunk/math/gnuplot/files/patch-configure 2015-11-12 13:11:23 UTC (rev 20735)
+++ trunk/math/gnuplot/files/patch-configure 2015-11-12 13:19:45 UTC (rev 20736)
@@ -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
Modified: trunk/math/gnuplot/files/patch-docs-Makefile.in
===================================================================
--- trunk/math/gnuplot/files/patch-docs-Makefile.in 2015-11-12 13:11:23 UTC (rev 20735)
+++ trunk/math/gnuplot/files/patch-docs-Makefile.in 2015-11-12 13:19:45 UTC (rev 20736)
@@ -1,5 +1,3 @@
-$FreeBSD: head/math/gnuplot/files/patch-docs-Makefile.in 351183 2014-04-13 04:58:35Z glewis $
-
--- docs/Makefile.in.orig 2013-09-23 16:16:41.000000000 -0700
+++ docs/Makefile.in 2014-04-12 20:11:45.000000000 -0700
@@ -395,15 +395,15 @@
Modified: trunk/math/gnuplot/pkg-plist
===================================================================
--- trunk/math/gnuplot/pkg-plist 2015-11-12 13:11:23 UTC (rev 20735)
+++ trunk/math/gnuplot/pkg-plist 2015-11-12 13:19:45 UTC (rev 20736)
@@ -38,13 +38,3 @@
%%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
-%%TEX%%@dirrm share/texmf/tex/latex/gnuplot
- at dirrm %%DATADIR%%/4.6/lua
- at dirrm %%DATADIR%%/4.6/js
-%%X11%%@dirrm %%DATADIR%%/4.6/app-defaults
- at dirrm %%DATADIR%%/4.6/PostScript
- at dirrm %%DATADIR%%/4.6
- at dirrm %%DATADIR%%
- at dirrm libexec/gnuplot/4.6
- at dirrm libexec/gnuplot
More information about the Midnightbsd-cvs
mailing list