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

[89663] trunk/dports/python
by macsforever2000＠macports.org 06 Feb '12

06 Feb '12

Revision: 89663 http://trac.macports.org/changeset/89663 Author: macsforever2000(a)macports.org Date: 2012-02-05 21:09:13 -0800 (Sun, 05 Feb 2012) Log Message: ----------- py-sfepy: unify Modified Paths: -------------- trunk/dports/python/py-sfepy/Portfile Added Paths: ----------- trunk/dports/python/py-sfepy/ Removed Paths: ------------- trunk/dports/python/py26-sfepy/ Modified: trunk/dports/python/py-sfepy/Portfile =================================================================== --- trunk/dports/python/py26-sfepy/Portfile 2012-02-05 23:25:37 UTC (rev 89658) +++ trunk/dports/python/py-sfepy/Portfile 2012-02-06 05:09:13 UTC (rev 89663) @@ -2,9 +2,9 @@ # $Id$ PortSystem 1.0 -PortGroup python26 1.0 +PortGroup python 1.0 -name py26-sfepy +name py-sfepy version 2011.1 categories-append science platforms darwin @@ -17,26 +17,31 @@ homepage http://code.google.com/p/sfepy/ master_sites googlecode:sfepy distname sfepy-release-${version} +worksrcdir ${distname} extract.suffix .tgz checksums md5 f00f3a96363ae5c48ce006874fede995 \ sha1 918b58dcfcb6854e5edd331cc9254b3d9d7cf725 \ rmd160 a3194c891a297a09c0af62fe95a6d1b551257497 -depends_lib-append port:gmsh \ - port:py26-ipython \ - port:py26-matplotlib \ - port:py26-mayavi \ - port:py26-numpy \ - port:py26-parsing \ - port:py26-pexpect \ - port:py26-pysparse \ - port:py26-scikits-umfpack \ - port:py26-scipy \ - port:py26-sphinx \ - port:py26-sympy \ - port:py26-tables \ +python.versions 25 26 27 +python.default_version 25 + +if {$subport != $name} { + depends_lib-append port:gmsh \ + port:py${python.version}-ipython \ + port:py${python.version}-matplotlib \ + port:py${python.version}-mayavi \ + port:py${python.version}-numpy \ + port:py${python.version}-parsing \ + port:py${python.version}-pexpect \ + port:py${python.version}-pysparse \ + port:py${python.version}-scikits-umfpack \ + port:py${python.version}-scipy \ + port:py${python.version}-sphinx \ + port:py${python.version}-sympy \ + port:py${python.version}-tables \ port:SuiteSparse \ port:swig-python +} -worksrcdir ${distname}

1 0

[89662] trunk/base/doc/macports.conf.in
by pixilla＠macports.org 05 Feb '12

05 Feb '12

Revision: 89662 http://trac.macports.org/changeset/89662 Author: pixilla(a)macports.org Date: 2012-02-05 15:48:43 -0800 (Sun, 05 Feb 2012) Log Message: ----------- base/ - Fix typo. Modified Paths: -------------- trunk/base/doc/macports.conf.in Modified: trunk/base/doc/macports.conf.in =================================================================== --- trunk/base/doc/macports.conf.in 2012-02-05 23:33:16 UTC (rev 89661) +++ trunk/base/doc/macports.conf.in 2012-02-05 23:48:43 UTC (rev 89662) @@ -106,7 +106,7 @@ # are installed. #startupitem_type default -# Option to install symlinks into /Libraray/LaunchAgents or /Libraray/LaunchDaemons +# Option to install symlinks into /Library/LaunchAgents or /Library/LaunchDaemons # startupitem_install may be empty, "yes" or "no"; # if the option is NOT "no" then a simlink for the startupitem will be created in # the appropriate system directory.

1 0

[89661] trunk/base/src/macports1.0/macports.tcl
by cal＠macports.org 05 Feb '12

05 Feb '12

