April 2013 - macports-changes - lists.macosforge.org

[104856] trunk/dports/python
by stromnov＠macports.org 04 Apr '13

04 Apr '13

Revision: 104856 https://trac.macports.org/changeset/104856 Author: stromnov(a)macports.org Date: 2013-04-03 22:52:10 -0700 (Wed, 03 Apr 2013) Log Message: ----------- py-pywavelets: update to version 0.2.2, unify (#38597, maintainer timeout) Modified Paths: -------------- trunk/dports/python/py-pywavelets/Portfile Added Paths: ----------- trunk/dports/python/py-pywavelets/ Removed Paths: ------------- trunk/dports/python/py-pywavelets/files/ trunk/dports/python/py25-pywavelets/ trunk/dports/python/py26-pywavelets/ Modified: trunk/dports/python/py-pywavelets/Portfile =================================================================== --- trunk/dports/python/py26-pywavelets/Portfile 2013-03-30 07:35:34 UTC (rev 104608) +++ trunk/dports/python/py-pywavelets/Portfile 2013-04-04 05:52:10 UTC (rev 104856) @@ -2,23 +2,40 @@ # $Id$ PortSystem 1.0 -PortGroup python26 1.0 +PortGroup python 1.0 -name py26-pywavelets -version 0.2.0 -categories python +name py-pywavelets +version 0.2.2 +revision 0 +categories-append science math platforms darwin -maintainers jameskyle +license MIT + +python.versions 26 27 + +maintainers jameskyle openmaintainer + description PyWavelets is a Python wavelet transforms module -long_description ${description}. +long_description ${description}. homepage http://pypi.python.org/pypi/PyWavelets/ master_sites http://pypi.python.org/packages/source/P/PyWavelets/ + distname PyWavelets-${version} -build.env CFLAGS='-I${prefix}/include -L${prefix}/lib' -checksums sha1 0c70cd2ad1ef1bb2c2266240d973192944414f31 \ - rmd160 31571e3991c2aab332f929d5c64a466d16590e5a +use_zip yes -patchfiles patch-src-_pywt.pyx.diff -depends_build port:py26-cython +checksums rmd160 ae4ce162fbe1cdc0ee267388b7213e3a2a2c31d8 \ + sha256 04b53436f5f2a9b895a1f56e86e16b94632a5d6bcfc076be1110e41cf3071278 + +if {$subport != $name} { + depends_build-append \ + port:py${python.version}-distribute \ + port:py${python.version}-cython + + livecheck.type none +} else { + livecheck.type regex + livecheck.url ${master_sites} + livecheck.regex "PyWavelets-(\\d+(?:\\.\\d+)*)${extract.suffix}" +}

1 0

[104855] trunk/dports/science/gr-osmosdr/Portfile
by michaelld＠macports.org 04 Apr '13

04 Apr '13

Revision: 104855 https://trac.macports.org/changeset/104855 Author: michaelld(a)macports.org Date: 2013-04-03 18:23:36 -0700 (Wed, 03 Apr 2013) Log Message: ----------- gr-osmosdr: * update to latest; * change gnuradio dependency to allow any gnuradio port; * update active_variants to allow any gnuradio port. Modified Paths: -------------- trunk/dports/science/gr-osmosdr/Portfile Modified: trunk/dports/science/gr-osmosdr/Portfile =================================================================== --- trunk/dports/science/gr-osmosdr/Portfile 2013-04-04 00:57:56 UTC (rev 104854) +++ trunk/dports/science/gr-osmosdr/Portfile 2013-04-04 01:23:36 UTC (rev 104855) @@ -18,17 +18,17 @@ long_description ${description}: \ Support includes GNU Radio source and sink blocks in C++, Python, and GNU Radio Companion (grc). This port also offers a wrapper functionality for the FunCube Dongle, Ettus UHD, and rtl-sdr radios. By using gr-osmosdr source you can take advantage of a common software api in your applications independent of the underlying radio hardware. -version 20130313 +version 20130317 fetch.type git git.url git://git.osmocom.org/gr-osmosdr -git.branch 901dca8135507c0bde0c187ba9226c3d63aabcc6 +git.branch e85c68d9f84f955cbe9f3d4c730561580f6cfcf9 livecheck.url http://cgit.osmocom.org/cgit/gr-osmosdr/ livecheck.version ${git.branch} livecheck.regex id=(\[a-f0-9\]+).>HEAD< -depends_lib-append port:gnuradio \ +depends_lib-append path:lib/libgnuradio-audio.dylib:gnuradio \ port:rtl-sdr # do VPATH build @@ -70,9 +70,9 @@ set chosen_python_suffix ${s} # require gnuradio to also have this variant + require_active_variants \ + path:lib/libgnuradio-audio.dylib:gnuradio ${p} - require_active_variants gnuradio ${p} - # specify the Python dependencies depends_lib-append \ @@ -106,7 +106,7 @@ # shortcut to installing all variants except Python variant full requires docs uhd swig \ - description {Enable all variants except python} {} + description {Enable all variants except +debug and +universal} {} variant docs description "Install ${name} documentation" { @@ -135,7 +135,8 @@ # require gnuradio to also have this variant - require_active_variants gnuradio uhd + require_active_variants \ + path:lib/libgnuradio-audio.dylib:gnuradio uhd configure.args-append \ -DENABLE_UHD=ON \ @@ -164,7 +165,8 @@ # require gnuradio to also have this variant - require_active_variants gnuradio swig + require_active_variants \ + path:lib/libgnuradio-audio.dylib:gnuradio swig configure.args-append \ -DSWIG_EXECUTABLE=${prefix}/bin/swig

