[129459] trunk/dports/multimedia/mpv

[Mihai Moldovan]

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

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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCgAGBQJUjQY7AAoJEB/WLtluJTqHHV4P/R8ZBx7uBBhhkaI3urm7ICau
Qs9AXgwr0F5q0qXGynRxBrbLGtS7jA7CwMcJ9X/T4+9xTxrs8gpXCEHzrk3jNpIV
f62Uc7wT8/mPYtw7tgBVq9QmwzMIQzZYf6UVytHJIgCS88M5nWepHnwl6Lfz/quI
loPbtmXgyI+r27DNxf7eCWFfI4fN114QprWZ+FrXexUOd0u85Y7L5IRoMKwnvl8E
dxjf93ijHwzdMZHbmZKXkYCNTUnN33el15qo1h48bEoysODlnWFsinZyXYDrDvb2
7ol/GpRoXLVwcw5mxF5q598aOup6bCQ+iBpHWYW1ndgHdDu++RlaRPGUhVjoI9hZ
pfKrvhR/fXV+AFQpFCXd7alXaFmxIyguG9omWiTKV6JNGkXRLElObwR0PdHCVDz2
5scZR373kSNb07r0tLlIcfeBo7RXh+f4WWPkthttlWAI72DKrn7vYNu7gLFPRCem
+kltComj4OnnA1gXK2hcEf7hKEDt0VTZVgmO0lw4NACMDNJ5xRbgDt+CGNpQPmWF
Q3g17uLgSfZ2Y7D88NDA3lHJcbVWO+/Uj60ZHIxFEKv9kMgrX2lqVirC11SOcqUB
K1RpRJ+JWJ6/8E611Hrn1RXw19G+V5eU11J8sJzKPh1vp5p2I6FsZ0JafORQKL0b
q+p2qwIgnwdeUiEw9tYd
=L3wL
-----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..a10fcae 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}] && \
             [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..cf5c14c 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}] && \
                 [llength ${distfiles}] > 0 && \
                 [llength [glob -nocomplain ${workpath}/*]] > 0} {
             if {[file exists [glob ${workpath}/${github.author}-${github.project}-*]] && \