[112438] trunk/dports/math/gnuplot
mojca at macports.org
mojca at macports.org
Wed Oct 23 02:48:08 PDT 2013
Revision: 112438
https://trac.macports.org/changeset/112438
Author: mojca at macports.org
Date: 2013-10-23 02:48:08 -0700 (Wed, 23 Oct 2013)
Log Message:
-----------
gnuplot: upgrade to 4.6.4
Modified Paths:
--------------
trunk/dports/math/gnuplot/Portfile
trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff
Removed Paths:
-------------
trunk/dports/math/gnuplot/files/patch-src-variable.c.diff
trunk/dports/math/gnuplot/files/patch-upstream-offbyone.diff
Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile 2013-10-23 09:35:47 UTC (rev 112437)
+++ trunk/dports/math/gnuplot/Portfile 2013-10-23 09:48:08 UTC (rev 112438)
@@ -8,8 +8,7 @@
PortGroup wxWidgets 1.0
name gnuplot
-version 4.6.3
-revision 5
+version 4.6.4
categories math science
# the license has some inconvenient requirements that we're not meeting
# to be allowed to distribute binaries
@@ -35,11 +34,11 @@
distfiles-append ${name}.pdf
extract.only ${distname}.tar.gz
checksums ${distname}.tar.gz \
- rmd160 42ff3a2066e5089b19c52a88cd2c17d9db87681d \
- sha256 df5ffafa25fb32b3ecc0206a520f6bca8680e6dcc961efd30df34c0a1b7ea7f5 \
+ rmd160 a2dcc9d7768b9fbd12fa0993c6d40d059f57215e \
+ sha256 843a2019bcc89f76520ac2c88ada900917f28b90f809a47da50a1cffc9190431 \
${name}.pdf \
- rmd160 91c0832dc41f6e08fd0f67264e710d8afdc088bc \
- sha256 3da1b3f5c435d3e1d770081f09ab6b77432f20284be199d0fee0cda4b6abe269
+ rmd160 3823c6f35f035857fc226fa5741cc04834fddce5 \
+ sha256 31ad310bf307067e0dcbd0e51fb05846d45ad8ca772e58387a1bd3acbcbaaa7e
depends_build path:bin/pkg-config:pkgconfig
@@ -54,9 +53,7 @@
port:readline \
port:zlib
-patchfiles patch-src-variable.c.diff \
- patch-configure-aquaterm.diff \
- patch-upstream-offbyone.diff
+patchfiles patch-configure-aquaterm.diff
minimum_xcodeversions {9 3.1}
Modified: trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff 2013-10-23 09:35:47 UTC (rev 112437)
+++ trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff 2013-10-23 09:48:08 UTC (rev 112438)
@@ -11,7 +11,7 @@
/* Define to 1 if you have the <libc.h> header file. */
--- configure.orig
+++ configure
-@@ -787,6 +787,7 @@ with_texdir
+@@ -812,6 +812,7 @@ with_texdir
with_kpsexpand
with_x
with_x_app_defaultdir
@@ -19,7 +19,7 @@
with_lasergnu
with_gihdir
with_linux_vga
-@@ -1509,6 +1510,7 @@ Optional Packages:
+@@ -1534,6 +1535,7 @@ Optional Packages:
--with-x use the X Window System
--with-x-app-defaultdir=DIR location of X11 application defaults
(default /etc/X11/app-defaults/)
@@ -27,7 +27,7 @@
--with-lasergnu install lasergnu printer script
--with-gihdir=DIR location of .gih help text file
(default PREFIX/share/PACKAGE/VERSION)
-@@ -8024,8 +8026,8 @@ fi
+@@ -8086,8 +8088,8 @@ fi
rm -f conftest*
@@ -38,7 +38,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined(__APPLE__) && defined(__MACH__)
-@@ -8035,15 +8037,98 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -8097,15 +8099,98 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "yes" >/dev/null 2>&1; then :
@@ -143,7 +143,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -8063,33 +8148,32 @@ return aqtInit ();
+@@ -8125,33 +8210,32 @@ return aqtInit ();
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -191,7 +191,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BeOS" >&5
-@@ -14252,9 +14336,9 @@ esac
+@@ -14309,9 +14393,9 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
@@ -204,7 +204,7 @@
_ACEOF
-@@ -15496,7 +15580,7 @@ else
+@@ -15553,7 +15637,7 @@ else
$as_echo " next terminal: no" >&6; }
fi
@@ -215,7 +215,7 @@
else
--- configure.in.orig
+++ configure.in
-@@ -1370,7 +1370,7 @@ else
+@@ -1376,7 +1376,7 @@ else
AC_MSG_RESULT([ next terminal: no])
fi
Deleted: trunk/dports/math/gnuplot/files/patch-src-variable.c.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-src-variable.c.diff 2013-10-23 09:35:47 UTC (rev 112437)
+++ trunk/dports/math/gnuplot/files/patch-src-variable.c.diff 2013-10-23 09:48:08 UTC (rev 112438)
@@ -1,11 +0,0 @@
---- src/variable.c.orig
-+++ src/variable.c
-@@ -250,7 +250,7 @@ static const struct path_table fontpath_tbl[] =
- };
- #endif
-
--#if defined(_Macintosh) && !defined(FONTPATHSET)
-+#if defined(__APPLE__) && !defined(FONTPATHSET)
- # define FONTPATHSET
- static const struct path_table fontpath_tbl[] =
- {
Deleted: trunk/dports/math/gnuplot/files/patch-upstream-offbyone.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-upstream-offbyone.diff 2013-10-23 09:35:47 UTC (rev 112437)
+++ trunk/dports/math/gnuplot/files/patch-upstream-offbyone.diff 2013-10-23 09:48:08 UTC (rev 112438)
@@ -1,314 +0,0 @@
---- src/wxterminal/gp_cairo.c.orig
-+++ src/wxterminal/gp_cairo.c
-@@ -1144,7 +1144,7 @@ void gp_cairo_add_shape( PangoRectangle rect,int position)
-
- FPRINTF((stderr, "adding blank custom shape\n"));
-
-- strncat(gp_cairo_utf8, " ", sizeof(gp_cairo_utf8)-strlen(gp_cairo_utf8));
-+ strncat(gp_cairo_utf8, " ", sizeof(gp_cairo_utf8)-strlen(gp_cairo_utf8)-1);
- p_attr_shape = pango_attr_shape_new (&rect,&rect);
- p_attr_shape->start_index = position;
- p_attr_shape->end_index = position+1;
-@@ -1295,7 +1295,7 @@ void gp_cairo_enhanced_flush(plot_struct *plot)
- }
-
- if (gp_cairo_enhanced_showflag) {
-- strncat(gp_cairo_utf8, enhanced_text_utf8, sizeof(gp_cairo_utf8)-strlen(gp_cairo_utf8));
-+ strncat(gp_cairo_utf8, enhanced_text_utf8, sizeof(gp_cairo_utf8)-strlen(gp_cairo_utf8)-1);
- end = strlen(gp_cairo_utf8);
-
- /* add text attributes to the main list */
-@@ -1376,7 +1376,7 @@ void gp_cairo_enhanced_flush(plot_struct *plot)
-
- if (gp_cairo_enhanced_save) /* we aim at restoring position later */ {
- save_start = strlen( gp_cairo_save_utf8);
-- strncat(gp_cairo_save_utf8, enhanced_text_utf8, sizeof(gp_cairo_utf8)-strlen(gp_cairo_utf8));
-+ strncat(gp_cairo_save_utf8, enhanced_text_utf8, sizeof(gp_cairo_utf8)-strlen(gp_cairo_utf8)-1);
- save_end = strlen( gp_cairo_save_utf8);
-
- /* add text attributes to the save list */
-@@ -1387,7 +1387,7 @@ void gp_cairo_enhanced_flush(plot_struct *plot)
- underprinted_start = strlen(gp_cairo_underprinted_utf8);
- strncat(gp_cairo_underprinted_utf8,
- enhanced_text_utf8,
-- sizeof(gp_cairo_underprinted_utf8)-strlen(gp_cairo_underprinted_utf8));
-+ sizeof(gp_cairo_underprinted_utf8)-strlen(gp_cairo_underprinted_utf8)-1);
- underprinted_end = strlen(gp_cairo_underprinted_utf8);
-
- if (gp_cairo_enhanced_underprinted_AttrList)
---- term/cairo.trm.orig
-+++ term/cairo.trm
-@@ -523,7 +523,7 @@ TERM_PUBLIC void cairotrm_options()
- /* Save options back into options string in normalized format */
- if (cairo_params->transparent)
- strncat(term_options, ISCAIROLATEX ? " nobackground" : " transparent",
-- sizeof(term_options) - strlen(term_options));
-+ sizeof(term_options) - strlen(term_options) - 1);
- else {
- sprintf(tmp_term_options, " background \"#%02x%02x%02x\"",
- (int)(255 * cairo_params->background.r),
-@@ -533,28 +533,28 @@ TERM_PUBLIC void cairotrm_options()
- }
-
- if (cairo_params->crop)
-- strncat(term_options, " crop", sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, " crop", sizeof(term_options)-strlen(term_options)-1);
-
- if (set_enhanced)
-- strncat(term_options, " enhanced", sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, " enhanced", sizeof(term_options)-strlen(term_options)-1);
-
- if (set_font) {
- snprintf(tmp_term_options, sizeof(tmp_term_options), " font \"%s\"", font_setting);
- free(font_setting);
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
- }
-
- /* if (set_fontscale) */
- {
- snprintf(tmp_term_options, sizeof(tmp_term_options), " fontscale %.1f", cairo_params->fontscale);
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
- }
-
- if (cairo_params->mono)
-- strncat(term_options, " monochrome", sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, " monochrome", sizeof(term_options)-strlen(term_options)-1);
-
- if (cairo_params->dashed)
-- strncat(term_options, " dashed", sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, " dashed", sizeof(term_options)-strlen(term_options)-1);
-
- if (1 || set_size) {
- if (cairo_params->explicit_units == CM)
-@@ -572,22 +572,22 @@ TERM_PUBLIC void cairotrm_options()
- sizeof(tmp_term_options),
- " size %.2fin, %.2fin ",
- cairo_params->width/72., cairo_params->height/72.);
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
- }
-
- if (set_capjoin) {
- strncat(term_options, cairo_params->rounded ? " rounded" : " butt",
-- sizeof(term_options)-strlen(term_options));
-+ sizeof(term_options)-strlen(term_options)-1);
- }
-
- if (cairo_params->lw != cairo_params_default->lw) {
- snprintf(tmp_term_options,sizeof(tmp_term_options), " linewidth %g", cairo_params->lw);
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
- }
-
- if (cairo_params->dash_length != cairo_params_default->dash_length) {
- snprintf(tmp_term_options,sizeof(tmp_term_options), " dashlength %g", cairo_params->dash_length);
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
- }
-
- /* sync settings with ps_params for latex terminal */
---- term/context.trm.orig
-+++ term/context.trm
-@@ -630,36 +630,42 @@ CONTEXT_options()
- CONTEXT_params.header == NULL ? "noheader \\\n " : "\\\n header ");
-
- if (CONTEXT_params.header != NULL) {
-- strncat(term_options,"\"", sizeof(term_options)-strlen(term_options));
-- strncat(term_options,CONTEXT_params.header, sizeof(term_options)-strlen(term_options));
-- strncat(term_options,"\" \\\n ", sizeof(term_options)-strlen(term_options));
-+ strncat(term_options,"\"", sizeof(term_options)-strlen(term_options)-1);
-+ strncat(term_options,CONTEXT_params.header, sizeof(term_options)-strlen(term_options)-1);
-+ strncat(term_options,"\" \\\n ", sizeof(term_options)-strlen(term_options)-1);
- }
-
- strncat(term_options,
- CONTEXT_params.color ? "color " : "monochrome ",
-- sizeof(term_options)-strlen(term_options));
-+ sizeof(term_options)-strlen(term_options)-1);
-
- switch (CONTEXT_params.linejoin) {
- case LINEJOIN_MITER:
- strncat(term_options, "mitered ",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- case LINEJOIN_ROUND:
- strncat(term_options, "rounded ",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- case LINEJOIN_BEVEL:
- strncat(term_options, "beveled ",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- }
- switch (CONTEXT_params.linecap) {
- case LINECAP_BUTT :
- strncat(term_options, "butt",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- case LINECAP_ROUND :
- strncat(term_options, "round",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- case LINECAP_SQUARE:
- strncat(term_options, "squared",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- }
-
- snprintf(tmp_term_options, sizeof(tmp_term_options),
-@@ -669,29 +675,33 @@ CONTEXT_options()
- CONTEXT_params.scale_linewidth,
- CONTEXT_params.scale_text
- );
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
-
- switch (CONTEXT_params.points) {
- case CONTEXT_POINTS_WITH_TEX :
- strncat(term_options, "texpoints ",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- case CONTEXT_POINTS_WITH_METAPOST :
- strncat(term_options, "mppoints ",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- }
- #ifdef WRITE_PNG_IMAGE
- switch (CONTEXT_params.images) {
- case CONTEXT_IMAGES_INLINE :
- strncat(term_options, "inlineimages ",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- case CONTEXT_IMAGES_EXTERNAL :
- strncat(term_options, "externalimages ",
-- sizeof(term_options)-strlen(term_options)); break;
-+ sizeof(term_options)-strlen(term_options)-1);
-+ break;
- }
- #endif
- snprintf(tmp_term_options, sizeof(tmp_term_options), "font \"%s,%g\"",
- CONTEXT_params.font, CONTEXT_params.fontsize);
-- strncat(term_options, tmp_term_options, sizeof(term_options) - strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options) - strlen(term_options)-1);
- }
-
- /* **************
-@@ -1374,7 +1384,8 @@ CONTEXT_set_font(const char *font)
- CONTEXT_fontsize = CONTEXT_fontsize_explicit;
-
- snprintf(tmp_fontstring, sizeof(tmp_fontstring), ",%gpt", CONTEXT_fontsize_explicit);
-- strncat(CONTEXT_font_explicit, tmp_fontstring, sizeof(CONTEXT_font_explicit) - strlen(CONTEXT_font_explicit));
-+ strncat(CONTEXT_font_explicit, tmp_fontstring,
-+ sizeof(CONTEXT_font_explicit) - strlen(CONTEXT_font_explicit)-1);
- tmp_fontstring[MAX_ID_LEN] = NUL;
-
- /* no fontsize has been provided: switch back to default terminal fontsize */
-@@ -1591,7 +1602,6 @@ CONTEXT_write_palette(t_sm_palette *palette)
- /* grayscale only */
- case SMPAL_COLOR_MODE_GRAY:
- fprintf(gpoutfile, "color_mode(gray)");
-- // XXX: I'm not sure if something has to be done here or not
- break;
- /* one of several fixed transformations */
- case SMPAL_COLOR_MODE_RGB:
---- term/wxt.trm.orig
-+++ term/wxt.trm
-@@ -315,71 +315,71 @@ TERM_PUBLIC void wxt_options()
- "%d", wxt_window_number);
-
- if (set_title) {
-- strncat(term_options, " title \"", sizeof(term_options)-strlen(term_options));
-- strncat(term_options, wxt_title, sizeof(term_options)-strlen(term_options));
-- strncat(term_options, "\"", sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, " title \"", sizeof(term_options)-strlen(term_options)-1);
-+ strncat(term_options, wxt_title, sizeof(term_options)-strlen(term_options)-1);
-+ strncat(term_options, "\"", sizeof(term_options)-strlen(term_options)-1);
- wxt_update_title(wxt_window_number);
- }
-
- if (wxt_dashed)
-- strncat(term_options, " dashed", sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, " dashed", sizeof(term_options)-strlen(term_options)-1);
-
- if (wxt_dashlength != 1.0) {
- char tmp_term_options[MAX_LINE_LEN+1] = "";
- snprintf(tmp_term_options,sizeof(tmp_term_options), " dashlength %g", wxt_dashlength);
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
- }
-
- if (wxt_background != 0xffffff) {
- char tmp_term_options[MAX_LINE_LEN+1] = "";
- snprintf(tmp_term_options,sizeof(tmp_term_options), " background '#%06x'", wxt_background);
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
- }
-
- if (set_size) {
- char tmp_term_options[MAX_LINE_LEN+1] = "";
- snprintf(tmp_term_options, sizeof(tmp_term_options),
- " size %d, %d", wxt_width, wxt_height);
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
- wxt_update_size(wxt_window_number);
- }
-
- if (set_enhanced)
- strncat(term_options,
- wxt_enhanced_enabled ? " enhanced" : " noenhanced",
-- sizeof(term_options)-strlen(term_options));
-+ sizeof(term_options)-strlen(term_options)-1);
-
- if (set_font) {
-- strncat(term_options, " font \"", sizeof(term_options)-strlen(term_options));
-- strncat(term_options, font_setting, sizeof(term_options)-strlen(term_options));
-- strncat(term_options, "\"", sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, " font \"", sizeof(term_options)-strlen(term_options)-1);
-+ strncat(term_options, font_setting, sizeof(term_options)-strlen(term_options)-1);
-+ strncat(term_options, "\"", sizeof(term_options)-strlen(term_options)-1);
- free(font_setting);
- }
-
- if (wxt_set_fontscale != 1.0) {
- char tmp_term_options[MAX_LINE_LEN+1] = "";
- snprintf(tmp_term_options,sizeof(tmp_term_options), " fontscale %.1f", wxt_set_fontscale);
-- strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options));
-+ strncat(term_options, tmp_term_options, sizeof(term_options)-strlen(term_options)-1);
- }
-
- if (set_capjoin)
- strncat(term_options, wxt_rounded ? " rounded" : " butt",
-- sizeof(term_options)-strlen(term_options));
-+ sizeof(term_options)-strlen(term_options)-1);
-
- if (set_persist)
- strncat(term_options,
- (wxt_persist==yes) ? " persist" : " nopersist",
-- sizeof(term_options)-strlen(term_options));
-+ sizeof(term_options)-strlen(term_options)-1);
-
- if (set_raise)
- strncat(term_options,
- (wxt_raise==yes) ? " raise" : " noraise",
-- sizeof(term_options)-strlen(term_options));
-+ sizeof(term_options)-strlen(term_options)-1);
-
- if (set_ctrl)
- strncat(term_options,
- (wxt_ctrl==yes) ? " ctrl" : " noctrl",
-- sizeof(term_options)-strlen(term_options));
-+ sizeof(term_options)-strlen(term_options)-1);
-
- if (set_close)
- wxt_close_terminal_window(wxt_window_number);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131023/951844c7/attachment-0001.html>
More information about the macports-changes
mailing list