December 2010 - macports-changes - lists.macosforge.org

[74555] trunk/dports/lang/apple-gcc42-devel/Portfile
by jmr＠macports.org 21 Dec '10

21 Dec '10

Revision: 74555 http://trac.macports.org/changeset/74555 Author: jmr(a)macports.org Date: 2010-12-21 11:22:17 -0800 (Tue, 21 Dec 2010) Log Message: ----------- apple-gcc42-devel: only use universal_archs when +universal is set (#21709) Modified Paths: -------------- trunk/dports/lang/apple-gcc42-devel/Portfile Modified: trunk/dports/lang/apple-gcc42-devel/Portfile =================================================================== --- trunk/dports/lang/apple-gcc42-devel/Portfile 2010-12-21 19:20:35 UTC (rev 74554) +++ trunk/dports/lang/apple-gcc42-devel/Portfile 2010-12-21 19:22:17 UTC (rev 74555) @@ -29,6 +29,12 @@ } use_configure no +universal_variant yes +if {[variant_isset universal]} { + set archs ${configure.universal_archs} +} else { + set archs ${configure.build_arch} +} # first parameter: space-separated list of archs compiler will run on # second parameter: space-separated list of archs compiler will generate code for @@ -38,7 +44,7 @@ # sixth parameter: a directory to place information helpful in debugging compiler # This build.cmd line will build gcc 4.2 with c++ and obj-c++ support build.cmd ${worksrcpath}/build_gcc \ - \"${configure.universal_archs}\" \"${configure.universal_archs}\" \ + \"${archs}\" \"${archs}\" \ ${worksrcpath} ${build_prefix} ${destroot} ${worksrcpath}/debug destroot {}

1 0

[74554] trunk/dports/python
by snc＠macports.org 21 Dec '10

21 Dec '10

Revision: 74554 http://trac.macports.org/changeset/74554 Author: snc(a)macports.org Date: 2010-12-21 11:20:35 -0800 (Tue, 21 Dec 2010) Log Message: ----------- conflict: py26-pqyt4 and py27-pyqt4 Modified Paths: -------------- trunk/dports/python/py26-pyqt4/Portfile trunk/dports/python/py27-pyqt4/Portfile Modified: trunk/dports/python/py26-pyqt4/Portfile =================================================================== --- trunk/dports/python/py26-pyqt4/Portfile 2010-12-21 19:14:04 UTC (rev 74553) +++ trunk/dports/python/py26-pyqt4/Portfile 2010-12-21 19:20:35 UTC (rev 74554) @@ -9,6 +9,7 @@ categories python devel platforms macosx maintainers michaelld openmaintainer +conflicts py27-pyqt4 description PyQt4 is a set of Python bindings for the Qt4 toolkit long_description \ PyQt4 is a set of Python bindings for the Qt4 toolkit. The \ Modified: trunk/dports/python/py27-pyqt4/Portfile =================================================================== --- trunk/dports/python/py27-pyqt4/Portfile 2010-12-21 19:14:04 UTC (rev 74553) +++ trunk/dports/python/py27-pyqt4/Portfile 2010-12-21 19:20:35 UTC (rev 74554) @@ -9,6 +9,7 @@ categories python devel platforms macosx maintainers michaelld openmaintainer +conflicts py26-pyqt4 description PyQt4 is a set of Python bindings for the Qt4 toolkit long_description \ PyQt4 is a set of Python bindings for the Qt4 toolkit. The \

1 0

[74553] trunk/dports/lang/python26/Portfile
by jmr＠macports.org 21 Dec '10

21 Dec '10

Revision: 74553 http://trac.macports.org/changeset/74553 Author: jmr(a)macports.org Date: 2010-12-21 11:14:04 -0800 (Tue, 21 Dec 2010) Log Message: ----------- python26: rev bump for separation of tkinter, as it was possible to install without +no_tkinter if xorg-libxcb was already installed Modified Paths: -------------- trunk/dports/lang/python26/Portfile Modified: trunk/dports/lang/python26/Portfile =================================================================== --- trunk/dports/lang/python26/Portfile 2010-12-21 19:11:25 UTC (rev 74552) +++ trunk/dports/lang/python26/Portfile 2010-12-21 19:14:04 UTC (rev 74553) @@ -5,6 +5,7 @@ name python26 version 2.6.6 +revision 1 set major [lindex [split $version .] 0] set branch [join [lrange [split ${version} .] 0 1] .] categories lang

