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

[102473] trunk/dports/devel/pcre
by larryv＠macports.org 04 Feb '13

04 Feb '13

Revision: 102473 https://trac.macports.org/changeset/102473 Author: larryv(a)macports.org Date: 2013-02-03 23:20:56 -0800 (Sun, 03 Feb 2013) Log Message: ----------- pcre: Avoid unnecessary -pthread flag (#37916). Modified Paths: -------------- trunk/dports/devel/pcre/Portfile Added Paths: ----------- trunk/dports/devel/pcre/files/ trunk/dports/devel/pcre/files/configure.diff Modified: trunk/dports/devel/pcre/Portfile =================================================================== --- trunk/dports/devel/pcre/Portfile 2013-02-04 04:27:15 UTC (rev 102472) +++ trunk/dports/devel/pcre/Portfile 2013-02-04 07:20:56 UTC (rev 102473) @@ -28,6 +28,8 @@ checksums rmd160 d0c2d10fac843089116e5e2ae88fea4fa0a0be21 \ sha256 a913fb9bd058ef380a2d91847c3c23fcf98e92dc3b47cd08a53c021c5cde0f55 +patchfiles configure.diff + depends_lib port:zlib \ port:bzip2 \ port:libedit Added: trunk/dports/devel/pcre/files/configure.diff =================================================================== --- trunk/dports/devel/pcre/files/configure.diff (rev 0) +++ trunk/dports/devel/pcre/files/configure.diff 2013-02-04 07:20:56 UTC (rev 102473) @@ -0,0 +1,12 @@ +--- configure.orig 2012-11-30 04:13:42.000000000 -0500 ++++ configure 2013-02-04 01:29:07.000000000 -0500 +@@ -17578,9 +17578,6 @@ + ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" + ;; + +- darwin*) +- ax_pthread_flags="-pthread $ax_pthread_flags" +- ;; + esac + + if test x"$ax_pthread_ok" = xno; then

1 0

[102472] trunk/dports/www/neon/Portfile
by jeremyhu＠macports.org 04 Feb '13

04 Feb '13

Revision: 102472 https://trac.macports.org/changeset/102472 Author: jeremyhu(a)macports.org Date: 2013-02-03 20:27:15 -0800 (Sun, 03 Feb 2013) Log Message: ----------- neon: Revbump with libcomerr dependency to rebuild. Modified Paths: -------------- trunk/dports/www/neon/Portfile Modified: trunk/dports/www/neon/Portfile =================================================================== --- trunk/dports/www/neon/Portfile 2013-02-04 04:22:58 UTC (rev 102471) +++ trunk/dports/www/neon/Portfile 2013-02-04 04:27:15 UTC (rev 102472) @@ -4,7 +4,7 @@ name neon version 0.29.6 -revision 1 +revision 2 categories www maintainers geeklair.net:dluke description An HTTP and WebDAV client library with a C interface @@ -24,6 +24,7 @@ depends_lib port:expat \ port:gettext \ port:libiconv \ + port:libcomerr \ port:openssl \ port:zlib

1 0

[102471] trunk/dports/sysutils/e2fsprogs/Portfile
by jeremyhu＠macports.org 04 Feb '13

04 Feb '13

Revision: 102471 https://trac.macports.org/changeset/102471 Author: jeremyhu(a)macports.org Date: 2013-02-03 20:22:58 -0800 (Sun, 03 Feb 2013) Log Message: ----------- e2fsprogs: Mark libcomerr as not supporting universal, so users at least see a comprehensible error message instead of an obscure failure configuring kerberos5 (#37922) Modified Paths: -------------- trunk/dports/sysutils/e2fsprogs/Portfile Modified: trunk/dports/sysutils/e2fsprogs/Portfile =================================================================== --- trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 04:10:05 UTC (rev 102470) +++ trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 04:22:58 UTC (rev 102471) @@ -31,6 +31,8 @@ # This project is not C99 conformant configure.cflags-append -std=gnu89 +universal_variant no + if {${name} == ${subport}} { configure.args-append --disable-libuuid \ --disable-uuidd @@ -51,8 +53,6 @@ ln -fs ${prefix}/lib/libcom_err.1.1.dylib ${worksrcpath}/lib/libcom_err.dylib } - universal_variant no - destroot.target-append install-libs }

1 0

