Changeset 92569 for trunk


Ignore:
Timestamp:
May 1, 2012, 4:04:54 PM (6 years ago)
Author:
pixilla@…
Message:

math/gnuplot:

  • Upgrade version to 4.6.0.
  • Maintainer commit. Closes #33596
Location:
trunk/dports/math/gnuplot
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/gnuplot/Portfile

    r91505 r92569  
    66
    77name                        gnuplot
    8 version                     4.4.4
     8version                     4.6.0
    99categories                  math science
    1010# the license has some inconvenient requirements that we're not meeting
     
    3232extract.only                ${distname}.tar.gz
    3333checksums                   ${distname}.tar.gz \
    34                             rmd160  7e1d039c05c46fa38b53a3c4afbd328509da901d \
    35                             sha256  d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd \
     34                            rmd160  2c06500f45fb81850b45713a2cd0e38f0021b065 \
     35                            sha256  6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be \
    3636                            ${name}.pdf \
    37                             rmd160  f8bd424418bbf87e405c0f3d7eb2bf759c4770d5 \
    38                             sha256  3495b65604239d78cdad5ac3b34864572382c09ddf8ea202bddafce9133a1adf
     37                            rmd160  374614145a7b78e263b0cfbb695eb22d07dede9a \
     38                            sha256  57bd4d88e1321968ba06f29dfa322b4cd9e6beb4e0f42e1a4775d9c9a41af170
    3939
    4040depends_lib                 port:expat \
     
    5050                            port:zlib
    5151
    52 patchfiles                  patch-src-variable_c.diff
     52patchfiles                  patch-src-variable.c.diff \
     53                            patch-upstream-compilerwarnings.diff \
     54                            patch-upstream-wxt-scroll.diff \
     55                            patch-upstream-qt.diff \
     56                            patch-configure-qt.diff
     57
     58# upstream patches:
     59#
     60# - patch-upstream-compilerwarnings.diff
     61#   2012-03-18 17:30:42 Hans-Bernhard Broeker (cvs commit:broeker)
     62# - patch-upstream-wxt-scroll.diff
     63#   2012-02-29 19:29:25 Mojca Miklavec (cvs commit:sfeam)
     64# - patch-upstream-qt.diff
     65#   2012-04-01 08:49:45 Jérôme Lodewyck (cvs commit:lodewyck)
    5366
    5467platform darwin {
    5568    depends_lib-append      port:aquaterm
    56     configure.cflags-append -DDEFAULTTERM='"aqua"'
    5769}
    5870
     
    8294}
    8395
    84 variant wxwidgets description "Enable wxWidgets front-end" {
    85     depends_lib-append      port:wxWidgets
     96variant luaterm description "Enable lua-based terminals" {
     97    depends_lib-append      port:lua
     98    configure.args-delete   --without-lua
     99    configure.args-append   --with-lua
     100}
     101
     102variant pangocairo description "Enable cairo-based terminals" {
     103    depends_lib-append      path:lib/pkgconfig/pango.pc:pango
     104    configure.args-delete   --without-cairo
     105}
     106
     107# One can in principle choose between wxWidgets and wxWidgets-devel,
     108# but only 2.9 allows building 64-bit binaries.
     109# If it is acceptable to depend on wxWidgets-devel only,
     110# one could delete the variant that depends on wxWidgets 2.8.
     111variant wxwidgets conflicts wxwidgets_devel description "Enable wxt terminal (wxWidgets 2.8, 32-bit only)" {
     112    depends_lib-append      port:wxWidgets path:lib/pkgconfig/pango.pc:pango
    86113    configure.args-delete   --disable-wxwidgets
    87114    configure.args-append   --with-wx-config=${prefix}/bin/wx-config
     
    93120}
    94121
    95 variant luaterm description "Enable Lua terminal" {
    96     depends_lib-append      port:lua
    97     configure.args-delete   --without-lua
    98     configure.args-append   --with-lua
     122variant wxwidgets_devel conflicts wxwidgets description "Enable wxt terminal (using wxWidgets 2.9, supports 64-bit)" {
     123    depends_lib-append      port:wxWidgets-devel path:lib/pkgconfig/pango.pc:pango
     124    configure.args-delete   --disable-wxwidgets
     125    configure.args-append   --with-wx-config=${prefix}/bin/wx-config
     126}
     127if {[variant_isset wxwidgets_devel]} {
     128    # http://trac.wxwidgets.org/ticket/13565
     129    if {${configure.compiler} == "clang"} {
     130        configure.compiler llvm-gcc-4.2
     131    }
    99132}
    100133
    101 variant pangocairo description "Enable cairo-based terminals" {
    102     depends_lib-append      path:lib/pkgconfig/pango.pc:pango
    103     configure.args-delete   --without-cairo
     134variant qt description "Enable qt terminal" {
     135    depends_lib-append      port:qt4-mac
     136    configure.args-append   --enable-qt
    104137}
    105138
  • trunk/dports/math/gnuplot/files/patch-src-variable.c.diff

    r92434 r92569  
    1 --- src/variable.c.orig 2010-10-18 15:41:53.000000000 +0200
    2 +++ src/variable.c      2010-10-18 15:42:11.000000000 +0200
    3 @@ -244,13 +244,13 @@
     1--- src/variable.c.orig
     2+++ src/variable.c
     3@@ -250,13 +250,13 @@
    44 };
    55 #endif
Note: See TracChangeset for help on using the changeset viewer.