January 2014 - macports-changes - lists.macosforge.org

[116496] trunk/base/src/port/port.tcl
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116496 https://trac.macports.org/changeset/116496 Author: jmr(a)macports.org Date: 2014-01-27 02:19:26 -0800 (Mon, 27 Jan 2014) Log Message: ----------- port.tcl: fix Tcl 8.4 incompatibilities introduced in r116448 Revision Links: -------------- https://trac.macports.org/changeset/116448 Modified Paths: -------------- trunk/base/src/port/port.tcl Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2014-01-27 09:56:24 UTC (rev 116495) +++ trunk/base/src/port/port.tcl 2014-01-27 10:19:26 UTC (rev 116496) @@ -1717,14 +1717,14 @@ set sepPos [string first "/" $opt] if {$sepPos >= 0} { # Version terminated by "/" to disambiguate -variant from part of version - set portversion [string range $opt 0 $sepPos-1] - set opt [string range $opt $sepPos+1 end] + set portversion [string range $opt 0 [expr {$sepPos - 1}]] + set opt [string range $opt [expr {$sepPos + 1}] end] } else { # Version terminated by "+", or else is complete set sepPos [string first "+" $opt] if {$sepPos >= 0} { # Version terminated by "+" - set portversion [string range $opt 0 $sepPos-1] + set portversion [string range $opt 0 [expr {$sepPos - 1}]] set opt [string range $opt $sepPos end] } else { # Unterminated version @@ -1745,7 +1745,7 @@ } elseif {[regexp {^([-+])([[:alpha:]_]+[\w\.]*)} $opt match sign variant] == 1} { # It's a variant set portvariants($variant) $sign - set opt [string range $opt [string length $variant]+1 end] + set opt [string range $opt [expr {[string length $variant] + 1}] end] set consumed 1 } else { # Not an option we recognize, so break from port option processing @@ -1889,8 +1889,8 @@ set portdir [file split [macports::getportdir $porturl]] set lsize [llength $portdir] set portdir \ - [file join [lindex $portdir $lsize-2] \ - [lindex $portdir $lsize-1]] + [file join [lindex $portdir [expr {$lsize - 2}]] \ + [lindex $portdir [expr {$lsize - 1}]]] if {[catch {mportsearch $portdir no exact portdir} result]} { ui_debug "$::errorInfo" break_softcontinue "Portdir $portdir not found" 1 status @@ -2854,8 +2854,8 @@ set portdir [file split [macports::getportdir $porturl]] set lsize [llength $portdir] set portdir \ - [file join [lindex $portdir $lsize-2] \ - [lindex $portdir $lsize-1]] + [file join [lindex $portdir [expr {$lsize - 2}]] \ + [lindex $portdir [expr {$lsize - 1}]]] if {[catch {mportsearch $portdir no exact portdir} result]} { ui_debug "$::errorInfo" break_softcontinue "Portdir $portdir not found" 1 status @@ -4647,7 +4647,7 @@ } # Decide how to do completion based on where we are in the string - set prefix [string range $text 0 $start-1] + set prefix [string range $text 0 [expr {$start - 1}]] # If only whitespace characters preceed us, or if the # previous non-whitespace character was a ;, then we're

1 0

[116495] trunk/base/src/package1.0
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116495 https://trac.macports.org/changeset/116495 Author: jmr(a)macports.org Date: 2014-01-27 01:56:24 -0800 (Mon, 27 Jan 2014) Log Message: ----------- portrpm, portsrpm: remove redundant calls to expr Modified Paths: -------------- trunk/base/src/package1.0/portrpm.tcl trunk/base/src/package1.0/portsrpm.tcl Modified: trunk/base/src/package1.0/portrpm.tcl =================================================================== --- trunk/base/src/package1.0/portrpm.tcl 2014-01-27 09:50:18 UTC (rev 116494) +++ trunk/base/src/package1.0/portrpm.tcl 2014-01-27 09:56:24 UTC (rev 116495) @@ -227,7 +227,7 @@ URL: ${homepage} BuildRoot: ${destroot} AutoReq: no" - if {[expr {${epoch} != 0}]} { + if {$epoch != 0} { puts $specfd "Epoch: ${epoch}" } if {[llength ${dependencies}] != 0} { Modified: trunk/base/src/package1.0/portsrpm.tcl =================================================================== --- trunk/base/src/package1.0/portsrpm.tcl 2014-01-27 09:50:18 UTC (rev 116494) +++ trunk/base/src/package1.0/portsrpm.tcl 2014-01-27 09:56:24 UTC (rev 116495) @@ -227,7 +227,7 @@ if {$zip ne ""} { puts $specfd "Source1: $zip" } - if {[expr {${epoch} != 0}]} { + if {$epoch != 0} { puts $specfd "Epoch: ${epoch}" } set first 2