[102470] trunk/dports/sysutils/e2fsprogs/Portfile
by jeremyhu＠macports.org 04 Feb '13

04 Feb '13

Revision: 102470 https://trac.macports.org/changeset/102470 Author: jeremyhu(a)macports.org Date: 2013-02-03 20:10:05 -0800 (Sun, 03 Feb 2013) Log Message: ----------- e2fsprogs: Small cleanup Modified Paths: -------------- trunk/dports/sysutils/e2fsprogs/Portfile Modified: trunk/dports/sysutils/e2fsprogs/Portfile =================================================================== --- trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 03:30:25 UTC (rev 102469) +++ trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 04:10:05 UTC (rev 102470) @@ -28,6 +28,8 @@ configure.args-append --enable-bsd-shlibs +# This project is not C99 conformant +configure.cflags-append -std=gnu89 if {${name} == ${subport}} { configure.args-append --disable-libuuid \ @@ -39,10 +41,9 @@ patchfiles-append patch-lib__Makefile.darwin-lib \ patch-Makefile.in-remove-included-libcomerr.diff - if {${configure.compiler} == "clang"} { - # This project is not C99 conformant and has return type conflicts that - # clang complains about - configure.cflags-append "--std=gnu89 -Wno-return-type" + if {[string match *clang* ${configure.compiler}]} { + # return type conflicts should really be fixed + configure.cflags-append "-Wno-return-type" } pre-build {

1 0

[102469] trunk/dports/science/pylal/Portfile
by ram＠macports.org 04 Feb '13

04 Feb '13

Revision: 102469 https://trac.macports.org/changeset/102469 Author: ram(a)macports.org Date: 2013-02-03 19:30:25 -0800 (Sun, 03 Feb 2013) Log Message: ----------- science/pylal: update to 0.2.0 Modified Paths: -------------- trunk/dports/science/pylal/Portfile Modified: trunk/dports/science/pylal/Portfile =================================================================== --- trunk/dports/science/pylal/Portfile 2013-02-04 01:49:51 UTC (rev 102468) +++ trunk/dports/science/pylal/Portfile 2013-02-04 03:30:25 UTC (rev 102469) @@ -4,11 +4,10 @@ PortGroup python27 1.0 name pylal -version 0.1.5 -revision 3 +version 0.2.0 categories science platforms darwin -maintainers ram gmail.com:nickolas.fotopoulos +maintainers ram license GPL description Python LSC Algorithm Library @@ -30,8 +29,8 @@ homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/pylal.html master_sites http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/ -checksums rmd160 373e89cacd867feddace7f8f9c665ceb59dbfb3e \ - sha256 5eb865df7e54152f93976ef4d7d08599e576fcc679a5c8c0933a6cc649ddd531 +checksums rmd160 65c20f8b365547a3f706d0e2fd025dbb7630d79a \ + sha256 b594615d5576d48d8d6d2cb2c88e004d80ce844f6ee65e96abb4a1dffe1a3085 depends_build port:pkgconfig @@ -46,8 +45,6 @@ port:lalburst \ port:lalinspiral -build.env-append CFLAGS="-std=gnu99" - # py27-scipy is not universal universal_variant no

1 0

[102468] users/larryv/base/src/macports1.0/macports_dlist.tcl
by larryv＠macports.org 04 Feb '13

04 Feb '13