1 0

[74552] trunk/dports/python/py26-tkinter/Portfile
by jmr＠macports.org 21 Dec '10

21 Dec '10

Revision: 74552 http://trac.macports.org/changeset/74552 Author: jmr(a)macports.org Date: 2010-12-21 11:11:25 -0800 (Tue, 21 Dec 2010) Log Message: ----------- py26-tkinter: whitespace, modeline Modified Paths: -------------- trunk/dports/python/py26-tkinter/Portfile Modified: trunk/dports/python/py26-tkinter/Portfile =================================================================== --- trunk/dports/python/py26-tkinter/Portfile 2010-12-21 19:09:01 UTC (rev 74551) +++ trunk/dports/python/py26-tkinter/Portfile 2010-12-21 19:11:25 UTC (rev 74552) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -3,37 +4,37 @@ PortGroup python26 1.0 -name py26-tkinter -version 2.6.6 -categories python graphics -platforms darwin -maintainers nomaintainer -description Python bindings to the Tk widget set -long_description ${description} +name py26-tkinter +version 2.6.6 +categories python graphics +platforms darwin +maintainers nomaintainer +description Python bindings to the Tk widget set +long_description ${description} -homepage http://www.python.org/doc/current/lib/module-Tkinter.html -master_sites http://www.python.org/ftp/python/${version}/ -distname Python-${version} -dist_subdir python26 +homepage http://www.python.org/doc/current/lib/module-Tkinter.html +master_sites http://www.python.org/ftp/python/${version}/ +distname Python-${version} +dist_subdir python26 checksums md5 cf4e6881bb84a7ce6089e4a307f71f14 \ sha1 a1daf2c2c7cffe0939c015260447572fe75c7e50 \ rmd160 2d63f4f0ad3c124a8e62215ca94bd0231350e912 -use_bzip2 yes +use_bzip2 yes -depends_lib-append port:tk +depends_lib-append port:tk -worksrcdir ${worksrcdir}/Modules +worksrcdir ${worksrcdir}/Modules -extract.post_args "| tar -xf - ${distname}/Modules/_tkinter.c \ - ${distname}/Modules/tkappinit.c" +extract.post_args "| tar -xf - ${distname}/Modules/_tkinter.c \ + ${distname}/Modules/tkappinit.c" post-extract { - file copy ${filespath}/setup.py ${worksrcpath} + file copy ${filespath}/setup.py ${worksrcpath} } configure { - reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py - reinplace "s|__TK-VERSION__|8.5|g" ${worksrcpath}/setup.py + reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py + reinplace "s|__TK-VERSION__|8.5|g" ${worksrcpath}/setup.py } -livecheck.type regex -livecheck.url http://www.python.org/download/releases/ -livecheck.regex Python (2.6.\[0-9\]+) +livecheck.type regex +livecheck.url http://www.python.org/download/releases/ +livecheck.regex Python (2.6.\[0-9\]+)

1 0

[74551] trunk/dports/graphics/pgplot/Portfile
by snc＠macports.org 21 Dec '10

21 Dec '10

