[115280] trunk/dports/science/stimfit

mojca at macports.org mojca at macports.org
Mon Dec 30 08:40:33 PST 2013


Revision: 115280
          https://trac.macports.org/changeset/115280
Author:   mojca at macports.org
Date:     2013-12-30 08:40:33 -0800 (Mon, 30 Dec 2013)
Log Message:
-----------
stimfit: fix a configuration bug that treats wxWidgets vers. 3.0.0 as smaller than 2.8.0

Modified Paths:
--------------
    trunk/dports/science/stimfit/Portfile

Added Paths:
-----------
    trunk/dports/science/stimfit/files/
    trunk/dports/science/stimfit/files/patch-configure.diff

Modified: trunk/dports/science/stimfit/Portfile
===================================================================
--- trunk/dports/science/stimfit/Portfile	2013-12-30 16:14:07 UTC (rev 115279)
+++ trunk/dports/science/stimfit/Portfile	2013-12-30 16:40:33 UTC (rev 115280)
@@ -26,6 +26,8 @@
                     port:hdf5-18 \
                     port:${wxWidgets.port}
 
+patchfiles          patch-configure.diff
+
 configure.args      --with-wx-config=${wxWidgets.wxconfig} \
                     --disable-dependency-tracking \
                     --disable-python

Added: trunk/dports/science/stimfit/files/patch-configure.diff
===================================================================
--- trunk/dports/science/stimfit/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/stimfit/files/patch-configure.diff	2013-12-30 16:40:33 UTC (rev 115280)
@@ -0,0 +1,25 @@
+# bugfix: wxWidgets version x.y.z was compared as y00y00z >= 2008000 instead of x00y00z >= 2008000
+# this needs to be reported upstream
+#
+--- configure.orig
++++ configure
+@@ -16470,7 +16470,7 @@ $as_echo "not found" >&6; }
+     # Verify minimus requires
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets libraries" >&5
+ $as_echo_n "checking for wxWidgets libraries... " >&6; }
+-    vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($2 * 1000 + $2) * 1000 + $3;}'`
++    vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'`
+     if test -n "$vers" && test "$vers" -ge 2008000; then
+             WX_CPPFLAGS="`$WXCONFIG --cppflags`"
+             WX_CXXFLAGS="`$WXCONFIG --cxxflags`"
+--- configure.ac.orig
++++ configure.ac
+@@ -238,7 +238,7 @@ if test "$enable_module" != "yes"; then
+ 
+     # Verify minimus requires
+     AC_MSG_CHECKING(for wxWidgets libraries)
+-    vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($2 * 1000 + $2) * 1000 + $3;}'`
++    vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'`
+     if test -n "$vers" && test "$vers" -ge 2008000; then
+             WX_CPPFLAGS="`$WXCONFIG --cppflags`"
+             WX_CXXFLAGS="`$WXCONFIG --cxxflags`"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131230/d0b9bfb0/attachment.html>


More information about the macports-changes mailing list