Revision: 102468 https://trac.macports.org/changeset/102468 Author: larryv(a)macports.org Date: 2013-02-03 17:49:51 -0800 (Sun, 03 Feb 2013) Log Message: ----------- [sandbox] macports_dlist.tcl: Change tabs to spaces. Modified Paths: -------------- users/larryv/base/src/macports1.0/macports_dlist.tcl Modified: users/larryv/base/src/macports1.0/macports_dlist.tcl =================================================================== --- users/larryv/base/src/macports1.0/macports_dlist.tcl 2013-02-04 01:47:22 UTC (rev 102467) +++ users/larryv/base/src/macports1.0/macports_dlist.tcl 2013-02-04 01:49:51 UTC (rev 102468) @@ -60,20 +60,20 @@ # criteria - the key/value pairs to compare proc dlist_match_multi {dlist criteria} { - set result {} - foreach ditem $dlist { - set match 1 - foreach {key value} $criteria { - if {[ditem_key $ditem $key] != $value} { - set match 0 - break - } - } - if {$match} { - lappend result $ditem - } - } - return $result + set result {} + foreach ditem $dlist { + set match 1 + foreach {key value} $criteria { + if {[ditem_key $ditem $key] != $value} { + set match 0 + break + } + } + if {$match} { + lappend result $ditem + } + } + return $result } # dlist_search @@ -83,13 +83,13 @@ # value - the value to compare proc dlist_search {dlist key value} { - set result {} - foreach ditem $dlist { - if {[ditem_contains $ditem $key $value]} { - lappend result $ditem - } - } - return $result + set result {} + foreach ditem $dlist { + if {[ditem_contains $ditem $key $value]} { + lappend result $ditem + } + } + return $result } # dlist_delete @@ -100,7 +100,7 @@ upvar $dlist uplist set ix [lsearch -exact $uplist $ditem] if {$ix >= 0} { - set uplist [lreplace $uplist $ix $ix] + set uplist [lreplace $uplist $ix $ix] } } @@ -112,12 +112,12 @@ # tokens - the list of pending tokens to check for proc dlist_has_pending {dlist tokens} { - foreach token $tokens { - if {[llength [dlist_search $dlist provides $token]] > 0} { - return 1 - } - } - return 0 + foreach token $tokens { + if {[llength [dlist_search $dlist provides $token]] > 0} { + return 1 + } + } + return 0 } # dlist_count_unmet @@ -126,17 +126,16 @@ # dictionary with a successful result code, they are # considered met. proc dlist_count_unmet {dlist statusdict tokens} { - upvar $statusdict upstatus - set result 0 - foreach token $tokens { - if {[info exists upstatus($token)] && - $upstatus($token) == 1} { - continue - } else { - incr result - } - } - return $result + upvar $statusdict upstatus + set result 0 + foreach token $tokens { + if {[info exists upstatus($token)] && $upstatus($token) == 1} { + continue + } else { + incr result + } + } + return $result } # ditem_create @@ -145,11 +144,11 @@ # the ditem handle. proc ditem_create {} { - return [macports_dlist::ditem_create] + return [macports_dlist::ditem_create] } proc ditem_delete {ditem} { - macports_dlist::ditem_delete $ditem + macports_dlist::ditem_delete $ditem } # ditem_key @@ -159,14 +158,14 @@ # value - optional value to set the key to proc ditem_key {ditem args} { - set nbargs [llength $args] - if {$nbargs > 1} { - return [macports_dlist::ditem_key $ditem [lindex $args 0] [lindex $args 1]] - } elseif {$nbargs == 1} { - return [macports_dlist::ditem_key $ditem [lindex $args 0]] - } else { - return [macports_dlist::ditem_key $ditem] - } + set nbargs [llength $args] + if {$nbargs > 1} { + return [macports_dlist::ditem_key $ditem [lindex $args 0] [lindex $args 1]] + } elseif {$nbargs == 1} { + return [macports_dlist::ditem_key $ditem [lindex $args 0]] + } else { + return [macports_dlist::ditem_key $ditem] + } } # ditem_append @@ -176,7 +175,7 @@ # value - the value to append to the key proc ditem_append {ditem key args} { - eval "return \[macports_dlist::ditem_append $ditem $key $args\]" + eval "return \[macports_dlist::ditem_append $ditem $key $args\]" } # ditem_append_unique @@ -187,7 +186,7 @@ # value - the value to append to the key proc ditem_append_unique {ditem key args} { - eval "return \[macports_dlist::ditem_append_unique $ditem $key $args\]" + eval "return \[macports_dlist::ditem_append_unique $ditem $key $args\]" } # ditem_contains @@ -197,7 +196,7 @@ # key - the key to examine # value - optional value to search for in the key proc ditem_contains {ditem key args} { - eval "return \[macports_dlist::ditem_contains $ditem $key $args\]" + eval "return \[macports_dlist::ditem_contains $ditem $key $args\]" } # dlist_append_dependents @@ -207,20 +206,20 @@ # result - used for recursing, pass empty initially. proc dlist_append_dependents {dlist ditem result} { - # Only append things if the root item is not in the list. - # (otherwise, it means we already did this sub-graph) - if {[lsearch $result $ditem] == -1} { - lappend result $ditem + # Only append things if the root item is not in the list. + # (otherwise, it means we already did this sub-graph) + if {[lsearch $result $ditem] == -1} { + lappend result $ditem - # Recursively append any hard dependencies. - foreach token [ditem_key $ditem requires] { - foreach provider [dlist_search $dlist provides $token] { - set result [dlist_append_dependents $dlist $provider $result] - } - } - # XXX: add soft-dependencies? - } - return $result + # Recursively append any hard dependencies. + foreach token [ditem_key $ditem requires] { + foreach provider [dlist_search $dlist provides $token] { + set result [dlist_append_dependents $dlist $provider $result] + } + } + # XXX: add soft-dependencies? + } + return $result } # dlist_get_next @@ -239,36 +238,36 @@ # of the dependency list. proc dlist_get_next {dlist statusdict} { - upvar $statusdict upstatus - set nextitem {} - - # arbitrary large number ~ INT_MAX - set minfailed 2000000000 - - foreach ditem $dlist { - # Skip if the ditem has unsatisfied hard dependencies - if {[dlist_count_unmet $dlist upstatus [ditem_key $ditem requires]]} { - continue - } - - # We will favor the ditem with the fewest unmet soft dependencies - set unmet [dlist_count_unmet $dlist upstatus [ditem_key $ditem uses]] - - # Delay items with unment soft dependencies that can eventually be met - if {$unmet > 0 && [dlist_has_pending $dlist [ditem_key $ditem uses]]} { - continue - } - - if {$unmet >= $minfailed} { - # not better than the last pick - continue - } else { - # better than the last pick (fewer unmet soft deps) - set minfailed $unmet - set nextitem $ditem - } - } - return $nextitem + upvar $statusdict upstatus + set nextitem {} + + # arbitrary large number ~ INT_MAX + set minfailed 2000000000 + + foreach ditem $dlist { + # Skip if the ditem has unsatisfied hard dependencies + if {[dlist_count_unmet $dlist upstatus [ditem_key $ditem requires]]} { + continue + } + + # We will favor the ditem with the fewest unmet soft dependencies + set unmet [dlist_count_unmet $dlist upstatus [ditem_key $ditem uses]] + + # Delay items with unment soft dependencies that can eventually be met + if {$unmet > 0 && [dlist_has_pending $dlist [ditem_key $ditem uses]]} { + continue + } + + if {$unmet >= $minfailed} { + # not better than the last pick + continue + } else { + # better than the last pick (fewer unmet soft deps) + set minfailed $unmet + set nextitem $ditem + } + } + return $nextitem } # dlist_eval @@ -289,56 +288,56 @@ # selector - the selector for determining eligibility proc dlist_eval {dlist testcond handler {canfail "0"} {selector "dlist_get_next"}} { - array set statusdict [list] - - # Do a pre-run seeing if any items automagically - # can evaluate to true. - if {$testcond != ""} { - foreach ditem $dlist { - if {[eval "expr \[\$testcond \$ditem\] == 1"]} { - foreach token [ditem_key $ditem provides] { - set statusdict($token) 1 - } - dlist_delete dlist $ditem - } - } - } - - # Loop for as long as there are ditems in the dlist. - while {1} { - set ditem [$selector $dlist statusdict] + array set statusdict [list] - if {$ditem == {}} { - if {[llength $dlist] > 0} { - ui_debug "dlist_eval: all entries in dependency list have unsatisfied dependencies; can't process" - } - break - } else { - # $handler should return a unix status code, 0 for success. - # statusdict notation is 1 for success - if {[catch {eval "$handler $ditem"} result]} { - puts $result - return $dlist - } - # No news is good news at this point. - if {$result == {}} { set result 0 } - - foreach token [ditem_key $ditem provides] { - set statusdict($token) [expr $result == 0] - } - - # Abort if we're not allowed to fail - if {$canfail == 0 && $result != 0} { - return $dlist - } - - # Delete the ditem from the waiting list. - dlist_delete dlist $ditem - } - } - - # Return the list of lusers - return $dlist + # Do a pre-run seeing if any items automagically + # can evaluate to true. + if {$testcond != ""} { + foreach ditem $dlist { + if {[eval "expr \[\$testcond \$ditem\] == 1"]} { + foreach token [ditem_key $ditem provides] { + set statusdict($token) 1 + } + dlist_delete dlist $ditem + } + } + } + + # Loop for as long as there are ditems in the dlist. + while {1} { + set ditem [$selector $dlist statusdict] + + if {$ditem == {}} { + if {[llength $dlist] > 0} { + ui_debug "dlist_eval: all entries in dependency list have unsatisfied dependencies; can't process" + } + break + } else { + # $handler should return a unix status code, 0 for success. + # statusdict notation is 1 for success + if {[catch {eval "$handler $ditem"} result]} { + puts $result + return $dlist + } + # No news is good news at this point. + if {$result == {}} { set result 0 } + + foreach token [ditem_key $ditem provides] { + set statusdict($token) [expr $result == 0] + } + + # Abort if we're not allowed to fail + if {$canfail == 0 && $result != 0} { + return $dlist + } + + # Delete the ditem from the waiting list. + dlist_delete dlist $ditem + } + } + + # Return the list of lusers + return $dlist } @@ -357,71 +356,71 @@ variable ditem_uniqid 0 proc ditem_create {} { - variable ditem_uniqid - incr ditem_uniqid - set ditem "ditem_${ditem_uniqid}" - variable $ditem - array set $ditem [list] - return $ditem + variable ditem_uniqid + incr ditem_uniqid + set ditem "ditem_${ditem_uniqid}" + variable $ditem + array set $ditem [list] + return $ditem } proc ditem_delete {ditem} { - variable $ditem - unset $ditem + variable $ditem + unset $ditem } proc ditem_key {ditem args} { - variable $ditem - set nbargs [llength $args] - if {$nbargs > 1} { - set key [lindex $args 0] - array set $ditem [list $key [lindex $args 1]] - return [lindex [array get $ditem $key] 1] - } elseif {$nbargs == 1} { - set key [lindex $args 0] - return [lindex [array get $ditem $key] 1] - } else { - return [array get $ditem] - } + variable $ditem + set nbargs [llength $args] + if {$nbargs > 1} { + set key [lindex $args 0] + array set $ditem [list $key [lindex $args 1]] + return [lindex [array get $ditem $key] 1] + } elseif {$nbargs == 1} { + set key [lindex $args 0] + return [lindex [array get $ditem $key] 1] + } else { + return [array get $ditem] + } } proc ditem_append {ditem key args} { - variable $ditem - set x [lindex [array get $ditem $key] 1] - if {$x != {}} { - eval "lappend x $args" - } else { - set x $args - } - array set $ditem [list $key $x] - return $x + variable $ditem + set x [lindex [array get $ditem $key] 1] + if {$x != {}} { + eval "lappend x $args" + } else { + set x $args + } + array set $ditem [list $key $x] + return $x } proc ditem_append_unique {ditem key args} { - variable $ditem - set x [lindex [array get $ditem $key] 1] - if {$x != {}} { - eval "lappend x $args" - set x [lsort -unique $x] - } else { - set x $args - } - array set $ditem [list $key $x] - return $x + variable $ditem + set x [lindex [array get $ditem $key] 1] + if {$x != {}} { + eval "lappend x $args" + set x [lsort -unique $x] + } else { + set x $args + } + array set $ditem [list $key $x] + return $x } proc ditem_contains {ditem key args} { - variable $ditem - if {[llength $args] == 0} { - eval "return \[info exists ${ditem}($key)\]" - } else { - set x [lindex [array get $ditem $key] 1] - if {[llength $x] > 0 && [lsearch -exact $x [lindex $args 0]] != -1} { - return 1 - } else { - return 0 - } - } + variable $ditem + if {[llength $args] == 0} { + eval "return \[info exists ${ditem}($key)\]" + } else { + set x [lindex [array get $ditem $key] 1] + if {[llength $x] > 0 && [lsearch -exact $x [lindex $args 0]] != -1} { + return 1 + } else { + return 0 + } + } } # End of macports_dlist namespace

