February 2012 - macports-changes - lists.macosforge.org

[89545] trunk/dports/python/py-kapteyn/Portfile
by robitaille＠macports.org 01 Feb '12

01 Feb '12

Revision: 89545 http://trac.macports.org/changeset/89545 Author: robitaille(a)macports.org Date: 2012-02-01 13:37:09 -0800 (Wed, 01 Feb 2012) Log Message: ----------- py-kapteyn: fixed unified Portfile Modified Paths: -------------- trunk/dports/python/py-kapteyn/Portfile Modified: trunk/dports/python/py-kapteyn/Portfile =================================================================== --- trunk/dports/python/py-kapteyn/Portfile 2012-02-01 21:36:42 UTC (rev 89544) +++ trunk/dports/python/py-kapteyn/Portfile 2012-02-01 21:37:09 UTC (rev 89545) @@ -31,6 +31,8 @@ python.versions 25 26 27 python.default_version 27 -depends_run-append port:py${python.version}-numpy \ - port:py${python.version}-pyfits \ - port:py${python.version}-matplotlib +if {$subport != $name} { + depends_run-append port:py${python.version}-numpy \ + port:py${python.version}-pyfits \ + port:py${python.version}-matplotlib +} \ No newline at end of file

1 0

[89544] trunk/dports/python/py-atpy/Portfile
by robitaille＠macports.org 01 Feb '12

01 Feb '12

Revision: 89544 http://trac.macports.org/changeset/89544 Author: robitaille(a)macports.org Date: 2012-02-01 13:36:42 -0800 (Wed, 01 Feb 2012) Log Message: ----------- py-atpy: fixed unified Portfile Modified Paths: -------------- trunk/dports/python/py-atpy/Portfile Modified: trunk/dports/python/py-atpy/Portfile =================================================================== --- trunk/dports/python/py-atpy/Portfile 2012-02-01 21:35:56 UTC (rev 89543) +++ trunk/dports/python/py-atpy/Portfile 2012-02-01 21:36:42 UTC (rev 89544) @@ -30,29 +30,33 @@ python.versions 25 26 27 python.default_version 27 -depends_run-append port:py${python.version}-numpy +if {$subport != $name} { -variant fits description {Include support for FITS tables} { - depends_run-append port:py${python.version}-pyfits -} + depends_run-append port:py${python.version}-numpy -variant hdf5 description {Include support for HDF5 tables} { - depends_run-append port:py${python.version}-h5py -} + variant fits description {Include support for FITS tables} { + depends_run-append port:py${python.version}-pyfits + } -variant vo description {Include support for VO tables} { - depends_run-append port:py${python.version}-vo -} + variant hdf5 description {Include support for HDF5 tables} { + depends_run-append port:py${python.version}-h5py + } -variant ascii description {Include support for ASCII tables} { - depends_run-append port:py${python.version}-asciitable -} + variant vo description {Include support for VO tables} { + depends_run-append port:py${python.version}-vo + } -variant sql description {Include support for SQL databases} { - depends_run-append port:py${python.version}-mysql \ - port:py${python.version}-pygresql -} + variant ascii description {Include support for ASCII tables} { + depends_run-append port:py${python.version}-asciitable + } -variant all requires fits hdf5 vo ascii sql description {Include support for all input/output types (FITS, HDF5, VO, ASCII, and SQL)} {} + variant sql description {Include support for SQL databases} { + depends_run-append port:py${python.version}-mysql \ + port:py${python.version}-pygresql + } -default_variants +fits +hdf5 +vo +ascii + variant all requires fits hdf5 vo ascii sql description {Include support for all input/output types (FITS, HDF5, VO, ASCII, and SQL)} {} + + default_variants +fits +hdf5 +vo +ascii + +}

1 0

[89543] trunk/dports/python/py-asciitable/Portfile
by robitaille＠macports.org 01 Feb '12

01 Feb '12

Revision: 89543 http://trac.macports.org/changeset/89543 Author: robitaille(a)macports.org Date: 2012-02-01 13:35:56 -0800 (Wed, 01 Feb 2012) Log Message: ----------- py-asciitable: fixed unified Portfile Modified Paths: -------------- trunk/dports/python/py-asciitable/Portfile Modified: trunk/dports/python/py-asciitable/Portfile =================================================================== --- trunk/dports/python/py-asciitable/Portfile 2012-02-01 21:35:27 UTC (rev 89542) +++ trunk/dports/python/py-asciitable/Portfile 2012-02-01 21:35:56 UTC (rev 89543) @@ -24,4 +24,6 @@ python.versions 25 26 27 31 32 python.default_version 27 -depends_run-append port:py${python.version}-numpy +if {$subport != $name} { + depends_run-append port:py${python.version}-numpy +} \ No newline at end of file

