[145003] trunk/dports/math/gnuplot

[mojca at macports.org]

Revision: 145003
          https://trac.macports.org/changeset/145003
Author:   mojca at macports.org
Date:     2016-01-23 11:44:38 -0800 (Sat, 23 Jan 2016)
Log Message:
-----------
gnuplot: upgrade to 5.0.2

Modified Paths:
--------------
    trunk/dports/math/gnuplot/Portfile
    trunk/dports/math/gnuplot/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/math/gnuplot/files/patch-term-lua.trm.diff

Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile	2016-01-23 19:35:42 UTC (rev 145002)
+++ trunk/dports/math/gnuplot/Portfile	2016-01-23 19:44:38 UTC (rev 145003)
@@ -7,8 +7,7 @@
 PortGroup           wxWidgets       1.0
 
 name                gnuplot
-version             5.0.1
-revision            5
+version             5.0.2
 categories          math science
 # the license has some inconvenient requirements that we're not meeting
 # to be allowed to distribute binaries
@@ -31,8 +30,8 @@
 master_sites        sourceforge:project/gnuplot/gnuplot/${version}
 dist_subdir         ${name}/${version}
 
-checksums           rmd160  cf2b952af27b0c4ce88ce5d796b07e1c6af4b620 \
-                    sha256  7cbc557e71df581ea520123fb439dea5f073adcc9010a2885dc80d4ed28b3c47
+checksums           rmd160  648d1dbb7f5ad8935bdbcee16fd700238065be0c \
+                    sha256  5a2b31d375f56d29272193370705164cde49545a332841183bcca44f02b1d890
 
 depends_build       path:bin/pkg-config:pkgconfig
 
@@ -51,8 +50,7 @@
 minimum_xcodeversions \
                     {9 3.1}
 
-patchfiles          patch-configure.diff \
-                    patch-term-lua.trm.diff
+patchfiles          patch-configure.diff
 #                   patch-src-qtterminal-qt_conversion.cpp.diff
 
 configure.args      --with-caca=${prefix} \
@@ -114,10 +112,9 @@
         ui_warn "Gnuplot should be compiled against libc++ if you want to use Qt 5."
     }
 
-    depends_lib-append          \
-        port:qt5-qtbase         \
-        port:qt5-qtsvg          \
-        port:qt5-qttools
+    depends_lib-append          port:qt5-qtbase \
+                                port:qt5-qtsvg \
+                                port:qt5-qttools
 
     configure.args-replace      --without-qt --with-qt=qt5
 }

Modified: trunk/dports/math/gnuplot/files/patch-configure.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-configure.diff	2016-01-23 19:35:42 UTC (rev 145002)
+++ trunk/dports/math/gnuplot/files/patch-configure.diff	2016-01-23 19:44:38 UTC (rev 145003)
@@ -1,6 +1,6 @@
 --- configure.orig
 +++ configure
-@@ -13756,7 +13756,7 @@ else
+@@ -13800,7 +13800,7 @@ else
  	GTK_LIBS=$pkg_cv_GTK_LIBS
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
@@ -9,7 +9,7 @@
  fi
    if  test "${have_gtk}" = yes ; then
  
-@@ -14634,6 +14634,7 @@ fi
+@@ -14678,6 +14678,7 @@ fi
  if test "${enable_qt_ok}" = yes \
    || test "${enable_wxwidgets_ok}" = yes \
    || test "$GGI_SUPPORT" = yes \

Deleted: trunk/dports/math/gnuplot/files/patch-term-lua.trm.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-term-lua.trm.diff	2016-01-23 19:35:42 UTC (rev 145002)
+++ trunk/dports/math/gnuplot/files/patch-term-lua.trm.diff	2016-01-23 19:44:38 UTC (rev 145003)
@@ -1,20 +0,0 @@
---- term/lua.trm.orig
-+++ term/lua.trm
-@@ -251,7 +251,7 @@ LUA_GP_int_error(lua_State *L) {
-       msg = luaL_checkstring(L, 1);
-       break;
-     case 2:
--      t_num = luaL_checkint(L, 1);
-+      t_num = luaL_checkinteger(L, 1);
-       msg  = luaL_checkstring(L, 2);
-       break;
-     default:
-@@ -285,7 +285,7 @@ LUA_GP_int_warn(lua_State *L) {
-       msg = luaL_checkstring(L, 1);
-       break;
-     case 2:
--      t_num = luaL_checkint(L, 1);
-+      t_num = luaL_checkinteger(L, 1);
-       msg = luaL_checkstring(L, 2);
-       break;
-     default:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160123/0afc7557/attachment.html>