1 0

[102467] trunk/dports/net/kerberos5/files/
by cal＠macports.org 04 Feb '13

04 Feb '13

Revision: 102467 https://trac.macports.org/changeset/102467 Author: cal(a)macports.org Date: 2013-02-03 17:47:22 -0800 (Sun, 03 Feb 2013) Log Message: ----------- kerberos5: remove unneeded patch files Removed Paths: ------------- trunk/dports/net/kerberos5/files/

1 0

[102466] trunk/dports/sysutils/e2fsprogs/Portfile
by cal＠macports.org 04 Feb '13

04 Feb '13

Revision: 102466 https://trac.macports.org/changeset/102466 Author: cal(a)macports.org Date: 2013-02-03 17:43:59 -0800 (Sun, 03 Feb 2013) Log Message: ----------- libcomerr: fix typos and possible naming conflicts Modified Paths: -------------- trunk/dports/sysutils/e2fsprogs/Portfile Modified: trunk/dports/sysutils/e2fsprogs/Portfile =================================================================== --- trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 01:37:04 UTC (rev 102465) +++ trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 01:43:59 UTC (rev 102466) @@ -70,15 +70,15 @@ pre-activate { # both kerberos5 and e2fsprogs previsouly conflicted because they installed files now provided by libcomerr if {![catch {set installed [lindex [registry_active kerberos5] 0]}]} { - set version [lindex $installed 1] - if {[vercmp $version 1.11] < 0} { + set krb_version [lindex $installed 1] + if {[vercmp $krb_version 1.11] < 0} { # kerberos5 used to install some files now provided by libcomerr in versions < 1.11 registry_deactivate_composite kerberos5 "" [list ports_nodepcheck 1] } } if {![catch {set installed [lindex [registry_active e2fsprogs] 0]}]} { - set version [lindex $instaled 1] - if {[vercmp $version 1.42.7] < 0} { + set e2fs_version [lindex $installed 1] + if {[vercmp $e2fs_version 1.42.7] < 0} { # e2fsprogs used to install some files now provided by libcomerr in versions < 1.42.7 registry_deactivate_composite e2fsprogs "" [list ports_nodepcheck 1] }

