[92569] trunk/dports/math/gnuplot
pixilla at macports.org
pixilla at macports.org
Tue May 1 09:04:54 PDT 2012
Revision: 92569
https://trac.macports.org/changeset/92569
Author: pixilla at macports.org
Date: 2012-05-01 09:04:54 -0700 (Tue, 01 May 2012)
Log Message:
-----------
math/gnuplot:
- Upgrade version to 4.6.0.
- Maintainer commit. Closes #33596
Modified Paths:
--------------
trunk/dports/math/gnuplot/Portfile
Added Paths:
-----------
trunk/dports/math/gnuplot/files/patch-src-variable.c.diff
Removed Paths:
-------------
trunk/dports/math/gnuplot/files/patch-src-variable_c.diff
Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile 2012-05-01 15:57:06 UTC (rev 92568)
+++ trunk/dports/math/gnuplot/Portfile 2012-05-01 16:04:54 UTC (rev 92569)
@@ -5,7 +5,7 @@
PortGroup xcodeversion 1.0
name gnuplot
-version 4.4.4
+version 4.6.0
categories math science
# the license has some inconvenient requirements that we're not meeting
# to be allowed to distribute binaries
@@ -31,11 +31,11 @@
distfiles-append ${name}.pdf
extract.only ${distname}.tar.gz
checksums ${distname}.tar.gz \
- rmd160 7e1d039c05c46fa38b53a3c4afbd328509da901d \
- sha256 d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd \
+ rmd160 2c06500f45fb81850b45713a2cd0e38f0021b065 \
+ sha256 6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be \
${name}.pdf \
- rmd160 f8bd424418bbf87e405c0f3d7eb2bf759c4770d5 \
- sha256 3495b65604239d78cdad5ac3b34864572382c09ddf8ea202bddafce9133a1adf
+ rmd160 374614145a7b78e263b0cfbb695eb22d07dede9a \
+ sha256 57bd4d88e1321968ba06f29dfa322b4cd9e6beb4e0f42e1a4775d9c9a41af170
depends_lib port:expat \
port:fontconfig \
@@ -49,11 +49,23 @@
port:xpm \
port:zlib
-patchfiles patch-src-variable_c.diff
+patchfiles patch-src-variable.c.diff \
+ patch-upstream-compilerwarnings.diff \
+ patch-upstream-wxt-scroll.diff \
+ patch-upstream-qt.diff \
+ patch-configure-qt.diff
+# upstream patches:
+#
+# - patch-upstream-compilerwarnings.diff
+# 2012-03-18 17:30:42 Hans-Bernhard Broeker (cvs commit:broeker)
+# - patch-upstream-wxt-scroll.diff
+# 2012-02-29 19:29:25 Mojca Miklavec (cvs commit:sfeam)
+# - patch-upstream-qt.diff
+# 2012-04-01 08:49:45 Jérôme Lodewyck (cvs commit:lodewyck)
+
platform darwin {
depends_lib-append port:aquaterm
- configure.cflags-append -DDEFAULTTERM='"aqua"'
}
minimum_xcodeversions {9 3.1}
@@ -81,8 +93,23 @@
configure.args-append --without-x
}
-variant wxwidgets description "Enable wxWidgets front-end" {
- depends_lib-append port:wxWidgets
+variant luaterm description "Enable lua-based terminals" {
+ depends_lib-append port:lua
+ configure.args-delete --without-lua
+ configure.args-append --with-lua
+}
+
+variant pangocairo description "Enable cairo-based terminals" {
+ depends_lib-append path:lib/pkgconfig/pango.pc:pango
+ configure.args-delete --without-cairo
+}
+
+# One can in principle choose between wxWidgets and wxWidgets-devel,
+# but only 2.9 allows building 64-bit binaries.
+# If it is acceptable to depend on wxWidgets-devel only,
+# one could delete the variant that depends on wxWidgets 2.8.
+variant wxwidgets conflicts wxwidgets_devel description "Enable wxt terminal (wxWidgets 2.8, 32-bit only)" {
+ depends_lib-append port:wxWidgets path:lib/pkgconfig/pango.pc:pango
configure.args-delete --disable-wxwidgets
configure.args-append --with-wx-config=${prefix}/bin/wx-config
}
@@ -92,15 +119,21 @@
supported_archs i386 ppc
}
-variant luaterm description "Enable Lua terminal" {
- depends_lib-append port:lua
- configure.args-delete --without-lua
- configure.args-append --with-lua
+variant wxwidgets_devel conflicts wxwidgets description "Enable wxt terminal (using wxWidgets 2.9, supports 64-bit)" {
+ depends_lib-append port:wxWidgets-devel path:lib/pkgconfig/pango.pc:pango
+ configure.args-delete --disable-wxwidgets
+ configure.args-append --with-wx-config=${prefix}/bin/wx-config
}
+if {[variant_isset wxwidgets_devel]} {
+ # http://trac.wxwidgets.org/ticket/13565
+ if {${configure.compiler} == "clang"} {
+ configure.compiler llvm-gcc-4.2
+ }
+}
-variant pangocairo description "Enable cairo-based terminals" {
- depends_lib-append path:lib/pkgconfig/pango.pc:pango
- configure.args-delete --without-cairo
+variant qt description "Enable qt terminal" {
+ depends_lib-append port:qt4-mac
+ configure.args-append --enable-qt
}
variant tutorial description "Build the tutorial (requires a tex install)" {
Copied: trunk/dports/math/gnuplot/files/patch-src-variable.c.diff (from rev 92434, trunk/dports/math/gnuplot/files/patch-src-variable_c.diff)
===================================================================
--- trunk/dports/math/gnuplot/files/patch-src-variable.c.diff (rev 0)
+++ trunk/dports/math/gnuplot/files/patch-src-variable.c.diff 2012-05-01 16:04:54 UTC (rev 92569)
@@ -0,0 +1,20 @@
+--- src/variable.c.orig
++++ src/variable.c
+@@ -250,13 +250,13 @@
+ };
+ #endif
+
+-#if defined(_Macintosh) && !defined(FONTPATHSET)
++#if defined(__APPLE__) && !defined(FONTPATHSET)
+ # define FONTPATHSET
+ static const struct path_table fontpath_tbl[] =
+ {
+- { "/System/Library/Fonts!" },
+- { "/Library/Fonts!" },
+- { "$(HOME)/Library/Fonts!" },
++ { "/System/Library/Fonts" },
++ { "/Library/Fonts" },
++ { "$(HOME)/Library/Fonts" },
+ { NULL }
+ };
+ #endif
Deleted: trunk/dports/math/gnuplot/files/patch-src-variable_c.diff
===================================================================
--- trunk/dports/math/gnuplot/files/patch-src-variable_c.diff 2012-05-01 15:57:06 UTC (rev 92568)
+++ trunk/dports/math/gnuplot/files/patch-src-variable_c.diff 2012-05-01 16:04:54 UTC (rev 92569)
@@ -1,20 +0,0 @@
---- src/variable.c.orig 2010-10-18 15:41:53.000000000 +0200
-+++ src/variable.c 2010-10-18 15:42:11.000000000 +0200
-@@ -244,13 +244,13 @@
- };
- #endif
-
--#if defined(_Macintosh) && !defined(FONTPATHSET)
-+#if defined(__APPLE__) && !defined(FONTPATHSET)
- # define FONTPATHSET
- static const struct path_table fontpath_tbl[] =
- {
-- { "/System/Library/Fonts!" },
-- { "/Library/Fonts!" },
-- { "$(HOME)/Library/Fonts!" },
-+ { "/System/Library/Fonts" },
-+ { "/Library/Fonts" },
-+ { "$(HOME)/Library/Fonts" },
- { NULL }
- };
- #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120501/5ce8cfd7/attachment-0001.html>
More information about the macports-changes
mailing list