1 0

[89542] trunk/dports/python/py-aplpy/Portfile
by robitaille＠macports.org 01 Feb '12

01 Feb '12

Revision: 89542 http://trac.macports.org/changeset/89542 Author: robitaille(a)macports.org Date: 2012-02-01 13:35:27 -0800 (Wed, 01 Feb 2012) Log Message: ----------- py-aplpy: fixed unified Portfile Modified Paths: -------------- trunk/dports/python/py-aplpy/Portfile Modified: trunk/dports/python/py-aplpy/Portfile =================================================================== --- trunk/dports/python/py-aplpy/Portfile 2012-02-01 20:55:01 UTC (rev 89541) +++ trunk/dports/python/py-aplpy/Portfile 2012-02-01 21:35:27 UTC (rev 89542) @@ -31,25 +31,29 @@ python.versions 25 26 27 python.default_version 27 -depends_run-append port:py${python.version}-numpy \ - port:py${python.version}-pyfits \ - port:py${python.version}-pywcs \ - port:py${python.version}-matplotlib \ +if {$subport != $name} { -variant rgb description {Include support for RGB images} { - depends_run-append port:py${python.version}-pil -} + depends_run-append port:py${python.version}-numpy \ + port:py${python.version}-pyfits \ + port:py${python.version}-pywcs \ + port:py${python.version}-matplotlib \ -variant avm description {Include support for AVM meta-data} { - depends_run-append port:py${python.version}-pyavm -} + variant rgb description {Include support for RGB images} { + depends_run-append port:py${python.version}-pil + } -variant ds9 description {Include support for DS9 region files} { - depends_run-append port:py${python.version}-pyregion -} + variant avm description {Include support for AVM meta-data} { + depends_run-append port:py${python.version}-pyavm + } -variant montage description {Include support for Montage reprojection} { - depends_run-append port:py${python.version}-montage + variant ds9 description {Include support for DS9 region files} { + depends_run-append port:py${python.version}-pyregion + } + + variant montage description {Include support for Montage reprojection} { + depends_run-append port:py${python.version}-montage + } + + default_variants +rgb +avm +ds9 + } - -default_variants +rgb +avm +ds9

1 0

[89541] trunk/dports/devel/boost/Portfile
by adfernandes＠macports.org 01 Feb '12

01 Feb '12

Revision: 89541 http://trac.macports.org/changeset/89541 Author: adfernandes(a)macports.org Date: 2012-02-01 12:55:01 -0800 (Wed, 01 Feb 2012) Log Message: ----------- devel/boost: support building for a different SDK (closes #33085) Modified Paths: -------------- trunk/dports/devel/boost/Portfile Modified: trunk/dports/devel/boost/Portfile =================================================================== --- trunk/dports/devel/boost/Portfile 2012-02-01 20:49:22 UTC (rev 89540) +++ trunk/dports/devel/boost/Portfile 2012-02-01 20:55:01 UTC (rev 89541) @@ -78,7 +78,7 @@ } else { set filter "" } - write_jam "using darwin : : ${filter}${configure.cxx} ;" + write_jam "using darwin : : ${filter}${configure.cxx} -isysroot ${configure.sdkroot} ;" }

1 0

[89540] trunk/dports/textproc/canna/Portfile
by jeremyhu＠macports.org 01 Feb '12

01 Feb '12

Revision: 89540 http://trac.macports.org/changeset/89540 Author: jeremyhu(a)macports.org Date: 2012-02-01 12:49:22 -0800 (Wed, 01 Feb 2012) Log Message: ----------- canna: xmkmf.env isn't needed with r89539 in base, and it was not properly honored beforehand anyway, so just remove it Revision Links: -------------- http://trac.macports.org/changeset/89539 Modified Paths: -------------- trunk/dports/textproc/canna/Portfile Modified: trunk/dports/textproc/canna/Portfile =================================================================== --- trunk/dports/textproc/canna/Portfile 2012-02-01 20:48:41 UTC (rev 89539) +++ trunk/dports/textproc/canna/Portfile 2012-02-01 20:49:22 UTC (rev 89540) @@ -53,7 +53,6 @@ if {${configure.compiler} == "clang"} { configure.compiler llvm-gcc-4.2 } -xmkmf.env-append IMAKECPP="${configure.cpp}" build.env-append IMAKECPP="${configure.cpp}" pre-build {

1 0

[89539] trunk/base/src/port1.0/portconfigure.tcl
by jeremyhu＠macports.org 01 Feb '12

01 Feb '12