Revision: 74551 http://trac.macports.org/changeset/74551 Author: snc(a)macports.org Date: 2010-12-21 11:09:01 -0800 (Tue, 21 Dec 2010) Log Message: ----------- pgplot: add gcc45 variant, #27671 Modified Paths: -------------- trunk/dports/graphics/pgplot/Portfile Modified: trunk/dports/graphics/pgplot/Portfile =================================================================== --- trunk/dports/graphics/pgplot/Portfile 2010-12-21 19:08:50 UTC (rev 74550) +++ trunk/dports/graphics/pgplot/Portfile 2010-12-21 19:09:01 UTC (rev 74551) @@ -2,6 +2,7 @@ # $Id$ PortSystem 1.0 + name pgplot version 5.2.2 revision 5 @@ -209,27 +210,31 @@ } } -variant gcc42 description {build with gfortran from gcc42} conflicts gcc43 gcc44 g95 { +variant gcc42 description {build with gfortran from gcc42} conflicts gcc43 gcc44 gcc45 g95 { depends_lib-append port:gcc42 configure.fc ${prefix}/bin/gfortran-mp-4.2 } -variant gcc43 description {build with gfortran from gcc43} conflicts gcc42 gcc44 g95 { +variant gcc43 description {build with gfortran from gcc43} conflicts gcc42 gcc44 gcc45 g95 { depends_lib-append port:gcc43 configure.fc ${prefix}/bin/gfortran-mp-4.3 } -variant gcc44 description {build with gfortran from gcc44} conflicts gcc42 gcc43 g95 { +variant gcc44 description {build with gfortran from gcc44} conflicts gcc42 gcc43 gcc45 g95 { depends_lib-append port:gcc44 configure.fc ${prefix}/bin/gfortran-mp-4.4 } -variant g95 description {build with g95} conflicts gcc42 gcc43 gcc44 { +variant gcc45 description {build with gfortran from gcc45} conflicts gcc42 gcc43 gcc44 g95 { + depends_lib-append port:gcc45 + configure.fc ${prefix}/bin/gfortran-mp-4.5 +} +variant g95 description {build with g95} conflicts gcc42 gcc43 gcc44 gcc45 { depends_lib-append port:g95 configure.fc ${prefix}/bin/g95 } -if {![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43]} { +if {![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc45]} { default_variants +gcc44 }

1 0

[74550] trunk/dports/python/py26-tkinter/Portfile
by jmr＠macports.org 21 Dec '10

21 Dec '10

Revision: 74550 http://trac.macports.org/changeset/74550 Author: jmr(a)macports.org Date: 2010-12-21 11:08:50 -0800 (Tue, 21 Dec 2010) Log Message: ----------- py26-tkinter: remove redundant dependency on tcl Modified Paths: -------------- trunk/dports/python/py26-tkinter/Portfile Modified: trunk/dports/python/py26-tkinter/Portfile =================================================================== --- trunk/dports/python/py26-tkinter/Portfile 2010-12-21 18:45:36 UTC (rev 74549) +++ trunk/dports/python/py26-tkinter/Portfile 2010-12-21 19:08:50 UTC (rev 74550) @@ -20,7 +20,7 @@ rmd160 2d63f4f0ad3c124a8e62215ca94bd0231350e912 use_bzip2 yes -depends_lib-append port:tcl port:tk +depends_lib-append port:tk worksrcdir ${worksrcdir}/Modules

1 0

[74549] trunk/dports/python/py26-tkinter/Portfile
by dluke＠macports.org 21 Dec '10

21 Dec '10

Revision: 74549 http://trac.macports.org/changeset/74549 Author: dluke(a)macports.org Date: 2010-12-21 10:45:36 -0800 (Tue, 21 Dec 2010) Log Message: ----------- Fix 'name' Modified Paths: -------------- trunk/dports/python/py26-tkinter/Portfile Modified: trunk/dports/python/py26-tkinter/Portfile =================================================================== --- trunk/dports/python/py26-tkinter/Portfile 2010-12-21 18:42:09 UTC (rev 74548) +++ trunk/dports/python/py26-tkinter/Portfile 2010-12-21 18:45:36 UTC (rev 74549) @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup python26 1.0 -name py-tkinter +name py26-tkinter version 2.6.6 categories python graphics platforms darwin

1 0

[74548] trunk/dports/lang/python26/Portfile
by dluke＠macports.org 21 Dec '10

21 Dec '10