1 0

[116494] trunk/base/src/package1.0/portdpkg.tcl
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116494 https://trac.macports.org/changeset/116494 Author: jmr(a)macports.org Date: 2014-01-27 01:50:18 -0800 (Mon, 27 Jan 2014) Log Message: ----------- remove redundant calls to expr Modified Paths: -------------- trunk/base/src/package1.0/portdpkg.tcl Modified: trunk/base/src/package1.0/portdpkg.tcl =================================================================== --- trunk/base/src/package1.0/portdpkg.tcl 2014-01-27 09:43:26 UTC (rev 116493) +++ trunk/base/src/package1.0/portdpkg.tcl 2014-01-27 09:50:18 UTC (rev 116494) @@ -97,12 +97,12 @@ } # Create dpkg version number - if {[expr {[option epoch] != 0}]} { + if {[option epoch] != 0} { set pkg_version "[option epoch]:[option version]" } else { set pkg_version "[option version]" } - if {[expr {[option revision] != 0}]} { + if {[option revision] != 0} { append pkg_version "-[option revision]" }

1 0

[116493] trunk/base/src/macports1.0/macports.tcl
by jmr＠macports.org 27 Jan '14

27 Jan '14

Revision: 116493 https://trac.macports.org/changeset/116493 Author: jmr(a)macports.org Date: 2014-01-27 01:43:26 -0800 (Mon, 27 Jan 2014) Log Message: ----------- revert Tcl 8.4 incompatible usage of 'string range' introduced in r116445 Revision Links: -------------- https://trac.macports.org/changeset/116445 Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2014-01-27 08:09:59 UTC (rev 116492) +++ trunk/base/src/macports1.0/macports.tcl 2014-01-27 09:43:26 UTC (rev 116493) @@ -1536,7 +1536,7 @@ set protocol [macports::getprotocol $url] switch -- $protocol { file { - set path [file normalize [string range $url [string length $protocol]+3 end]] + set path [file normalize [string range $url [expr {[string length $protocol] + 3}] end]] if {![file isfile $path]} { # the URL points to a local directory return $path

1 0

[116492] trunk/dports/lang/gcc49/Portfile
by mww＠macports.org 27 Jan '14

27 Jan '14

Revision: 116492 https://trac.macports.org/changeset/116492 Author: mww(a)macports.org Date: 2014-01-27 00:09:59 -0800 (Mon, 27 Jan 2014) Log Message: ----------- gcc49: version 4.9-20140126 Modified Paths: -------------- trunk/dports/lang/gcc49/Portfile Modified: trunk/dports/lang/gcc49/Portfile =================================================================== --- trunk/dports/lang/gcc49/Portfile 2014-01-27 05:56:01 UTC (rev 116491) +++ trunk/dports/lang/gcc49/Portfile 2014-01-27 08:09:59 UTC (rev 116492) @@ -8,7 +8,7 @@ subport libgcc-devel {} # Whenever this port is bumped for version/revision, please revbump dragonegg-*-gcc-4.9 -version 4.9-20140119 +version 4.9-20140126 revision 0 platforms darwin categories lang @@ -30,8 +30,8 @@ distname gcc-${version} -checksums rmd160 a721ba2295538f7b56b9f8979d66f2b894511b48 \ - sha256 084777a14afa345c5b42478cbd7d0497cdee8550d390fed9eb301789e6037045 +checksums rmd160 5847b992f45da60586afc125e365f3e3f91b0e83 \ + sha256 a10b3dc970d6856b00bb6f434d9f8735874960b592b2f58c2d29f84197c18a60 use_bzip2 yes

1 0

[116491] trunk/dports/graphics/inkscape-devel/Portfile
by devans＠macports.org 27 Jan '14

27 Jan '14

Revision: 116491 https://trac.macports.org/changeset/116491 Author: devans(a)macports.org Date: 2014-01-26 21:56:01 -0800 (Sun, 26 Jan 2014) Log Message: ----------- inkscape-devel: update to bzr 12980, bug fixes, code cleanup. Modified Paths: -------------- trunk/dports/graphics/inkscape-devel/Portfile Modified: trunk/dports/graphics/inkscape-devel/Portfile =================================================================== --- trunk/dports/graphics/inkscape-devel/Portfile 2014-01-27 05:18:56 UTC (rev 116490) +++ trunk/dports/graphics/inkscape-devel/Portfile 2014-01-27 05:56:01 UTC (rev 116491) @@ -5,7 +5,7 @@ name inkscape-devel conflicts inkscape -set bzr_rev 12966 +set bzr_rev 12980 version 0.48.99.${bzr_rev} epoch 1 license GPL-2 LGPL-2.1

