Mon Sep 30 09:33:34 2019 UTC ()
cliqz: use a versioned DIST_SUBDIR.

Not all the files are versioned, so we have a mismatch if the previous
version's files existed.
This addresses the failure seen on mef's bulk build.


(maya)
diff -r1.21 -r1.22 pkgsrc/www/cliqz/Makefile
diff -r1.13 -r1.14 pkgsrc/www/cliqz/distinfo
cvs diff -r1.21 -r1.22 pkgsrc/www/cliqz/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/cliqz/Attic/Makefile 2019/09/29 11:28:05 1.21
+++ pkgsrc/www/cliqz/Attic/Makefile 2019/09/30 09:33:34 1.22
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.21 2019/09/29 11:28:05 fox Exp $ 1# $NetBSD: Makefile,v 1.22 2019/09/30 09:33:34 maya Exp $
2 2
3DISTNAME= cliqz-1.29.0 3DISTNAME= cliqz-1.29.0
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_GITHUB:=cliqz-oss/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=cliqz-oss/}
6GITHUB_PROJECT= browser-f 6GITHUB_PROJECT= browser-f
7GITHUB_TAG= ${PKGVERSION_NOREV} 7GITHUB_TAG= ${PKGVERSION_NOREV}
8DISTFILES= adult-domains.bin \ 8DISTFILES= adult-domains.bin \
9 cliqz@cliqz.com.xpi \ 9 cliqz@cliqz.com.xpi \
10 https-everywhere@cliqz.com.xpi \ 10 https-everywhere@cliqz.com.xpi \
11 gdprtool@cliqz.com.xpi \ 11 gdprtool@cliqz.com.xpi \
12 ${DISTNAME}${EXTRACT_SUFX} 12 ${DISTNAME}${EXTRACT_SUFX}
13DIST_SUBDIR= ${PKGBASE} 13DIST_SUBDIR= ${PKGNAME}
14 14
15CLIQZ_CHANNEL= release 15CLIQZ_CHANNEL= release
16# If the PKGVERSION_NOREV is updated, make sure to update the last build id from 16# If the PKGVERSION_NOREV is updated, make sure to update the last build id from
17# ftp -Vo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/lastbuildid 17# ftp -Vo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/lastbuildid
18CLIQZ_LAST_BUILD_ID= 20190920100917 18CLIQZ_LAST_BUILD_ID= 20190920100917
19CLIQZ_PLUGIN_SUFX= @cliqz.com.xpi 19CLIQZ_PLUGIN_SUFX= @cliqz.com.xpi
20 20
21SITES.adult-domains.bin= \ 21SITES.adult-domains.bin= \
22 https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/ 22 https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/
23SITES.cliqz${CLIQZ_PLUGIN_SUFX}= \ 23SITES.cliqz${CLIQZ_PLUGIN_SUFX}= \
24 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/ 24 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
25SITES.https-everywhere${CLIQZ_PLUGIN_SUFX}= \ 25SITES.https-everywhere${CLIQZ_PLUGIN_SUFX}= \
26 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/ 26 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
cvs diff -r1.13 -r1.14 pkgsrc/www/cliqz/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/cliqz/Attic/distinfo 2019/09/29 11:28:05 1.13
+++ pkgsrc/www/cliqz/Attic/distinfo 2019/09/30 09:33:34 1.14
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: distinfo,v 1.13 2019/09/29 11:28:05 fox Exp $ 1$NetBSD: distinfo,v 1.14 2019/09/30 09:33:34 maya Exp $
2 2
3SHA1 (cliqz/adult-domains.bin) = 9dd0756b67aa17357ef61f3bea8303dad63540a1 3SHA1 (cliqz-1.29.0/adult-domains.bin) = 9dd0756b67aa17357ef61f3bea8303dad63540a1
4RMD160 (cliqz/adult-domains.bin) = 78f46f31b27b4172a6aa6125619f92f751172a75 4RMD160 (cliqz-1.29.0/adult-domains.bin) = 78f46f31b27b4172a6aa6125619f92f751172a75
5SHA512 (cliqz/adult-domains.bin) = d0229800e0e1bf6d60e5510d2995a8ba800ab933adc0de44791c2b4a9ca39de7ad6cfe9b9563bdac67ecbc96c48d1277866da94d6ea635e1435a9e95a63dff08 5SHA512 (cliqz-1.29.0/adult-domains.bin) = d0229800e0e1bf6d60e5510d2995a8ba800ab933adc0de44791c2b4a9ca39de7ad6cfe9b9563bdac67ecbc96c48d1277866da94d6ea635e1435a9e95a63dff08
6Size (cliqz/adult-domains.bin) = 528392 bytes 6Size (cliqz-1.29.0/adult-domains.bin) = 528392 bytes
7SHA1 (cliqz/cliqz-1.29.0.tar.gz) = 5bedf2820aa77c1617fb37214ff1c6d4fba6731c 7SHA1 (cliqz-1.29.0/cliqz-1.29.0.tar.gz) = 5bedf2820aa77c1617fb37214ff1c6d4fba6731c
8RMD160 (cliqz/cliqz-1.29.0.tar.gz) = 8d9cacef1573e743b5008eb7d8da78df9eafd312 8RMD160 (cliqz-1.29.0/cliqz-1.29.0.tar.gz) = 8d9cacef1573e743b5008eb7d8da78df9eafd312
9SHA512 (cliqz/cliqz-1.29.0.tar.gz) = a6673c75fe5dff498172884b66a87b54d883ed9a6310c697abac7584ffa98afbd273e79af2f711a86f6cb76684ca1bbde4ef5a4e874e15386d91b4e0e05b2e21 9SHA512 (cliqz-1.29.0/cliqz-1.29.0.tar.gz) = a6673c75fe5dff498172884b66a87b54d883ed9a6310c697abac7584ffa98afbd273e79af2f711a86f6cb76684ca1bbde4ef5a4e874e15386d91b4e0e05b2e21
10Size (cliqz/cliqz-1.29.0.tar.gz) = 501511014 bytes 10Size (cliqz-1.29.0/cliqz-1.29.0.tar.gz) = 501511014 bytes
11SHA1 (cliqz/cliqz@cliqz.com.xpi) = d7dde5a6946996d5002b48f72661fccc63a59bb1 11SHA1 (cliqz-1.29.0/cliqz@cliqz.com.xpi) = d7dde5a6946996d5002b48f72661fccc63a59bb1
12RMD160 (cliqz/cliqz@cliqz.com.xpi) = 3e0afc6b3ea418e63e37c1c3876b4f5367598dc0 12RMD160 (cliqz-1.29.0/cliqz@cliqz.com.xpi) = 3e0afc6b3ea418e63e37c1c3876b4f5367598dc0
13SHA512 (cliqz/cliqz@cliqz.com.xpi) = 30e380bdea12ef31c672554833cdeac99e43549b8b7c6e60058aad1f8cd5b8d06bcfa41b92daec2ec1e706b8183ff532ca552c8bf8f1b74363392ad9c93aef05 13SHA512 (cliqz-1.29.0/cliqz@cliqz.com.xpi) = 30e380bdea12ef31c672554833cdeac99e43549b8b7c6e60058aad1f8cd5b8d06bcfa41b92daec2ec1e706b8183ff532ca552c8bf8f1b74363392ad9c93aef05
14Size (cliqz/cliqz@cliqz.com.xpi) = 5914074 bytes 14Size (cliqz-1.29.0/cliqz@cliqz.com.xpi) = 5914074 bytes
15SHA1 (cliqz/gdprtool@cliqz.com.xpi) = 63be2c9c779b7c10644b02a8bbb234d1c004e2c2 15SHA1 (cliqz-1.29.0/gdprtool@cliqz.com.xpi) = 63be2c9c779b7c10644b02a8bbb234d1c004e2c2
16RMD160 (cliqz/gdprtool@cliqz.com.xpi) = cdc87373a012e68ac94e9c1292d40a728a6b4974 16RMD160 (cliqz-1.29.0/gdprtool@cliqz.com.xpi) = cdc87373a012e68ac94e9c1292d40a728a6b4974
17SHA512 (cliqz/gdprtool@cliqz.com.xpi) = 63bfa57a93effd508f432b2672505e62f63e1f451082c69cce90ced9f16826496465690233146eae2b8cb0e43f4695c25b42a82058366df026d45361493ec0c9 17SHA512 (cliqz-1.29.0/gdprtool@cliqz.com.xpi) = 63bfa57a93effd508f432b2672505e62f63e1f451082c69cce90ced9f16826496465690233146eae2b8cb0e43f4695c25b42a82058366df026d45361493ec0c9
18Size (cliqz/gdprtool@cliqz.com.xpi) = 222247 bytes 18Size (cliqz-1.29.0/gdprtool@cliqz.com.xpi) = 222247 bytes
19SHA1 (cliqz/https-everywhere@cliqz.com.xpi) = 8713c84e271a61e164c250a7d2212f0a162768a9 19SHA1 (cliqz-1.29.0/https-everywhere@cliqz.com.xpi) = 8713c84e271a61e164c250a7d2212f0a162768a9
20RMD160 (cliqz/https-everywhere@cliqz.com.xpi) = d2d11d22e324a886bc4bd2ccc82e93a055f0d8c2 20RMD160 (cliqz-1.29.0/https-everywhere@cliqz.com.xpi) = d2d11d22e324a886bc4bd2ccc82e93a055f0d8c2
21SHA512 (cliqz/https-everywhere@cliqz.com.xpi) = 0b1c0b71e770b3331ed8665104163171e334fd8dc2c2fb0091919bb80f3f93af7ce34dd376eb06bb12c93c8c654c6e0861ff7b658fc50b56ae3a77d8ad5483fb 21SHA512 (cliqz-1.29.0/https-everywhere@cliqz.com.xpi) = 0b1c0b71e770b3331ed8665104163171e334fd8dc2c2fb0091919bb80f3f93af7ce34dd376eb06bb12c93c8c654c6e0861ff7b658fc50b56ae3a77d8ad5483fb
22Size (cliqz/https-everywhere@cliqz.com.xpi) = 2147608 bytes 22Size (cliqz-1.29.0/https-everywhere@cliqz.com.xpi) = 2147608 bytes
23SHA1 (patch-cliqz__env.sh) = 6f7aba36875e86960a8fd674fdff2f576d9b479d 23SHA1 (patch-cliqz__env.sh) = 6f7aba36875e86960a8fd674fdff2f576d9b479d
24SHA1 (patch-mozilla-release_browser_app_profile_firefox.js) = e76a7a023a72fe9c5c621da416a8be3111ed8894 24SHA1 (patch-mozilla-release_browser_app_profile_firefox.js) = e76a7a023a72fe9c5c621da416a8be3111ed8894
25SHA1 (patch-mozilla-release_browser_config_cliqz.mozconfig) = f59e4c0405ed2f8a5fbb0f3e3ce7c62206c1bca8 25SHA1 (patch-mozilla-release_browser_config_cliqz.mozconfig) = f59e4c0405ed2f8a5fbb0f3e3ce7c62206c1bca8
26SHA1 (patch-mozilla-release_config__make_system_wrappers.py) = 4c075265de903751ee7e3275a75f31dd78881188 26SHA1 (patch-mozilla-release_config__make_system_wrappers.py) = 4c075265de903751ee7e3275a75f31dd78881188
27SHA1 (patch-mozilla-release_config_rules.mk) = fb9313ddcf18ca6732d5c915377ab6c82b9a9aea 27SHA1 (patch-mozilla-release_config_rules.mk) = fb9313ddcf18ca6732d5c915377ab6c82b9a9aea
28SHA1 (patch-mozilla-release_dom_base_nsAttrName.h) = 5583d7f6aafb29f4b8e8be794902adf2850e1b5f 28SHA1 (patch-mozilla-release_dom_base_nsAttrName.h) = 5583d7f6aafb29f4b8e8be794902adf2850e1b5f
29SHA1 (patch-mozilla-release_gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = c696b0dc6d2f25773ac4d928857b00b4f3799838 29SHA1 (patch-mozilla-release_gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = c696b0dc6d2f25773ac4d928857b00b4f3799838
30SHA1 (patch-mozilla-release_gfx_angle_checkout_src_compiler_translator_InfoSink.h) = e5f9cb8fac413267546a268ca0e50611b9965542 30SHA1 (patch-mozilla-release_gfx_angle_checkout_src_compiler_translator_InfoSink.h) = e5f9cb8fac413267546a268ca0e50611b9965542
31SHA1 (patch-mozilla-release_ipc_chromium_src_base_lock__impl__posix.cc) = 11283db62c0a392dc592b1a82c2d9c0788ee11bb 31SHA1 (patch-mozilla-release_ipc_chromium_src_base_lock__impl__posix.cc) = 11283db62c0a392dc592b1a82c2d9c0788ee11bb
32SHA1 (patch-mozilla-release_ipc_chromium_src_base_message__pump__libevent.cc) = 49051c927711fd5558f90aa651dccd99a887e95f 32SHA1 (patch-mozilla-release_ipc_chromium_src_base_message__pump__libevent.cc) = 49051c927711fd5558f90aa651dccd99a887e95f
33SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore.h) = 741a8fc9eb83bd58415d70a3be1718ccd8b8c888 33SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore.h) = 741a8fc9eb83bd58415d70a3be1718ccd8b8c888
34SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore__posix.cpp) = be74788a5bafcf306438cd18afc3e40586038997 34SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore__posix.cpp) = be74788a5bafcf306438cd18afc3e40586038997
35SHA1 (patch-mozilla-release_ipc_glue_GeckoChildProcessHost.cpp) = 2667be0de782205e62a7b0a5359de83223bd4fc3 35SHA1 (patch-mozilla-release_ipc_glue_GeckoChildProcessHost.cpp) = 2667be0de782205e62a7b0a5359de83223bd4fc3