Revision: 74548 http://trac.macports.org/changeset/74548 Author: dluke(a)macports.org Date: 2010-12-21 10:42:09 -0800 (Tue, 21 Dec 2010) Log Message: ----------- Incorporate +no_tkinter into the main port, no revbump as it was impossible to install without +no_tkinter see #26387 Modified Paths: -------------- trunk/dports/lang/python26/Portfile Modified: trunk/dports/lang/python26/Portfile =================================================================== --- trunk/dports/lang/python26/Portfile 2010-12-21 18:37:55 UTC (rev 74547) +++ trunk/dports/lang/python26/Portfile 2010-12-21 18:42:09 UTC (rev 74548) @@ -46,9 +46,10 @@ patch-Mac-PythonLauncher-Makefile.in.diff \ patch-Mac-Tools-Doc-setup.py.diff \ patch-setup.py-db46.diff \ - patch-Lib-ctypes-macholib-dyld.py.diff + patch-Lib-ctypes-macholib-dyld.py.diff \ + patch-setup_no_tkinter.py.diff -depends_lib port:gettext port:zlib port:openssl port:tk \ +depends_lib port:gettext port:zlib port:openssl \ port:sqlite3 port:db46 port:ncurses port:gdbm \ port:bzip2 port:readline @@ -168,14 +169,6 @@ configure.args-append --enable-unicode=ucs4 } -variant no_tkinter description {Disable Tkinter support, which will break IDLE} { - patchfiles-append patch-setup_no_tkinter.py.diff - depends_lib-delete port:tk -} - -# ugh... temporary fix for a dependency loop, #26387 -default_variants +no_tkinter - livecheck.type regex livecheck.url ${homepage}download/releases/ livecheck.regex Python (${branch}(?:\\.\\d+)*)

1 0

[74547] trunk/dports/python
by dluke＠macports.org 21 Dec '10

21 Dec '10

Revision: 74547 http://trac.macports.org/changeset/74547 Author: dluke(a)macports.org Date: 2010-12-21 10:37:55 -0800 (Tue, 21 Dec 2010) Log Message: ----------- new port, py26-tkinter, to install Tkinter support for python26 (see #26387) Modified Paths: -------------- trunk/dports/python/py26-tkinter/Portfile Added Paths: ----------- trunk/dports/python/py26-tkinter/ Modified: trunk/dports/python/py26-tkinter/Portfile =================================================================== --- trunk/dports/python/py-tkinter/Portfile 2010-12-08 21:34:32 UTC (rev 74243) +++ trunk/dports/python/py26-tkinter/Portfile 2010-12-21 18:37:55 UTC (rev 74547) @@ -1,10 +1,10 @@ # $Id$ PortSystem 1.0 -PortGroup python24 1.0 +PortGroup python26 1.0 name py-tkinter -version 2.4.6 +version 2.6.6 categories python graphics platforms darwin maintainers nomaintainer @@ -14,8 +14,10 @@ homepage http://www.python.org/doc/current/lib/module-Tkinter.html master_sites http://www.python.org/ftp/python/${version}/ distname Python-${version} -dist_subdir python24 -checksums sha1 cb1972a554a458f6a26d3e047b359251865d7c96 +dist_subdir python26 +checksums md5 cf4e6881bb84a7ce6089e4a307f71f14 \ + sha1 a1daf2c2c7cffe0939c015260447572fe75c7e50 \ + rmd160 2d63f4f0ad3c124a8e62215ca94bd0231350e912 use_bzip2 yes depends_lib-append port:tcl port:tk @@ -35,5 +37,4 @@ livecheck.type regex livecheck.url http://www.python.org/download/releases/ -livecheck.regex Python (2.4.\[0-9\]+) - +livecheck.regex Python (2.6.\[0-9\]+)

1 0

[74546] trunk/dports/devel/readline-4/Portfile
by ryandesign＠macports.org 21 Dec '10

21 Dec '10

Revision: 74546 http://trac.macports.org/changeset/74546 Author: ryandesign(a)macports.org Date: 2010-12-21 10:27:18 -0800 (Tue, 21 Dec 2010) Log Message: ----------- readline-4: indicate license; see #27747 Modified Paths: -------------- trunk/dports/devel/readline-4/Portfile Modified: trunk/dports/devel/readline-4/Portfile =================================================================== --- trunk/dports/devel/readline-4/Portfile 2010-12-21 18:23:48 UTC (rev 74545) +++ trunk/dports/devel/readline-4/Portfile 2010-12-21 18:27:18 UTC (rev 74546) @@ -7,6 +7,7 @@ categories devel maintainers nomaintainer platforms darwin +license GPL-2+ description Library that provides command line editing long_description\

1 0