1 0

[104854] trunk/dports/x11/pango-devel/Portfile
by cal＠macports.org 04 Apr '13

04 Apr '13

Revision: 104854 https://trac.macports.org/changeset/104854 Author: cal(a)macports.org Date: 2013-04-03 17:57:56 -0700 (Wed, 03 Apr 2013) Log Message: ----------- pango-devel: allow cairo-devel to satisfy active_variants checks, openmaintainer Modified Paths: -------------- trunk/dports/x11/pango-devel/Portfile Modified: trunk/dports/x11/pango-devel/Portfile =================================================================== --- trunk/dports/x11/pango-devel/Portfile 2013-04-04 00:56:05 UTC (rev 104853) +++ trunk/dports/x11/pango-devel/Portfile 2013-04-04 00:57:56 UTC (rev 104854) @@ -53,9 +53,9 @@ # distinguish whether an installed pango has quartz support or not. } if {[variant_isset quartz]} { - require_active_variants cairo quartz + require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz } else { - require_active_variants cairo "" quartz + require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" quartz } } @@ -105,9 +105,9 @@ default_variants +x11 if {[variant_isset x11]} { - require_active_variants cairo x11 + require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11 } else { - require_active_variants cairo "" x11 + require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" x11 } post-destroot {

1 0

[104853] trunk/dports/x11/pango/Portfile
by cal＠macports.org 04 Apr '13

04 Apr '13

Revision: 104853 https://trac.macports.org/changeset/104853 Author: cal(a)macports.org Date: 2013-04-03 17:56:05 -0700 (Wed, 03 Apr 2013) Log Message: ----------- pango: allow cairo-devel to satisfy active_variants checks, openmaintainer Modified Paths: -------------- trunk/dports/x11/pango/Portfile Modified: trunk/dports/x11/pango/Portfile =================================================================== --- trunk/dports/x11/pango/Portfile 2013-04-04 00:54:01 UTC (rev 104852) +++ trunk/dports/x11/pango/Portfile 2013-04-04 00:56:05 UTC (rev 104853) @@ -54,9 +54,9 @@ # distinguish whether an installed pango has quartz support or not. } if {[variant_isset quartz]} { - require_active_variants cairo quartz + require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz } else { - require_active_variants cairo "" quartz + require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" quartz } } @@ -106,9 +106,9 @@ default_variants +x11 if {[variant_isset x11]} { - require_active_variants cairo x11 + require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11 } else { - require_active_variants cairo "" x11 + require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" x11 } post-destroot {

1 0

[104852] trunk/dports/python/py-cairo/Portfile
by cal＠macports.org 04 Apr '13

04 Apr '13

Revision: 104852 https://trac.macports.org/changeset/104852 Author: cal(a)macports.org Date: 2013-04-03 17:54:01 -0700 (Wed, 03 Apr 2013) Log Message: ----------- py-cairo: allow cairo-devel to satisfy active_variants checks, openmaintainer Modified Paths: -------------- trunk/dports/python/py-cairo/Portfile Modified: trunk/dports/python/py-cairo/Portfile =================================================================== --- trunk/dports/python/py-cairo/Portfile 2013-04-04 00:52:09 UTC (rev 104851) +++ trunk/dports/python/py-cairo/Portfile 2013-04-04 00:54:01 UTC (rev 104852) @@ -79,10 +79,10 @@ } variant x11 { - require_active_variants cairo x11 quartz + require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11 quartz } - if {![catch {set result [active_variants cairo x11 quartz]}]} { + if {![catch {set result [active_variants path:lib/pkgconfig/cairo.pc:cairo x11 quartz]}]} { if {$result} { default_variants +x11 }