Revision: 89661 http://trac.macports.org/changeset/89661 Author: cal(a)macports.org Date: 2012-02-05 15:33:16 -0800 (Sun, 05 Feb 2012) Log Message: ----------- rev-upgrade: Break circular dependencies in dependency resolution by selecting port with the least dependents Although it shouldn't happen, I've had problems with circular dependencies when determining the rebuild-order of ports in rev-upgrade. To prevent such a cycle triggering an endless loop, this code is introduced. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2012-02-05 23:30:07 UTC (rev 89660) +++ trunk/base/src/macports1.0/macports.tcl 2012-02-05 23:33:16 UTC (rev 89661) @@ -4184,8 +4184,15 @@ set unsorted_ports $broken_ports set topsort_ports {} while {[llength $unsorted_ports] > 0} { + set lowest_adj_number [llength $adjlist([lindex $unsorted_ports 0])] + set lowest_adj_port [lindex $unsorted_ports 0] + foreach port $unsorted_ports { - if {[llength $adjlist($port)] == 0} { + set len [llength $adjlist($port)] + if {$len < $lowest_adj_number} { + set lowest_adj_port $port + } + if {$len == 0} { # this node has no further dependencies # add it to topsorted list lappend topsort_ports $port @@ -4199,7 +4206,25 @@ set adjlist($target) [lreplace $adjlist($target) $index $index] } } + + # start anew + break; } + + # if we arrive here and lowest_adj_number is larger than 0, then we + # have a loop in the graph and need to break it somehow + if {$lowest_adj_number > 0} { + ui_debug "Breaking loop in dependency graph by starting with [$lowest_adj_port name], which has $lowest_adj_number dependencies" + lappend topsort_ports $lowest_adj_port + + set index [lsearch -exact $unsorted_ports $lowest_adj_port] + set unsorted_ports [lreplace $unsorted_ports $index $index] + + foreach target $revadjlist($port) { + set index [lsearch -exact $adjlist($target) $lowest_adj_port] + set adjlist($target) [lreplace $adjlist($target) $index $index] + } + } } ui_msg "$macports::ui_prefix Rebuilding in order"

1 0

[89660] trunk/base/src/macports1.0/macports.tcl
by cal＠macports.org 05 Feb '12

05 Feb '12

Revision: 89660 http://trac.macports.org/changeset/89660 Author: cal(a)macports.org Date: 2012-02-05 15:30:07 -0800 (Sun, 05 Feb 2012) Log Message: ----------- rev-upgrade: Debug-print return value of rebuild procedure Some rebuilds fail, but rev-upgrade doesn't stop. This is to debug this issue. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2012-02-05 23:27:38 UTC (rev 89659) +++ trunk/base/src/macports1.0/macports.tcl 2012-02-05 23:30:07 UTC (rev 89660) @@ -4241,6 +4241,7 @@ # call macports::upgrade with ports_revupgrade option to rebuild the port set status [macports::upgrade [$port name] "port:[$port name]" \ [array get variations] [array get macports::global_options] depscache] + ui_debug "Rebuilding port [$port name] finished with status $status" if {$status != 0} { error "Error rebuilding [$port name]" }

1 0

[89659] trunk/base/src/macports1.0/macports.tcl
by cal＠macports.org 05 Feb '12

05 Feb '12

Revision: 89659 http://trac.macports.org/changeset/89659 Author: cal(a)macports.org Date: 2012-02-05 15:27:38 -0800 (Sun, 05 Feb 2012) Log Message: ----------- rev-upgrade: Request more verbose output before suggesting to open a ticket Hopefully this will keep me from building all the ports that fail... Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2012-02-05 23:25:37 UTC (rev 89658) +++ trunk/base/src/macports1.0/macports.tcl 2012-02-05 23:27:38 UTC (rev 89659) @@ -4141,7 +4141,10 @@ } incr broken_port_counts([$port name]) if {$broken_port_counts([$port name]) > 3} { - ui_error "Port [$port name] is still broken after rebuiling it more than 3 times. You might want to file a bug for this." + ui_error "Port [$port name] is still broken after rebuiling it more than 3 times." + if {![macports::ui_isset ports_debug]} { + ui_error "Please run port -d -y rev-upgrade and use the output to report a bug." + } error "Port [$port name] still broken after rebuilding [expr $broken_port_counts([$port name]) - 1] time(s)" } }

1 0

[89658] trunk/dports/python
by macsforever2000＠macports.org 05 Feb '12

