[104175] trunk/dports/math/gnuplot
mojca at macports.org
mojca at macports.org
Tue Mar 19 19:29:39 PDT 2013
Revision: 104175
https://trac.macports.org/changeset/104175
Author: mojca at macports.org
Date: 2013-03-19 19:29:39 -0700 (Tue, 19 Mar 2013)
Log Message:
-----------
gnuplot: update to 4.6.2 (#38419) & fix #36135, #38321, #38365
Modified Paths:
--------------
trunk/dports/math/gnuplot/Portfile
trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff
Removed Paths:
-------------
trunk/dports/math/gnuplot/files/patch-upstream-compilerwarnings.diff
Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile 2013-03-19 23:12:45 UTC (rev 104174)
+++ trunk/dports/math/gnuplot/Portfile 2013-03-20 02:29:39 UTC (rev 104175)
@@ -3,10 +3,10 @@
PortSystem 1.0
PortGroup xcodeversion 1.0
+PortGroup texlive 1.0
name gnuplot
-version 4.6.1
-revision 1
+version 4.6.2
categories math science
# the license has some inconvenient requirements that we're not meeting
# to be allowed to distribute binaries
@@ -32,11 +32,11 @@
distfiles-append ${name}.pdf
extract.only ${distname}.tar.gz
checksums ${distname}.tar.gz \
- rmd160 2b6fb6c1f1ce60f0bac2cb9b496c45b073ce6bb2 \
- sha256 f4bf99907d0fea7db90b6e50147f1730b5bde2fbb93d9e58478b6b94409eebc6 \
+ rmd160 6cf82d01bf216e78217bef274f2372b8c61fd9b4 \
+ sha256 978b01bbd288c4c5f6d6572cae3aa8bc73b429629ef4400f71856bb5d2251818 \
${name}.pdf \
- rmd160 0ddad32373efab2145fcd0e6e4d4c3e751d535bf \
- sha256 05cec7b49c9b5435ca94f6b4e2f34b07365411a3610bca7eaf73fa9b5475b533
+ rmd160 b61df2e77dbc7d946bb2fe55a51544c994a8a7d4 \
+ sha256 57d36472896060f316351197b63e6c5337241ee28b99d033448deaf1adc5a3d0
depends_lib port:expat \
port:fontconfig \
@@ -51,7 +51,6 @@
patchfiles patch-src-variable.c.diff \
patch-docs-Makefile.in.diff \
- patch-upstream-compilerwarnings.diff \
patch-configure-aquaterm.diff
minimum_xcodeversions {9 3.1}
@@ -68,6 +67,7 @@
--mandir='\${prefix}/share/man' \
--without-lisp-files \
--disable-wxwidgets \
+ --without-bitmap-terminals \
--without-latex \
--without-tutorial \
--without-cairo \
@@ -95,7 +95,17 @@
}
variant emacs description "An emacs mode for working with gnuplot" {
- depends_build-append path:bin/emacs:emacs
+ # This would be nicer with an emacs PortGroup:
+ # Use the port that provides Emacs.app (emacs-app[-devel])
+ # or the usual emacs binary if the former doesn't exist
+ set app_binary ${applications_dir}/Emacs.app/Contents/MacOS/Emacs
+ set app_provider [registry_file_registered $app_binary]
+ if {[file exists $app_binary] && $app_provider != 0} {
+ depends_build-append port:${app_provider}
+ configure.env-append EMACS=${app_binary}
+ } else {
+ depends_build-append path:bin/emacs:emacs
+ }
configure.args-delete --without-lisp-files
configure.args-append --with-lisp-files --with-lispdir=${prefix}/share/emacs/site-lisp
}
@@ -137,18 +147,44 @@
configure.args-append --enable-qt
}
-variant tutorial description "Build the tutorial (requires a tex install)" {
- depends_lib-append port:texlive-latex-extra
- configure.args-delete --without-tutorial --without-latex
- configure.args-append --with-tutorial
+# Ideally one would enable just PMB by default, but '--with-bitmap-terminals'
+# enables lots of other obsolete terminals which clutter the output of 'set term'.
+variant old_bitmap_terminals description "Enable PBM (Portable Bit Map) and other older bitmap terminals" {
+ configure.args-delete --without-bitmap-terminals
+ configure.args-append --with-bitmap-terminals
}
default_variants +aquaterm +luaterm +pangocairo +x11
+# Building and installing TeX macro files for TikZ could/should be done by gnuplot's Makefile,
+# but without a patch that would require a dependency on texlive.
+# Apart from that the files would fly to the wrong place in TDS,
+# so that plain TeX and ConTeXt could not find them (an upstream bug).
+# So we 'manually' generate and copy the necessary files.
+post-build {
+ if {[variant_isset luaterm]} {
+ system -W ${workpath}/${distname}/share/LaTeX "${prefix}/bin/lua ../../term/lua/gnuplot-tikz.lua style"
+ }
+}
+
post-destroot {
+ if {[variant_isset luaterm]} {
+ set texmf ${destroot}${texlive_texmfports}
+ set luadir ${workpath}/${distname}/share/LaTeX
+ xinstall -d -m 0755 ${texmf}/tex/context/third/gnuplot-lua-tikz
+ xinstall -d -m 0755 ${texmf}/tex/generic/gnuplot-lua-tikz
+ xinstall -d -m 0755 ${texmf}/tex/latex/gnuplot-lua-tikz
+ xinstall -d -m 0755 ${texmf}/tex/plain/gnuplot-lua-tikz
+
+ xinstall -m 0644 ${luadir}/t-gnuplot-lua-tikz.tex ${texmf}/tex/context/third/gnuplot-lua-tikz
+ xinstall -m 0644 ${luadir}/gnuplot-lua-tikz-common.tex ${texmf}/tex/generic/gnuplot-lua-tikz
+ xinstall -m 0644 ${luadir}/gnuplot-lua-tikz.sty ${texmf}/tex/latex/gnuplot-lua-tikz
+ xinstall -m 0644 ${luadir}/gnuplot-lua-tikz.tex ${texmf}/tex/plain/gnuplot-lua-tikz
+ }
+
xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
xinstall -m 0644 ${distpath}/${name}.pdf \
- ${destroot}${prefix}/share/doc/${name}/
+ ${destroot}${prefix}/share/doc/${name}
}
# this temporary workaround removes files that accidentally circumvented destroot
Modified: trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff 2013-03-19 23:12:45 UTC (rev 104174)
+++ trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff 2013-03-20 02:29:39 UTC (rev 104175)
@@ -1,6 +1,6 @@
--- config.hin.orig
+++ config.hin
-@@ -142,7 +142,7 @@
+@@ -145,7 +145,7 @@
/* Define to 1 if you have the `lgamma' function. */
#undef HAVE_LGAMMA
@@ -191,6 +191,19 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BeOS" >&5
+@@ -14252,9 +14336,9 @@ esac
+
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ # Files that config.status was made for.
+-config_files="`echo $ac_config_files`"
+-config_headers="`echo $ac_config_headers`"
+-config_commands="`echo $ac_config_commands`"
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+
+ _ACEOF
+
@@ -15496,7 +15580,7 @@ else
$as_echo " next terminal: no" >&6; }
fi
Deleted: trunk/dports/math/gnuplot/files/patch-upstream-compilerwarnings.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-upstream-compilerwarnings.diff 2013-03-19 23:12:45 UTC (rev 104174)
+++ trunk/dports/math/gnuplot/files/patch-upstream-compilerwarnings.diff 2013-03-20 02:29:39 UTC (rev 104175)
@@ -1,98 +0,0 @@
---- src/color.c.orig
-+++ src/color.c
-@@ -517,7 +517,7 @@ cbtick_callback(
- if (axis_array[axis].manual_justify)
- just = axis_array[axis].label.pos;
- write_multiline(x2+offsetx, y3+offsety, text,
-- just, CENTRE, hrotate,
-+ just, JUST_CENTRE, hrotate,
- axis_array[axis].ticdef.font);
- if (hrotate)
- (*term->text_angle)(0);
-@@ -528,7 +528,7 @@ cbtick_callback(
- if (axis_array[axis].manual_justify)
- just = axis_array[axis].label.pos;
- write_multiline(x3+offsetx, y2+offsety, text,
-- just, CENTRE, 0.0,
-+ just, JUST_CENTRE, 0.0,
- axis_array[axis].ticdef.font);
- }
- term_apply_lp_properties(&border_lp); /* border linetype */
---- src/graphics.c.orig
-+++ src/graphics.c
-@@ -1720,7 +1720,7 @@ do_plot(struct curve_points *plots, int pcount)
- ignore_enhanced(axis_array[FIRST_X_AXIS].label.noenhanced);
- apply_pm3dcolor(&(axis_array[FIRST_X_AXIS].label.textcolor), t);
- write_multiline(x, y, axis_array[FIRST_X_AXIS].label.text,
-- JUST_CENTRE, JUST_TOP, 0,
-+ CENTRE, JUST_TOP, 0,
- axis_array[FIRST_X_AXIS].label.font);
- reset_textcolor(&(axis_array[FIRST_X_AXIS].label.textcolor), t);
- ignore_enhanced(FALSE);
---- src/plot2d.c.orig
-+++ src/plot2d.c
-@@ -2127,7 +2127,7 @@ eval_plots()
-
- if (this_plot->labels == NULL) {
- this_plot->labels = new_text_label(-1);
-- this_plot->labels->pos = JUST_CENTRE;
-+ this_plot->labels->pos = CENTRE;
- this_plot->labels->layer = LAYER_PLOTLABELS;
- }
- parse_label_options(this_plot->labels);
-@@ -2316,7 +2316,7 @@ eval_plots()
- if (this_plot->plot_style == LABELPOINTS) {
- if (this_plot->labels == NULL) {
- this_plot->labels = new_text_label(-1);
-- this_plot->labels->pos = JUST_CENTRE;
-+ this_plot->labels->pos = CENTRE;
- this_plot->labels->layer = LAYER_PLOTLABELS;
- }
- this_plot->labels->place.scalex =
---- src/plot3d.c.orig
-+++ src/plot3d.c
-@@ -1559,7 +1559,7 @@ eval_3dplots()
- int stored_token = c_token;
- if (this_plot->labels == NULL) {
- this_plot->labels = new_text_label(-1);
-- this_plot->labels->pos = JUST_CENTRE;
-+ this_plot->labels->pos = CENTRE;
- this_plot->labels->layer = LAYER_PLOTLABELS;
- }
- parse_label_options(this_plot->labels);
---- src/wxterminal/wxt_gui.cpp.orig
-+++ src/wxterminal/wxt_gui.cpp
-@@ -2692,6 +2692,7 @@ void wxtPanel::wxt_cairo_exec_command(gp_command command)
- text_justification_mode = command.mode;
- return;
- case command_put_text :
-+ case command_enhanced_put_text :
- if (wxt_in_key_sample) {
- int slen = strlen(command.string) * term->h_char * 0.75;
- if (text_justification_mode == RIGHT) slen = -slen;
---- term/lua.trm.orig
-+++ term/lua.trm
-@@ -872,7 +872,7 @@ LUA_init()
- {
- fseek(gpoutfile, 0, SEEK_SET);
- /* ignore compiler warnings here, because `gpoutfile' is already open */
-- if (ftruncate(fileno(gpoutfile), 0));
-+ (void)ftruncate(fileno(gpoutfile), 0);
-
- /* reset image counter */
- image_cnt = 0;
---- term/x11.trm.orig
-+++ term/x11.trm
-@@ -617,7 +617,11 @@ X11_options()
- /* Leave the current window unchanged when closing an old window */
- if (X11_ipc) {
- if (set_close) {
-- fprintf(X11_ipc, (set_number ? "C%d\n" : "C\n"), new_term_number);
-+ if (set_number) {
-+ fprintf(X11_ipc, "C%d\n", new_term_number);
-+ } else {
-+ fputs("C\n", X11_ipc);
-+ }
- fflush(X11_ipc);
- } else if (set_number) {
- #ifdef EXTERNAL_X11_WINDOW
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130319/175e2d92/attachment.html>
More information about the macports-changes
mailing list