1 0

[116490] trunk/dports/graphics/gimp2-devel/Portfile
by devans＠macports.org 27 Jan '14

27 Jan '14

Revision: 116490 https://trac.macports.org/changeset/116490 Author: devans(a)macports.org Date: 2014-01-26 21:18:56 -0800 (Sun, 26 Jan 2014) Log Message: ----------- gimp2-devel: update to recent git master. Modified Paths: -------------- trunk/dports/graphics/gimp2-devel/Portfile Modified: trunk/dports/graphics/gimp2-devel/Portfile =================================================================== --- trunk/dports/graphics/gimp2-devel/Portfile 2014-01-27 05:17:34 UTC (rev 116489) +++ trunk/dports/graphics/gimp2-devel/Portfile 2014-01-27 05:18:56 UTC (rev 116490) @@ -7,10 +7,9 @@ name gimp2-devel conflicts gimp2 gimp3-devel set git_name gimp -set git_commit 0ca7b9a8116b0a41525f9d2c9cf2d068adc847d7 -set git_date 20140112 +set git_commit 7fca15c27dd944890a67bb6db90c0b1fd4238f2f +set git_date 20140126 version 2.9.1-${git_date} -revision 1 license GPL-3+ categories graphics maintainers devans @@ -30,8 +29,8 @@ distname ${git_name}-${git_commit} -checksums rmd160 23669d9e3c7b446eb20fa4421f6f756982260d63 \ - sha256 c81deb8321ac6cbde40e9fcf1c192f7d398feec2ed316d6ddf42944985f377d1 +checksums rmd160 37563311fc5fa16cf603d1a4e827bec4cd50a9d7 \ + sha256 bdc9d2eeac42c6851c1bace7cfe30b9f0e808d8c3ba82c7827aef7723984b095 depends_build port:pkgconfig \ port:autoconf \

1 0

[116489] trunk/dports/graphics/gegl-devel/Portfile
by devans＠macports.org 27 Jan '14

27 Jan '14

Revision: 116489 https://trac.macports.org/changeset/116489 Author: devans(a)macports.org Date: 2014-01-26 21:17:34 -0800 (Sun, 26 Jan 2014) Log Message: ----------- gegl-devel: update to recent git master. Modified Paths: -------------- trunk/dports/graphics/gegl-devel/Portfile Modified: trunk/dports/graphics/gegl-devel/Portfile =================================================================== --- trunk/dports/graphics/gegl-devel/Portfile 2014-01-27 05:07:45 UTC (rev 116488) +++ trunk/dports/graphics/gegl-devel/Portfile 2014-01-27 05:17:34 UTC (rev 116489) @@ -7,8 +7,8 @@ name gegl-devel conflicts gegl set git_name gegl -set git_commit 116110f66f8b81e7a9a7d52598eb48291e300a39 -set git_date 20140119 +set git_commit ebadaddcbe43d58c3438dff0bca70ca149a34b4a +set git_date 20140126 version 0.3.0-${git_date} license {GPL-3+ LGPL-3+} categories graphics @@ -28,8 +28,8 @@ distname ${git_name}-${git_commit} -checksums rmd160 4ff3cbfd7d3ba785f3a1ad6f332aa4c60d40bdc1 \ - sha256 59ea9e9748bd7e16a4d91002ea098536929c38988c5868a78f2170de29ed2e64 +checksums rmd160 cd3411316b90be064d92d2b1689433e3047515bf \ + sha256 7afb803f3c1fade7f53e9c2259f3196b2bf25701ea72ff0621b2c4da3b81f73f depends_build port:pkgconfig \ port:intltool \

1 0

[116488] trunk/dports/x11/gfontsampler/Portfile
by devans＠macports.org 27 Jan '14

27 Jan '14