Revision: 89539 http://trac.macports.org/changeset/89539 Author: jeremyhu(a)macports.org Date: 2012-02-01 12:48:41 -0800 (Wed, 01 Feb 2012) Log Message: ----------- Actually IMAKECPP for use_xmkmf (previous was an incomplete commit) Modified Paths: -------------- trunk/base/src/port1.0/portconfigure.tcl Modified: trunk/base/src/port1.0/portconfigure.tcl =================================================================== --- trunk/base/src/port1.0/portconfigure.tcl 2012-02-01 20:44:03 UTC (rev 89538) +++ trunk/base/src/port1.0/portconfigure.tcl 2012-02-01 20:48:41 UTC (rev 89539) @@ -697,10 +697,14 @@ } if {[tbool use_xmkmf]} { + parse_environment xmkmf append_list_to_environment_value xmkmf "IMAKECPP" ${configure.cpp} if {[catch {command_exec xmkmf} result]} { return -code error "[format [msgcat::mc "%s failure: %s"] xmkmf $result]" } + + parse_environment xmkmf + append_list_to_environment_value xmkmf "IMAKECPP" ${configure.cpp} if {[catch {command_exec "cd ${worksrcpath} && make Makefiles" -varprefix xmkmf} result]} { return -code error "[format [msgcat::mc "%s failure: %s"] "make Makefiles" $result]" }

1 0

[89538] trunk/base/src/port1.0/portconfigure.tcl
by jeremyhu＠macports.org 01 Feb '12

01 Feb '12

Revision: 89538 http://trac.macports.org/changeset/89538 Author: jeremyhu(a)macports.org Date: 2012-02-01 12:44:03 -0800 (Wed, 01 Feb 2012) Log Message: ----------- Set IMAKECPP for use_xmkmf Modified Paths: -------------- trunk/base/src/port1.0/portconfigure.tcl Modified: trunk/base/src/port1.0/portconfigure.tcl =================================================================== --- trunk/base/src/port1.0/portconfigure.tcl 2012-02-01 20:39:34 UTC (rev 89537) +++ trunk/base/src/port1.0/portconfigure.tcl 2012-02-01 20:44:03 UTC (rev 89538) @@ -697,6 +697,7 @@ } if {[tbool use_xmkmf]} { + append_list_to_environment_value xmkmf "IMAKECPP" ${configure.cpp} if {[catch {command_exec xmkmf} result]} { return -code error "[format [msgcat::mc "%s failure: %s"] xmkmf $result]" }

1 0

[89537] trunk/base/src/port1.0
by jeremyhu＠macports.org 01 Feb '12

01 Feb '12