05 Feb '12

Revision: 89658 http://trac.macports.org/changeset/89658 Author: macsforever2000(a)macports.org Date: 2012-02-05 15:25:37 -0800 (Sun, 05 Feb 2012) Log Message: ----------- py-pexpect: unify Modified Paths: -------------- trunk/dports/python/py-pexpect/Portfile Removed Paths: ------------- trunk/dports/python/py25-pexpect/ trunk/dports/python/py26-pexpect/ trunk/dports/python/py27-pexpect/ Modified: trunk/dports/python/py-pexpect/Portfile =================================================================== --- trunk/dports/python/py-pexpect/Portfile 2012-02-05 23:08:28 UTC (rev 89657) +++ trunk/dports/python/py-pexpect/Portfile 2012-02-05 23:25:37 UTC (rev 89658) @@ -1,37 +1,48 @@ +# -*- 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 -PortGroup python24 1.0 +PortSystem 1.0 +PortGroup python 1.0 -name py-pexpect -version 2.3 -categories python -platforms darwin -maintainers nomaintainer +name py-pexpect +set real_name pexpect +version 2.4 +categories python +platforms darwin +maintainers nomaintainer description python module for better controlling other applications -long_description Pexpect makes Python a better tool for controlling \ +long_description \ + Pexpect makes Python a better tool for controlling \ other applications. It is a pure Python module for spawning child \ applications, controlling them and responding to expected patterns in \ their output. Pexpect works like Don Libes Expect. Pexpect allows your \ script to spawn a child application and control it as if a human were \ typing commands. -homepage http://pexpect.sourceforge.net/ -master_sites sourceforge:pexpect -distname pexpect-${version} +homepage http://${real_name}.sourceforge.net/ +master_sites http://pypi.python.org/packages/source/p/${real_name} \ + sourceforge:${real_name} +distname ${real_name}-${version} -checksums md5 bf107cf54e67bc6dec5bea1f3e6a65c3 \ - sha1 ee1e2770bfe49e7651bab78357179c28ed99a55b \ - rmd160 74adfd7e91152d64907f1a685b5dd0161cf4bf82 +checksums md5 fe82d69be19ec96d3a6650af947d5665 \ + sha1 3e24584ef1aa51f7610d5077a608e49d2724c7ae \ + rmd160 070693d9c82aaa44f1bd9cd9dfffa7643393b6de -worksrcdir pexpect-${version} +worksrcdir ${real_name}-${version} -post-destroot { - xinstall -m 644 -W ${worksrcpath} README \ - ${destroot}${prefix}/share/doc/${name} -} +universal_variant no -universal_variant no +python.versions 24 25 26 27 -livecheck.version Release ${version} +if {$subport != $name} { + post-destroot { + set docdir ${destroot}${prefix}/share/doc/${subport} + xinstall -d ${docdir} + xinstall -m 644 -W ${worksrcpath} README \ + ${docdir} + } + livecheck.type none +} else { + livecheck.regex {pexpect Release (\d+(?:\.\d+)*) released} +}

1 0

[89657] trunk/dports/editors/hexfiend
by cal＠macports.org 05 Feb '12

05 Feb '12