1 0

[104851] trunk/dports/gnome/gtk2/Portfile
by cal＠macports.org 04 Apr '13

04 Apr '13

Revision: 104851 https://trac.macports.org/changeset/104851 Author: cal(a)macports.org Date: 2013-04-03 17:52:09 -0700 (Wed, 03 Apr 2013) Log Message: ----------- gtk2: allow pango-devel and cairo-devel to satisfy active_variants checks Modified Paths: -------------- trunk/dports/gnome/gtk2/Portfile Modified: trunk/dports/gnome/gtk2/Portfile =================================================================== --- trunk/dports/gnome/gtk2/Portfile 2013-04-04 00:50:16 UTC (rev 104850) +++ trunk/dports/gnome/gtk2/Portfile 2013-04-04 00:52:09 UTC (rev 104851) @@ -198,15 +198,15 @@ } variant quartz conflicts x11 { - require_active_variants cairo quartz - require_active_variants pango quartz + require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz + require_active_variants path:lib/pkgconfig/pango.pc:pango quartz configure.args-append --with-gdktarget=quartz } variant x11 conflicts quartz no_x11 { - require_active_variants cairo x11 - require_active_variants pango x11 + require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11 + require_active_variants path:lib/pkgconfig/pango.pc:pango x11 depends_lib-append \ port:xorg-libXi \

1 0

[104850] trunk/dports/gnome/gtk3/Portfile
by cal＠macports.org 04 Apr '13

04 Apr '13

Revision: 104850 https://trac.macports.org/changeset/104850 Author: cal(a)macports.org Date: 2013-04-03 17:50:16 -0700 (Wed, 03 Apr 2013) Log Message: ----------- gtk3: allow pango-devel and cairo-devel to satisfy active_variants checks Modified Paths: -------------- trunk/dports/gnome/gtk3/Portfile Modified: trunk/dports/gnome/gtk3/Portfile =================================================================== --- trunk/dports/gnome/gtk3/Portfile 2013-04-04 00:45:15 UTC (rev 104849) +++ trunk/dports/gnome/gtk3/Portfile 2013-04-04 00:50:16 UTC (rev 104850) @@ -201,15 +201,15 @@ } variant quartz conflicts x11 { - require_active_variants cairo quartz - require_active_variants pango quartz + require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz + require_active_variants path:lib/pkgconfig/pango.pc:pango quartz configure.args-append --enable-quartz-backend } variant x11 conflicts quartz no_x11 { - require_active_variants cairo x11 - require_active_variants pango x11 + require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11 + require_active_variants path:lib/pkgconfig/pango.pc:pango x11 depends_lib-append \ port:xorg-libXi \

1 0

[104849] trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl
by cal＠macports.org 04 Apr '13

04 Apr '13