1 0

[102465] trunk/dports/sysutils/e2fsprogs/Portfile
by cal＠macports.org 04 Feb '13

04 Feb '13

Revision: 102465 https://trac.macports.org/changeset/102465 Author: cal(a)macports.org Date: 2013-02-03 17:37:04 -0800 (Sun, 03 Feb 2013) Log Message: ----------- libcomerr: add deactivate hack for e2fsprogs Modified Paths: -------------- trunk/dports/sysutils/e2fsprogs/Portfile Modified: trunk/dports/sysutils/e2fsprogs/Portfile =================================================================== --- trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 01:34:38 UTC (rev 102464) +++ trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 01:37:04 UTC (rev 102465) @@ -68,6 +68,7 @@ } pre-activate { + # both kerberos5 and e2fsprogs previsouly conflicted because they installed files now provided by libcomerr if {![catch {set installed [lindex [registry_active kerberos5] 0]}]} { set version [lindex $installed 1] if {[vercmp $version 1.11] < 0} { @@ -75,6 +76,13 @@ registry_deactivate_composite kerberos5 "" [list ports_nodepcheck 1] } } + if {![catch {set installed [lindex [registry_active e2fsprogs] 0]}]} { + set version [lindex $instaled 1] + if {[vercmp $version 1.42.7] < 0} { + # e2fsprogs used to install some files now provided by libcomerr in versions < 1.42.7 + registry_deactivate_composite e2fsprogs "" [list ports_nodepcheck 1] + } + } } }