Revision: 116488 https://trac.macports.org/changeset/116488 Author: devans(a)macports.org Date: 2014-01-26 21:07:45 -0800 (Sun, 26 Jan 2014) Log Message: ----------- gfontsampler: obsolete, replaced by gnome-font-viewer (#42034). Modified Paths: -------------- trunk/dports/x11/gfontsampler/Portfile Modified: trunk/dports/x11/gfontsampler/Portfile =================================================================== --- trunk/dports/x11/gfontsampler/Portfile 2014-01-27 03:01:29 UTC (rev 116487) +++ trunk/dports/x11/gfontsampler/Portfile 2014-01-27 05:07:45 UTC (rev 116488) @@ -3,32 +3,10 @@ PortSystem 1.0 +replaced_by gnome-font-viewer +PortGroup obsolete 1.0 + name gfontsampler version 0.4 -revision 1 -description Browse and compare all of your installed fonts. -long_description \ - ${description} -homepage http://web.archive.org/web/20061010193007/http://linuxadvocate.org/projects… -maintainers nomaintainer +revision 2 categories x11 -license GPL-2+ -platforms darwin -master_sites freebsd -checksums md5 db2dadf22192861475686030a17c300e -depends_build port:pkgconfig -depends_lib port:desktop-file-utils \ - port:gtk2 \ - port:libglade2 \ - port:libgnomeui - -patchfiles patch-Makefile.in.diff \ - src_Makefile.in.patch - -post-activate { - system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" -} - -livecheck.type regex -livecheck.url http://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ -livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

1 0

[116487] trunk/dports/finance/cgminer
by ram＠macports.org 27 Jan '14

27 Jan '14

Revision: 116487 https://trac.macports.org/changeset/116487 Author: ram(a)macports.org Date: 2014-01-26 19:01:29 -0800 (Sun, 26 Jan 2014) Log Message: ----------- finance/cgminer: update to 3.11.0 Modified Paths: -------------- trunk/dports/finance/cgminer/Portfile Removed Paths: ------------- trunk/dports/finance/cgminer/files/5a991183f061f30c5261e0555722047eed7ca30f.patch Modified: trunk/dports/finance/cgminer/Portfile =================================================================== --- trunk/dports/finance/cgminer/Portfile 2014-01-27 02:45:28 UTC (rev 116486) +++ trunk/dports/finance/cgminer/Portfile 2014-01-27 03:01:29 UTC (rev 116487) @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup github 1.0 -github.setup ckolivas cgminer 3.10.0 v +github.setup ckolivas cgminer 3.11.0 v categories finance platforms darwin maintainers ram openmaintainer @@ -13,12 +13,9 @@ long_description \ This is a multi-threaded multi-pool FPGA and ASIC miner for bitcoin. -checksums rmd160 5f0ddb93f581f697fd94947952a9644da7d35fa9 \ - sha256 ea012ff9ad3f8680a9251e38222827ec6176b136d0bc41aa9c06f560931f0e92 +checksums rmd160 3f4e83cd7fb8840abf682789593072f20c5c8f2b \ + sha256 2fea91fc73cc34d8b1d188747c4552a59bd9e00deff2b47e99e2386e43d80073 -patchfiles 5a991183f061f30c5261e0555722047eed7ca30f.patch -patch.pre_args -p1 - depends_build-append port:pkgconfig \ port:gawk Deleted: trunk/dports/finance/cgminer/files/5a991183f061f30c5261e0555722047eed7ca30f.patch =================================================================== --- trunk/dports/finance/cgminer/files/5a991183f061f30c5261e0555722047eed7ca30f.patch 2014-01-27 02:45:28 UTC (rev 116486) +++ trunk/dports/finance/cgminer/files/5a991183f061f30c5261e0555722047eed7ca30f.patch 2014-01-27 03:01:29 UTC (rev 116487) @@ -1,34 +0,0 @@ -From 5a991183f061f30c5261e0555722047eed7ca30f Mon Sep 17 00:00:00 2001 -From: Con Kolivas <kernel(a)kolivas.org> -Date: Fri, 10 Jan 2014 11:34:38 +1100 -Subject: [PATCH] Add mcp2210 compilation to want_libbitfury configs. - ---- - Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 11ff5bc..af24c49 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -52,7 +52,7 @@ cgminer_SOURCES += usbutils.c usbutils.h - endif - - if WANT_LIBBITFURY --cgminer_SOURCES += libbitfury.c libbitfury.h -+cgminer_SOURCES += libbitfury.c libbitfury.h mcp2210.c mcp2210.h - endif - - # Device drivers -@@ -77,7 +77,7 @@ cgminer_SOURCES += driver-hashfast.c driver-hashfast.h hf_protocol.h hf_protocol - endif - - if HAS_BITFURY --cgminer_SOURCES += driver-bitfury.c driver-bitfury.h mcp2210.c mcp2210.h -+cgminer_SOURCES += driver-bitfury.c driver-bitfury.h - endif - - if HAS_DRILLBIT --- -1.8.5.1 -

1 0