Revision: 89657 http://trac.macports.org/changeset/89657 Author: cal(a)macports.org Date: 2012-02-05 15:08:28 -0800 (Sun, 05 Feb 2012) Log Message: ----------- Hexfiend: patch to fix build on Snow Leopard (in specific, the buildbot) Modified Paths: -------------- trunk/dports/editors/hexfiend/Portfile Added Paths: ----------- trunk/dports/editors/hexfiend/files/ trunk/dports/editors/hexfiend/files/framework-sources-HFByteArrayEditScript.m.patch Modified: trunk/dports/editors/hexfiend/Portfile =================================================================== --- trunk/dports/editors/hexfiend/Portfile 2012-02-05 23:04:25 UTC (rev 89656) +++ trunk/dports/editors/hexfiend/Portfile 2012-02-05 23:08:28 UTC (rev 89657) @@ -9,7 +9,7 @@ checksums rmd160 abc7abbef3f2f4005537a13dbfcf723ee6b33c84 \ sha256 c98ac5a5b6cee58747980283dc8e94d91b466e1c797a4bb702e600944f308de3 -epoch 1 +epoch 1 categories editors aqua maintainers dweber cal openmaintainer license BSD @@ -28,6 +28,13 @@ * Data inspector. Interpret data as integer or floating point, signed or unsigned, big or little endian...\n\ * Smooth scrolling. No separate pages - scroll like any text document. +# required to build on < Lion +patchfiles framework-sources-HFByteArrayEditScript.m.patch +platform darwin 11 { + patchfiles-delete \ + framework-sources-HFByteArrayEditScript.m.patch +} + xcode.target HexFiend_2 xcode.configuration Release Added: trunk/dports/editors/hexfiend/files/framework-sources-HFByteArrayEditScript.m.patch =================================================================== --- trunk/dports/editors/hexfiend/files/framework-sources-HFByteArrayEditScript.m.patch (rev 0) +++ trunk/dports/editors/hexfiend/files/framework-sources-HFByteArrayEditScript.m.patch 2012-02-05 23:08:28 UTC (rev 89657) @@ -0,0 +1,11 @@ +--- framework/sources/HFByteArrayEditScript.m.orig 2012-02-05 23:57:47.000000000 +0100 ++++ framework/sources/HFByteArrayEditScript.m 2012-02-05 23:58:02.000000000 +0100 +@@ -19,7 +19,7 @@ + #define MAX_RECURSION_DEPTH 64 + + #if NDEBUG +-#define BYTEARRAY_RELEASE_INLINE __attribute__((always_inline)) static ++#define BYTEARRAY_RELEASE_INLINE inline static + #else + #define BYTEARRAY_RELEASE_INLINE __attribute__((noinline)) static + #endif

1 0

[89656] trunk/base
by pixilla＠macports.org 05 Feb '12

05 Feb '12