Revision: 89537 http://trac.macports.org/changeset/89537 Author: jeremyhu(a)macports.org Date: 2012-02-01 12:39:34 -0800 (Wed, 01 Feb 2012) Log Message: ----------- Fix use_xmkmf to honor xmkmf.env for its make Makefiles phase, required for the workaround for #31504 Modified Paths: -------------- trunk/base/src/port1.0/portconfigure.tcl trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/port1.0/portconfigure.tcl =================================================================== --- trunk/base/src/port1.0/portconfigure.tcl 2012-02-01 20:18:56 UTC (rev 89536) +++ trunk/base/src/port1.0/portconfigure.tcl 2012-02-01 20:39:34 UTC (rev 89537) @@ -699,11 +699,10 @@ if {[tbool use_xmkmf]} { if {[catch {command_exec xmkmf} result]} { return -code error "[format [msgcat::mc "%s failure: %s"] xmkmf $result]" - } else { - # XXX should probably use make command abstraction but we know that - # X11 will already set things up so that "make Makefiles" always works. - system "cd ${worksrcpath} && make Makefiles" } + if {[catch {command_exec "cd ${worksrcpath} && make Makefiles" -varprefix xmkmf} result]} { + return -code error "[format [msgcat::mc "%s failure: %s"] "make Makefiles" $result]" + } } elseif {[tbool use_configure]} { # Merge (ld|c|cpp|cxx)flags into the environment variable. parse_environment configure Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2012-02-01 20:18:56 UTC (rev 89536) +++ trunk/base/src/port1.0/portutil.tcl 2012-02-01 20:39:34 UTC (rev 89537) @@ -355,12 +355,13 @@ } # Given a command name, execute it with the options. -# command_exec command [-notty] [command_prefix [command_suffix]] +# command_exec command [-notty] [-varprefix variable_prefix] [command_prefix [command_suffix]] # command name of the command +# variable_prefix name of the variable prefix to use (defaults to command) # command_prefix additional command prefix (typically pipe command) # command_suffix additional command suffix (typically redirection) proc command_exec {command args} { - global ${command}.env ${command}.env_array ${command}.nice env macosx_version + set varprefix "${command}" set notty "" set command_prefix "" set command_suffix "" @@ -371,6 +372,11 @@ set args [lrange $args 1 end] } + if {[lindex $args 0] == "-varprefix"} { + set varprefix [lindex $args 1] + set args [lrange $args 2 end] + } + if {[llength $args] > 0} { set command_prefix [lindex $args 0] if {[llength $args] > 1} { @@ -379,37 +385,39 @@ } } + global ${varprefix}.env ${varprefix}.env_array ${varprefix}.nice env macosx_version + # Set the environment. # If the array doesn't exist, we create it with the value - # coming from ${command}.env + # coming from ${varprefix}.env # Otherwise, it means the caller actually played with the environment # array already (e.g. configure flags). - if {![array exists ${command}.env_array]} { - parse_environment ${command} + if {![array exists ${varprefix}.env_array]} { + parse_environment ${varprefix} } if {[option macosx_deployment_target] ne ""} { - set ${command}.env_array(MACOSX_DEPLOYMENT_TARGET) [option macosx_deployment_target] + set ${varprefix}.env_array(MACOSX_DEPLOYMENT_TARGET) [option macosx_deployment_target] } - set ${command}.env_array(CC_PRINT_OPTIONS) "YES" - set ${command}.env_array(CC_PRINT_OPTIONS_FILE) [file join [option workpath] ".CC_PRINT_OPTIONS"] + set ${varprefix}.env_array(CC_PRINT_OPTIONS) "YES" + set ${varprefix}.env_array(CC_PRINT_OPTIONS_FILE) [file join [option workpath] ".CC_PRINT_OPTIONS"] if {[option compiler.cpath] ne ""} { - set ${command}.env_array(CPATH) [join [option compiler.cpath] :] + set ${varprefix}.env_array(CPATH) [join [option compiler.cpath] :] } if {[option compiler.library_path] ne ""} { - set ${command}.env_array(LIBRARY_PATH) [join [option compiler.library_path] :] + set ${varprefix}.env_array(LIBRARY_PATH) [join [option compiler.library_path] :] } # When building, g-ir-scanner should not save its cache to $HOME # See: https://trac.macports.org/ticket/26783 - set ${command}.env_array(GI_SCANNER_DISABLE_CACHE) "1" + set ${varprefix}.env_array(GI_SCANNER_DISABLE_CACHE) "1" # Debug that. - ui_debug "Environment: [environment_array_to_string ${command}.env_array]" + ui_debug "Environment: [environment_array_to_string ${varprefix}.env_array]" # Prepare nice value change set nice "" - if {[info exists ${command}.nice] && [set ${command}.nice] != ""} { - set nice "-nice [set ${command}.nice]" + if {[info exists ${varprefix}.nice] && [set ${varprefix}.nice] != ""} { + set nice "-nice [set ${varprefix}.nice]" } # Get the command string. @@ -420,14 +428,14 @@ # Save the environment. array set saved_env [array get env] # Set the overriden variables from the portfile. - array set env [array get ${command}.env_array] + array set env [array get ${varprefix}.env_array] # Call the command. set fullcmdstring "$command_prefix $cmdstring $command_suffix" ui_debug "Executing command line: $fullcmdstring" set code [catch {eval system $notty $nice \$fullcmdstring} result] # Unset the command array until next time. - array unset ${command}.env_array + array unset ${varprefix}.env_array # Restore the environment. array unset env *

1 0

[89536] trunk/dports/textproc/canna/Portfile
by jeremyhu＠macports.org 01 Feb '12

01 Feb '12

Revision: 89536 http://trac.macports.org/changeset/89536 Author: jeremyhu(a)macports.org Date: 2012-02-01 12:18:56 -0800 (Wed, 01 Feb 2012) Log Message: ----------- canna: Use llvm-gcc, partial workaround for #31504 Modified Paths: -------------- trunk/dports/textproc/canna/Portfile Modified: trunk/dports/textproc/canna/Portfile =================================================================== --- trunk/dports/textproc/canna/Portfile 2012-02-01 19:25:12 UTC (rev 89535) +++ trunk/dports/textproc/canna/Portfile 2012-02-01 20:18:56 UTC (rev 89536) @@ -49,6 +49,13 @@ use_xmkmf yes +# https://trac.macports.org/ticket/31504 +if {${configure.compiler} == "clang"} { + configure.compiler llvm-gcc-4.2 +} +xmkmf.env-append IMAKECPP="${configure.cpp}" +build.env-append IMAKECPP="${configure.cpp}" + pre-build { build.target canna if {[variant_isset universal]} {

1 0