1 0

[102464] trunk/dports/sysutils/e2fsprogs/Portfile
by cal＠macports.org 04 Feb '13

04 Feb '13

Revision: 102464 https://trac.macports.org/changeset/102464 Author: cal(a)macports.org Date: 2013-02-03 17:34:38 -0800 (Sun, 03 Feb 2013) Log Message: ----------- libcomerr: add deactivate hack targeting kerberos5 < 1.11, because some files were previously installed by it. Modified Paths: -------------- trunk/dports/sysutils/e2fsprogs/Portfile Modified: trunk/dports/sysutils/e2fsprogs/Portfile =================================================================== --- trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 01:29:21 UTC (rev 102463) +++ trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 01:34:38 UTC (rev 102464) @@ -66,6 +66,16 @@ ln -fs libcom_err.1.1.dylib ${destroot}${prefix}/lib/libcom_err.dylib system "install_name_tool -id ${prefix}/lib/libcom_err.1.1.dylib ${destroot}${prefix}/lib/libcom_err.1.1.dylib" } + + pre-activate { + if {![catch {set installed [lindex [registry_active kerberos5] 0]}]} { + set version [lindex $installed 1] + if {[vercmp $version 1.11] < 0} { + # kerberos5 used to install some files now provided by libcomerr in versions < 1.11 + registry_deactivate_composite kerberos5 "" [list ports_nodepcheck 1] + } + } + } } livecheck.type regex

1 0