Index: client/1.0/neutral/pkgd.eagle
==================================================================
--- client/1.0/neutral/pkgd.eagle
+++ client/1.0/neutral/pkgd.eagle
@@ -1618,22 +1618,26 @@
 
     #
     # NOTE: For package files that are not part of the client package,
     #       put them inside the "packages" sub-directory.
     #
-    if {!$isClient} then {
+    if {$isClient} then {
+      set index 2; # client/1.0/<neutral>/fileName.ext
+    } else {
       set pattern [file join packages $pattern]
+      set index 3; # packages/tcl/8.4/<neutral>/pkgName1.0/fileName.ext
     }
 
     foreach line $lines {
       if {[string range $line 0 1] eq "F "} then {
         set fileName [lindex [split $line " "] 1]
 
         if {[string match $pattern $fileName]} then {
-          set directory [lindex [file split $fileName] 3]
+          set directory [lindex [file split $fileName] $index]
 
-          if {[string length $directory] > 0} then {
+          if {[string length $directory] > 0 && \
+              [lsearch -exact $platforms $directory] == -1} then {
             lappend platforms $directory
           }
         }
       }
     }

Index: client/1.0/neutral/pkgd.eagle.asc
==================================================================
--- client/1.0/neutral/pkgd.eagle.asc
+++ client/1.0/neutral/pkgd.eagle.asc
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 Comment: Eagle Package Repository
 
-iQIcBAABCAAGBQJdVO4yAAoJEFAslq9JXcLZHbIP+wQWoL7xEH/6FQR72u6TjVBp
-EFlaKcD6XyWTNjpOYmomd6IA0EkSDFsL7+BN70QfEPIumfajxMyDql3nZXfmqq/o
-3oTjbD58BdcEhXKzgypiuO2pQXx87ywcrCsEma4O46/ceZVcb1qv25jaGvOciZap
-KnerxOv7VurvvJ50va1xw0y3Mc4LLTQfC+3Dz+MI8Uy4F8iTDd49l6zj6ULfQt1b
-cn7goNga0i79nwHQw5dbzWekbMAAHo19kBHauyQDaXtoj1pgIXZdPEZS3viPZa3l
-tr83OCsQJvMBf+xymwC9c43uaTuRRjcR2VzMRxS9kIJ2+/5hr4drZesAzsMWtCFF
-2Lm2War6bzZ2e9oxB436hHb7VXFE4VEZ+dRm1Eg2KwcdOVRMbibVrOfEkp4BOnec
-2bMh2I29WryzZaY76ArV1b+bI9Hq3vzcmnZignQRv8Uwt+1CaV8aZvZJDik6Zoxt
-HgUVsxGcTHjCgWJZm6HTGnBUDef6/jCxwL7uuf9Wu6DUpsuPoujmY3d+NnSE32zg
-pF+J1WvdYlYIMgH+L9sSE3111y43tCP4MbWa8/x1vFq2+BXtBJtdVR6ZSPq6ZRZV
-BSQkRO0F2DkUqnkJYPvle9SbxiINEupgEdXOA4P69jo7IcBoccxslVs2GqdzmED4
-6VlgGxixCMgNk5rvgonI
-=ryCN
+iQIcBAABCAAGBQJdVPNNAAoJEFAslq9JXcLZQuEP/RpUHcfjN9xd3p32wQTuv1Tq
+c8DeUdqLWPZn/a8PsMxnJ3a1Yu+Wr4ZukkscXLT3Lgkz40NvsqkZc1psuF2DUNHd
+N9Y0pDhvW6/krEx5ub06iOJ9Z+FHTh9h5wV2NAdVuP5H3hM0nhAXPDnuo+DjE2YE
+P/siGVDf7brxc+kuaUqANJU9Dl4StUBnltKtQcheQDHTa+zo5yO+PbQHcRXf2x8e
+qpbm8/c0Plh4IRmlywAxtPL4K0WXClUAFq50VI+3C+i2TaUD0J7+KrkE69QyXxb4
+yz4Qw4g+BklgBTyVrPT6IMqg6qg8SSiNltI57T55CbLQgroaomr+KXh8/KbdS4Ej
+f7pjB6aryv9jXg+AzOIprZEJ4IXTFqvqH8oAFPGIHJ9kF31t5OrgQMybIOLF9Ycp
+dFWrI3wHXq+M3il2KxV/chNUY9bUmEKXNa9b0W79MAglCbrZAo8hGMdm3BdZfeIM
+ow5OV8/cSCMHD3H/OpLPAxVM37XorFkL2Zr+eGxEDYPQrG8NEBKs+0W1IwGEvJW7
+1s+toITi7YNLymf5EdvE4I1OW33I2a7fa44SA2+wMZSkmLjQRsizU2d3lHxPpx5L
+ZVybGRbnzn1Oqt80j8bD/6RpbgK7dzHHEyf2cS3DGS6OsnUmZzD+BB0wyEPC5WFV
+/s60GPFUFSvMOjxSatQn
+=uBKo
 -----END PGP SIGNATURE-----

Index: client/1.0/neutral/pkgd.eagle.harpy
==================================================================
--- client/1.0/neutral/pkgd.eagle.harpy
+++ client/1.0/neutral/pkgd.eagle.harpy
@@ -19,50 +19,50 @@
 <Certificate xmlns="https://eagle.to/2011/harpy"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Protocol>None</Protocol>
   <Vendor>Mistachkin Systems</Vendor>
-  <Id>516a3869-76a3-4e2f-8cd6-2d855e217c08</Id>
+  <Id>c57b61fc-6035-478f-9e44-00a0280b2176</Id>
   <HashAlgorithm>SHA512</HashAlgorithm>
   <EntityType>Script</EntityType>
-  <TimeStamp>2019-08-15T05:31:04.9334838Z</TimeStamp>
+  <TimeStamp>2019-08-15T05:53:03.6759115Z</TimeStamp>
   <Duration>-1.00:00:00</Duration>
   <Key>0x9559f6017247e3e2</Key>
   <Signature>
-    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
+    yPZ/MRIZsROGrbki4p5oKHTsoZ9oY/0ESb2jNzOfn2gNESURXWs+l+MvLZIlfbkx+6PRQSk9PwZY
+    tXA3VEdA739hwXdlQpCiCVVYmKrrf5r7YLXzPDmz1pdaClhMJ+JMOX7qaATqCx2ei0Y4tEPXwd2G
+    wW8tTJnBgvE2mY1nqPcLMUQpkNeKq1S4As2mI3RolEwE/wLdUTAHH2mma/b9OqkLgkjFTqbO4ymN
+    JtFofguoXxaenv9JHjnag7l3Tj49lBUvnwZITJhr3uj+RIO8ms+PTmZLbYvX0txgbienKTPEjBdW
+    wmeqAlZCz28CFXtAoZ39uRoa9w7tKbvaMqA9SqGtUYFewb0Ht4SP/7bBkkGx6DdDnJSpPzQzN3UR
+    o2XIuBlw9EQgRa3qAU9Rqun7C5SKx1urMqK/VbdFv2bT9+7UZnNEewA/r4xERxRRu2QKj8CazFnG
+    DIPFextMY77BAvgt3LfGwNCj0blEVT+1cZW5FczNv/Dhoak0xmQBvlz3oXwNkNa/87hdKk53pXm/
+    ByaLNS15zdJOKxxVFYNH16QxoA3mLeEXhNW4isyi2N0UyGhACMqFukJM/5svaUoo20WHMFHNsxF1
+    ebrmKxr+sohg+/QzZC43GuOk5ZJq9cOfD5/bTxWGeBJRk3/3vh4J/qy5OeA3+nRar1oNi63mggIf
+    bJLNwaK3Uvl6dDCz37uQvqvq0cTjnjsgdcuJ3Idi2LS6HQb+qYXeLmeFCqz04hNYg0x08OYlZY1h
+    1Pe4d5LBtrDS9+GXu7AhpChOnTnl9JssWdoyTR4PWrED9oiFyZYuDU8g39LwoSRS8mVbrndVmnnS
+    VQ7fn493AUsLa/6Ra/LR9OsUV38ZwGcD2cPgggqxKPHcGOU1FQ6U+HFhWuu70bdBgJ4sK5jUb/NF
+    qGHKYN3Q9FPf/3vgjmrQh+XDH0jsZTT+BLijCWK+dtiur6giDOun2tZSKptrpdBUUUWHmCIfYXgN
+    Jp7ihcNEcWm3WoSccRJKLUHnZyZrbLMVuPNdhcMpV/pTHjuakJWoNnmstIw67MXc3inMqMEH4Zvg
+    vJehqqkUji9lF81lcE7JBY4K4Z3+aYW9HH2zIAkcDd4XrogJ2xQO9tJ3/COD9c4pG+HF/hCb31FJ
+    GaSgzP4xyQadJ4BQJgWLK+ZceRIE8sBCf6+KjjOawEe7N1Q2zlqnFWhhAKhO3rzctpwJ7tQdWCBU
+    rjb0QKbGFD2rsD0u45450aMUhR6Kb+t5fRxKNQJb82rdvtvEUszpLU+MkXCTJtNU0gPOyuvNXB5o
+    12D1cauxvr482Z7L+D/MHSCOnDmd26dqQdc5HJVkHogdllyf+hWXc0MlOVFuSNAx4RJjMcHnXL8J
+    0H/ra5QAdJnPtb/Q8+uHyBzpCNedvukZtRIR2q3wrRGxdvN4BNg1/4IxoifOX4jZzLLtBBdznIK/
+    HGY8lgzLzbJWOmcnca5iWY2XEtPR7o4erazb/l5qHQxommTWg5FLtOrOJZwn6XD8XGspLHp00sJg
+    x1lHiACEH4G23IE+oEp9vfh/LRBcnrBylFEbMbqTSnq998+oUTpysinOt4uNDaGd13vHmOl+noUI
+    mspLcex4PebhhpDwYPZubIpZ13jtw8tV639vQHtuZyY7quHf/l0tuhL0b/ljCdfoPuSxjXlz7puS
+    XpOuiJs/daJRmYhYhB/sXmvsBTa3vzX+T23zhsrkmNUmEXJQukVzA0iFyvBeJi9CGS/ebzSjyI7/
+    GKiv3xpMNxSPmHJsOR8h8rl0k6jQ1DK9Z2gGiP8BnLJHBUjgSso5GxsQmqZkBw5EGtoJqf5RkiIu
+    jNaq/dRqfyKScXtUlq9nrlPmTUg5loXe1lbD4EqGpoRfE8nmex1HJ1WyiFQL4tqLAHeh/FhC3Bki
+    V/2wwJcQoIYAczp2MAHuEo3ClPfukafpY1GBxCESzDEJLUiF97Lms5bVuaV3dWK4Fm/rYDsCMu1T
+    iyeFMQC55sfgvBJjQlJbZ6N5j/Gd3qwmlc8VlbdgssN5ngu01lFNLMAJ6a52TylR3Dx/oeCfiBgj
+    UVs0lE6zavioDv6KLTcMNq6VZ66hsy57gQKjQJoeK5eG1yxIEzNkDdw6QOrsQWXe9jS7oLgtmW9d
+    sffBxUzV/rNory8IZ5c4vS8+95H0OpsenZWXL144qb/cTfpc7BjhEuqDQXJ7nexiT/bJ16c1KiDH
+    fEA79Egf0TMrbQlIzTiBgKLuew1xxQcZ61Y25l7a52p9gM3Vd+Uh61rakTLuo70VsUdEIbFDWchV
+    g4jwJyMyHqfVGUPh+9yGshEu7HRhCtiRrxHst0MFaKl5I2wYCf2WIfKQYs6xpb6bUfI5wP+XCC6C
+    PfmjZ7RCaUqa0uOcoEdYJV97/H+lKtnvO0szck98KS1RrDNMX4FjnnpZ9QZRrS5xPrUEv1h/wsh3
+    X5TINW54ycVtxbDciSyMPQ6RxpLV9/27tTeNEBDGcdlzUKJ7v5YuNBClkR5zsMy19ZCi+WfK2G0u
+    TIteAG8906xLSnjO5cvrIrK6KxzoEQz2dH52FHIw7zEd/AGqDOrvalxaLi3EzU/wtcP+2zftT2pe
+    rnkRAFzYAlRK6wkJ85ftnbjZ3J/gHqzfjMPpEAWrorsWVfi1E8OUWE3wD+pxYdYdS5+eIo1sML5i
+    tpil166WX26p9r9WjqhRghnD+aAUPLzKs3LjyoRkg6w9HjI8zMmPAkEB0AO5gaBvkqYeoQU=
   </Signature>
 </Certificate>

Index: client/1.0/neutral/pkgd.eagle.harpy.asc
==================================================================
--- client/1.0/neutral/pkgd.eagle.harpy.asc
+++ client/1.0/neutral/pkgd.eagle.harpy.asc
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 Comment: Eagle Package Repository
 
-iQIcBAABCAAGBQJdVO40AAoJEFAslq9JXcLZLjAP/jy5b7Abztn4HvrXY7MtwkCu
-lijJ1PQKuZvjKii3iDTsrBd7ANw7cBqEaGWV5Ayr7ag/qHOIJIxk5RcDK3PBeX+/
-cYCJCmRZzc+6PWpeOEPgxdl+f82Jb6/v7LbRVtpIIJAcK8A0HNX56qd0KKd2A6OX
-LZB8DJBbo5ZyORCJ23XoOPgLUO2V1xXh5L9rWfFTgP31cXdfe7sH6Z8awqKBUbXD
-3sKYdcZfM3WC+ZffnEwKApy1b+vkYU+F6l5LUo6wHBzWupKuJa7T15ZOlPwje7Kn
-cONZ16ocofRT2SHoyhTTW4QI5fRigjkc+ijOuRvp6LHC9F2VRoFImu6ijnrh2D2B
-xlbD5DJ86XwXPyth+p3IsCH8V3AMxHjfn5O1z+k7q3ZTVVsB5ZY/AHCbcXOS1oLJ
-pYDVPwTcmC9hW5gBY7PEO1CJF8N012W0ZeL0yKSSO5SGTJAsxoZd28wv31N3AzpZ
-Iroaw+/5btFqwJn/q/rVr2wIj0ojnF7v/Nraxyd1d6jHd85xHvpyls4k79hTbxHp
-ti392MOsj+ZgcVUVsUv7/VRtzXMiHw+oyV6ckGPoTjR9LJPSutpiwR6YdGZSFaEq
-YM519W8byDScPiRrkvzsUMEiG2tFQVwlYaHHfkk3PKrMU4cekvTkhj8S1iexS80j
-HdhJYFBFQzxrAfnmAopd
-=55qk
+iQIcBAABCAAGBQJdVPNOAAoJEFAslq9JXcLZFEQP/2ojig0owoLyG6nhjfOiDZVj
+oE88kfh/+R2VnjS7hWxoLbizirRC6sZCGzCRId3hL3+I0zWLQAx8IAzVTGl3wiP7
+r+Cvm4OxLHsHi9pWVIlCeuJu97oO+EasH6AIHAqknvrWmtbhH/cBbOTihRIBmcsw
+SDcizbaBQn20qNtQxbCUMz/miqZrjz1VVcR7mJkSD1HLfQ81COfrfvvWbpVJecSo
+wD0cNwx8EudrLmo4RKQmC9fXHCO2R+jfGUSiSNGUe6JEtfCTywVI51AllhRnAKiF
+1MD+Crm8QJdYYaVHTAH1q9SBF1iN4Yl3Snzl5sMrVCS5EUt86pGEkjNx50N5R/eD
+CJ3uoshCIjTQI6dvUgYnshOnlN2TBvoKZrM42qTQnpzBzzke/G77iZHm3gnORlPZ
+fWpnFBf96byXySqUqY/dPDXI8U17uFgY1M9C/lIHfIfuhkA83sZFNJl547YTt5YW
+cYEOtG1/U5SZ233HXQ7qKZQkMUKLaIeI2bHrmJ+x57V+rr29TexeY2tDXjUK6GzV
+6tRu9cE+w9IL1lbfhIi2pfTtODDLJx1I6shEeezjkdIOciUa6dV92CzyEkjXl3HK
+rHS6xt+EN92n3D9iON1cRjJr6mwZjDxUMolFnLQ2Kab0sZKjDJRW53v7xWEslmM+
+APVPh5HuzbTIz9USqhsH
+=WM2g
 -----END PGP SIGNATURE-----