Revision: 104849 https://trac.macports.org/changeset/104849 Author: cal(a)macports.org Date: 2013-04-03 17:45:15 -0700 (Wed, 03 Apr 2013) Log Message: ----------- active_variants-1.1: support depspec-style dependencies, closes #38117, patch by michaelld Modified Paths: -------------- trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl Modified: trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2013-04-03 22:51:27 UTC (rev 104848) +++ trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2013-04-04 00:45:15 UTC (rev 104849) @@ -45,7 +45,9 @@ # # where # $name -# is the name of the port you're trying to check (required) +# is the name of the port you're trying to check (required), which can be +# specified as either just the port, or via "(bin:lib:path):FOO:port" +# as accepted by the dependency parser. # $required # is a list of variants that must be enabled for the test to succeed # (required; remember this can also be a space-separated string or just @@ -81,8 +83,24 @@ # v1.1: # - require_active_variants no longer needs to be used in a pre-configure # phase manually, because it automatically wraps itself in pre-configure. +# - the active_variants portgroup can now also deal with depspec-style +# dependencies, e.g., require_active_variants path:foo/bar:standardport +# variant proc active_variants {name required {forbidden {}}} { + # get the port which will provide $name; this allows us to support e.g., + # path-style dependencies. This comes from port1.0/portutil.tcl and should + # probably not be considered public API. + set port [_get_dep_port $name] + if {$port == ""} { + ui_error "active_variants: Error: invalid port name '${name}'" + ui_error " expecting either: port or (bin:lib:path):foo:port" + return 0 + } + if {$name != $port} { + ui_debug "Checking $port for active variants for depspec '$name'" + } + # registry_active comes from a list of aliased procedures in # macports1.0/macports.tcl, line 1238 - 1303. # @@ -105,13 +123,13 @@ # block. # this will throw if $name isn't active - set installed [lindex [registry_active $name] 0] + set installed [lindex [registry_active $port] 0] # In $installed there are in order: name, version, revision, variants, # a boolean indicating whether the port is installed and the epoch. So, # we're interested in the field at offset 3. set variants [lindex $installed 3] - ui_debug "$name is installed with the following variants: $variants" + ui_debug "$port is installed with the following variants: $variants" ui_debug " required: $required, forbidden: $forbidden" # split by "+" into the separate variant names

1 0

[104848] trunk/dports/python/py-numpy/Portfile
by dh＠macports.org 03 Apr '13

03 Apr '13

Revision: 104848 https://trac.macports.org/changeset/104848 Author: dh(a)macports.org Date: 2013-04-03 15:51:27 -0700 (Wed, 03 Apr 2013) Log Message: ----------- Add michaelld as maintainer Modified Paths: -------------- trunk/dports/python/py-numpy/Portfile Modified: trunk/dports/python/py-numpy/Portfile =================================================================== --- trunk/dports/python/py-numpy/Portfile 2013-04-03 21:19:08 UTC (rev 104847) +++ trunk/dports/python/py-numpy/Portfile 2013-04-03 22:51:27 UTC (rev 104848) @@ -13,7 +13,7 @@ categories-append math license BSD platforms darwin -maintainers dh openmaintainer +maintainers dh michaelld openmaintainer description The core utilities for the scientific library scipy for Python long_description ${description}

1 0

[104847] trunk/dports/devel/xnu-headers/Portfile
by mfeiri＠macports.org 03 Apr '13

03 Apr '13

Revision: 104847 https://trac.macports.org/changeset/104847 Author: mfeiri(a)macports.org Date: 2013-04-03 14:19:08 -0700 (Wed, 03 Apr 2013) Log Message: ----------- xnu-headers: depends_skip_archcheck and RELPATH for bootstrap_cmds Modified Paths: -------------- trunk/dports/devel/xnu-headers/Portfile Modified: trunk/dports/devel/xnu-headers/Portfile =================================================================== --- trunk/dports/devel/xnu-headers/Portfile 2013-04-03 20:58:22 UTC (rev 104846) +++ trunk/dports/devel/xnu-headers/Portfile 2013-04-03 21:19:08 UTC (rev 104847) @@ -49,6 +49,8 @@ distname xnu-${version} checksums rmd160 c5b7ede52d829769db40aa31461f9c3c7485252a \ sha256 74a90c98f22eb17b0d971b62e3f515930646deb1914a63931e864bc1aa8a0927 + destroot.env-append RELPATH=${prefix}/bin/relpath + depends_skip_archcheck-append bootstrap_cmds post-extract { reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/makedefs/MakeInc.cmd @@ -61,6 +63,8 @@ distname xnu-${version} checksums rmd160 5e1e06b46047bf79babe75a05da2e1d4899418b6 \ sha256 1e1fa65e9acf2e0c22cdc1a882d22a3b3eb2d89c273a907aa589da52d202341f + destroot.env-append RELPATH=${prefix}/bin/relpath + depends_skip_archcheck-append bootstrap_cmds post-extract { reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/makedefs/MakeInc.cmd @@ -73,6 +77,8 @@ distname xnu-${version} checksums rmd160 4e20cb7173cc3df369e631498c582177eb834896 \ sha256 76f0e6e703218b3b1620b29b7fabb5eb177c990af20711a90085a5a6afc54022 + destroot.env-append RELPATH=${prefix}/bin/relpath + depends_skip_archcheck-append bootstrap_cmds post-extract { reinplace "s|\$(\$\{SDKROOT\}/usr/local/libexec/availability.pl --macosx)|10.0 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8|g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh

1 0