[129459] trunk/dports/multimedia/mpv

[Mihai Moldovan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On 14.12.2014 04:38 AM, Mihai Moldovan wrote:
> On 14.12.2014 04:34 AM, Ryan Schmidt wrote:
>> Those checks went through many revisions, not all by me, to ensure
>> that we only rename the directory when it is correct to do so. I
>> agree the complete set of checks seems overly cautious right now,
>> I was just glad when the bug reports stopped and the portgroup
>> seemed to be working in all cases, and I didn't look to optimize
>> it further at that point.
>
>> Also, whatever change we make to this part of the github portgroup
>> should be repeated in the bitbucket portgroup which was based on
>> it.
>
> Ok, proposing this.

Actually, more like this.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCgAGBQJUjQdWAAoJEB/WLtluJTqH5k8P/RjHnLut2YVnoLqCxp239sGR
sOTsMhqaJ2HDuHWf+Y20jjGzVFw0A8t1eDOg6sjUOwKEdGPX3OfX72J5TZhgNH04
th5xZYDzbmUa6FB6bhUcacLL22BKwoy/IaBpxCR1v9ArhvxRfofU0WpT6qcnnGav
Wo2mMZ2LKgvbecruwjWvsxRF5tUhcioD8l99x5AfDupIS8D/VNgBkkUXrjAfq5TW
GzD/KMR+qwp3ea+IqTnZ/QbkmGRKa9FIHMdRgVb9ALAb+Q1yL2WE3+jCb7s3w1jZ
jyyZ8mrdJaUD06Qq/TZNIBQSU57Wv5lVNvqfoJdhdQ36uc4mXSwOufFASJyxR4iR
iU3l8LYYur4T6QBZXhg/HLHadXtgmFxN6dXuxRVFQrGaobwXpvQkVG++9f8k4zdW
l9LjZMOvjtqtyLlM3LZL6c7Xq46qWGQEtQBHNA3wf5glMTwYNqaTl4Ynv2RLBoQm
hEZ29wCFuyHGt7d0rli/d4cKbw6pJWU95YkFQqr8dSx4EXg1w3+LpIjdXJiuG5dJ
FSfkQsIuXKo1/R/4hCN4ktlGGJVqF+mf0p7/4rTg6gTifgEAXvmbDe+ipBu03kCH
15rzdwUlc+qwFdvBNrzQqchBH/b6ICU3FlECkjFSQauUT+8jSWWpugBllYeQ+5+Y
AI+a+1xmYie/yr8dypCO
=3tB/
-----END PGP SIGNATURE-----

-------------- next part --------------
diff --git a/dports/_resources/port1.0/group/bitbucket-1.0.tcl b/dports/_resources/port1.0/group/bitbucket-1.0.tcl
index cae8399..8807e3e 100644
--- a/dports/_resources/port1.0/group/bitbucket-1.0.tcl
+++ b/dports/_resources/port1.0/group/bitbucket-1.0.tcl
@@ -92,7 +92,7 @@ proc bitbucket.setup {bb_author bb_project bb_version {bb_tag_prefix ""}} {
     post-extract {
         if {![file exists ${worksrcpath}] && \
             ${fetch.type} eq "standard" && \
-            ${master_sites} eq ${bitbucket.master_sites} && \
+            [lsearch -exact ${master_sites} ${bitbucket.master_sites}] != -1 && \
             [llength ${distfiles}] > 0 && \
             [llength [glob -nocomplain ${workpath}/*]] > 0} {
             move [glob ${workpath}/*] ${worksrcpath}
diff --git a/dports/_resources/port1.0/group/github-1.0.tcl b/dports/_resources/port1.0/group/github-1.0.tcl
index 787363d..d2e6431 100644
--- a/dports/_resources/port1.0/group/github-1.0.tcl
+++ b/dports/_resources/port1.0/group/github-1.0.tcl
@@ -168,7 +168,7 @@ proc github.setup {gh_author gh_project gh_version {gh_tag_prefix ""}} {
         # set worksrcdir to a subdirectory of the extracted directory).
         if {![file exists ${worksrcpath}] && \
                 ${fetch.type} eq "standard" && \
-                ${master_sites} eq ${github.master_sites} && \
+                [lsearch -exact ${master_sites} ${github.master_sites}] != -1 && \
                 [llength ${distfiles}] > 0 && \
                 [llength [glob -nocomplain ${workpath}/*]] > 0} {
             if {[file exists [glob ${workpath}/${github.author}-${github.project}-*]] && \