Revision: 98309 http://trac.macports.org//changeset/98309 Author: ryandesign@macports.org Date: 2012-10-02 12:54:44 -0700 (Tue, 02 Oct 2012) Log Message: ----------- magic: update to 7.5.227; now compiles with clang Modified Paths: -------------- trunk/dports/science/magic/Portfile Added Paths: ----------- trunk/dports/science/magic/files/patch-tcltk-magic.sh.in.diff Modified: trunk/dports/science/magic/Portfile =================================================================== --- trunk/dports/science/magic/Portfile 2012-10-02 19:41:37 UTC (rev 98308) +++ trunk/dports/science/magic/Portfile 2012-10-02 19:54:44 UTC (rev 98309) @@ -5,7 +5,8 @@ PortGroup conflicts_build 1.0 name magic -version 7.5.225 +conflicts magic-devel +version 7.5.227 set major [lindex [split ${version} .] 0] categories science # mostly very permissively licensed, but includes a copy of GNU readline @@ -29,11 +30,14 @@ depends_lib port:tcl port:tk port:blt port:mesa -checksums rmd160 2b18e32af8f7af232183eed4fb60894c90592de7 \ - sha256 a08a52697fed5b55701a66de14c8957ee4a8c667ee11fc3d581769aec6e03ddb +checksums rmd160 c39d9c902e6bb68db84d91c8edbcd47c2f91667d \ + sha256 14d645b58786b3235928f1469c6220ac55d1be40875e8257d2064264c860136b patchfiles patch-scripts-configure.in.diff +# http://opencircuitdesign.com/pipermail/magic-dev/2012/000606.html +patchfiles-append patch-tcltk-magic.sh.in.diff + universal_variant no conflicts_build gnome-keyring @@ -41,10 +45,6 @@ use_autoreconf yes autoreconf.dir ${worksrcpath}/scripts -# error: non-void function should return a value [-Wreturn-type] -# http://opencircuitdesign.com/pipermail/magic-dev/2012/000596.html -compiler.blacklist clang - use_parallel_build no post-build { Added: trunk/dports/science/magic/files/patch-tcltk-magic.sh.in.diff =================================================================== --- trunk/dports/science/magic/files/patch-tcltk-magic.sh.in.diff (rev 0) +++ trunk/dports/science/magic/files/patch-tcltk-magic.sh.in.diff 2012-10-02 19:54:44 UTC (rev 98309) @@ -0,0 +1,11 @@ +--- tcltk/magic.sh.in.orig 2012-10-01 14:21:43.000000000 -0500 ++++ tcltk/magic.sh.in 2012-10-02 14:51:24.000000000 -0500 +@@ -17,7 +17,7 @@ + export MAGIC_WISH + + # Hacks for Cygwin +-if [ `uname -o` == "Cygwin" ]; then ++if [ "no" == "Cygwin" ]; then + export PATH="$PATH:TCLLIB_DIR" + export DISPLAY=${DISPLAY:=":0"} + fi