Revision: 89656 http://trac.macports.org/changeset/89656 Author: pixilla(a)macports.org Date: 2012-02-05 15:04:25 -0800 (Sun, 05 Feb 2012) Log Message: ----------- base/: - Add startupitem_install var to control the creation of startupitem symlinks in /Libraray/LaunchAgents or /Libraray/LaunchDaemons. Modified Paths: -------------- trunk/base/doc/macports.conf.in trunk/base/src/macports1.0/macports.tcl trunk/base/src/port1.0/portdestroot.tcl trunk/base/src/port1.0/portstartupitem.tcl Modified: trunk/base/doc/macports.conf.in =================================================================== --- trunk/base/doc/macports.conf.in 2012-02-05 22:23:33 UTC (rev 89655) +++ trunk/base/doc/macports.conf.in 2012-02-05 23:04:25 UTC (rev 89656) @@ -106,6 +106,12 @@ # are installed. #startupitem_type default +# Option to install symlinks into /Libraray/LaunchAgents or /Libraray/LaunchDaemons +# startupitem_install may be empty, "yes" or "no"; +# if the option is NOT "no" then a simlink for the startupitem will be created in +# the appropriate system directory. +#startupitem_install yes + # Extra environment variables to keep. Any variables listed here are added # to the list of variables that are not removed from the environment used # while processing ports. As with binpath, setting extra_env is intended for Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2012-02-05 22:23:33 UTC (rev 89655) +++ trunk/base/src/macports1.0/macports.tcl 2012-02-05 23:04:25 UTC (rev 89656) @@ -45,7 +45,7 @@ portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat \ portarchivetype portautoclean \ porttrace portverbose keeplogs destroot_umask variants_conf rsync_server rsync_options \ - rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd \ + rsync_dir startupitem_type startupitem_install place_worksymlink xcodeversion xcodebuildcmd \ mp_remote_url mp_remote_submit_url configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_deployment_target \ macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \ @@ -57,7 +57,7 @@ portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \ registry.path registry.format \ portarchivetype archivefetch_pubkeys portautoclean porttrace keeplogs portverbose destroot_umask \ - rsync_server rsync_options rsync_dir startupitem_type place_worksymlink macportsuser \ + rsync_server rsync_options rsync_dir startupitem_type startupitem_install place_worksymlink macportsuser \ mp_remote_url mp_remote_submit_url configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \ os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target $user_options" @@ -771,6 +771,11 @@ set macports::startupitem_type "default" } + # Set whether startupitems are symlinked into system directories + if {![info exists macports::startupitem_install]} { + set macports::startupitem_install yes + } + # Default place_worksymlink if {![info exists macports::place_worksymlink]} { set macports::place_worksymlink yes Modified: trunk/base/src/port1.0/portdestroot.tcl =================================================================== --- trunk/base/src/port1.0/portdestroot.tcl 2012-02-05 22:23:33 UTC (rev 89655) +++ trunk/base/src/port1.0/portdestroot.tcl 2012-02-05 23:04:25 UTC (rev 89656) @@ -53,7 +53,7 @@ options startupitem.name startupitem.start startupitem.stop startupitem.restart options startupitem.type startupitem.executable options startupitem.pidfile startupitem.logfile startupitem.logevents startupitem.netchange -options startupitem.uniquename startupitem.plist startupitem.location +options startupitem.uniquename startupitem.plist startupitem.location startupitem.install commands destroot # Set defaults @@ -85,6 +85,7 @@ default startupitem.logfile "" default startupitem.logevents no default startupitem.netchange no +default startupitem.install {$system_options(startupitem_install)} set_ui_prefix Modified: trunk/base/src/port1.0/portstartupitem.tcl =================================================================== --- trunk/base/src/port1.0/portstartupitem.tcl 2012-02-05 22:23:33 UTC (rev 89655) +++ trunk/base/src/port1.0/portstartupitem.tcl 2012-02-05 23:04:25 UTC (rev 89656) @@ -400,6 +400,7 @@ global startupitem.name startupitem.uniquename startupitem.plist startupitem.location global startupitem.init startupitem.start startupitem.stop startupitem.restart startupitem.executable global startupitem.pidfile startupitem.logfile startupitem.logevents startupitem.netchange + global startupitem.install set scriptdir ${prefix}/etc/startup @@ -602,8 +603,8 @@ close ${plist} - # Make a symlink to the plist file - if {[getuid] == 0} { + if { [getuid] == 0 && + ${startupitem.install} != "no" } { file mkdir "${destroot}/Library/${daemondest}" ln -sf "${itemdir}/${plistname}" "${destroot}/Library/${daemondest}" }

1 0

[89655] trunk/dports/java/jakarta-bcel/Portfile
by jmr＠macports.org 05 Feb '12

05 Feb '12

Revision: 89655 http://trac.macports.org/changeset/89655 Author: jmr(a)macports.org Date: 2012-02-05 14:23:33 -0800 (Sun, 05 Feb 2012) Log Message: ----------- jakarta-bcel: license Modified Paths: -------------- trunk/dports/java/jakarta-bcel/Portfile Modified: trunk/dports/java/jakarta-bcel/Portfile =================================================================== --- trunk/dports/java/jakarta-bcel/Portfile 2012-02-05 22:21:32 UTC (rev 89654) +++ trunk/dports/java/jakarta-bcel/Portfile 2012-02-05 22:23:33 UTC (rev 89655) @@ -6,6 +6,7 @@ version 5.2 categories java +license Apache-2 maintainers nomaintainer platforms darwin

1 0

[89654] trunk/dports/java/jakarta-oro/Portfile
by jmr＠macports.org 05 Feb '12

05 Feb '12

Revision: 89654 http://trac.macports.org/changeset/89654 Author: jmr(a)macports.org Date: 2012-02-05 14:21:32 -0800 (Sun, 05 Feb 2012) Log Message: ----------- jakarta-oro: license Modified Paths: -------------- trunk/dports/java/jakarta-oro/Portfile Modified: trunk/dports/java/jakarta-oro/Portfile =================================================================== --- trunk/dports/java/jakarta-oro/Portfile 2012-02-05 22:18:53 UTC (rev 89653) +++ trunk/dports/java/jakarta-oro/Portfile 2012-02-05 22:21:32 UTC (rev 89654) @@ -6,6 +6,7 @@ version 2.0.8 categories java +license Apache-1.1 maintainers nomaintainer platforms darwin

1 0