Mon Sep 30 09:49:44 2019 UTC ()
cliqz: use the pkgname without the netbsd version suffix.
No functional change now, but it will avoid changing the distfiles
if PKGREVISION is used.

Thanks to leot for pointing it out.


(maya)
diff -r1.22 -r1.23 pkgsrc/www/cliqz/Makefile
cvs diff -r1.22 -r1.23 pkgsrc/www/cliqz/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/cliqz/Attic/Makefile 2019/09/30 09:33:34 1.22
+++ pkgsrc/www/cliqz/Attic/Makefile 2019/09/30 09:49:44 1.23
@@ -1,132 +1,132 @@ @@ -1,132 +1,132 @@
1# $NetBSD: Makefile,v 1.22 2019/09/30 09:33:34 maya Exp $ 1# $NetBSD: Makefile,v 1.23 2019/09/30 09:49:44 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= ${PKGNAME} 13DIST_SUBDIR= ${PKGNAME_NOREV}
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}/
27SITES.gdprtool${CLIQZ_PLUGIN_SUFX}= \ 27SITES.gdprtool${CLIQZ_PLUGIN_SUFX}= \
28 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/ 28 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
29 29
30EXTRACT_USING= bsdtar 30EXTRACT_USING= bsdtar
31EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 31EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
32 32
33MAINTAINER= fox@NetBSD.org 33MAINTAINER= fox@NetBSD.org
34HOMEPAGE= https://cliqz.com/en/desktop 34HOMEPAGE= https://cliqz.com/en/desktop
35COMMENT= Secure browser (Mozilla based) with built-in quick search 35COMMENT= Secure browser (Mozilla based) with built-in quick search
36LICENSE= mpl-2.0 AND gnu-gpl-v2 36LICENSE= mpl-2.0 AND gnu-gpl-v2
37 37
38USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip bash pax 38USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip bash pax
39USE_LANGUAGES+= c99 gnu++14 39USE_LANGUAGES+= c99 gnu++14
40 40
41# Build script does not support python 3.x yet. 41# Build script does not support python 3.x yet.
42# https://firefox-source-docs.mozilla.org/build/buildsystem/python.html 42# https://firefox-source-docs.mozilla.org/build/buildsystem/python.html
43PYTHON_VERSIONS_ACCEPTED= 27 43PYTHON_VERSIONS_ACCEPTED= 27
44PYTHON_FOR_BUILD_ONLY= tool 44PYTHON_FOR_BUILD_ONLY= tool
45TOOL_DEPENDS+= cbindgen>=0.8.2:../../devel/cbindgen 45TOOL_DEPENDS+= cbindgen>=0.8.2:../../devel/cbindgen
46TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 46TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
47 47
48BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm 48BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
49BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm 49BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
50 50
51WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV} 51WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
52 52
53CLIQZ_ICON= cliqz.png 53CLIQZ_ICON= cliqz.png
54CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/cliqz/default48.png 54CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/cliqz/default48.png
55MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop 55MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop
56CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop 56CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop
57 57
58MAKE_ENV+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} 58MAKE_ENV+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL}
59MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} 59MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID}
60MAKE_ENV+= MOZBUILD_STATE_PATH=${WRKDIR}/.home/.mozbuild 60MAKE_ENV+= MOZBUILD_STATE_PATH=${WRKDIR}/.home/.mozbuild
61 61
62.include "mozilla-common.mk" 62.include "mozilla-common.mk"
63.include "options.mk" 63.include "options.mk"
64 64
65CHECK_WRKREF_SKIP+= lib/cliqz/chrome/toolkit/content/global/buildconfig.html 65CHECK_WRKREF_SKIP+= lib/cliqz/chrome/toolkit/content/global/buildconfig.html
66 66
67REPLACE_BASH+= magic_build_and_package.sh 67REPLACE_BASH+= magic_build_and_package.sh
68 68
69CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS 69CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
70LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/cliqz ${COMPILER_RPATH_FLAG}${PREFIX}/lib 70LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/cliqz ${COMPILER_RPATH_FLAG}${PREFIX}/lib
71 71
72# Needed by the Javascript JIT used in cliqz 72# Needed by the Javascript JIT used in cliqz
73NOT_PAX_MPROTECT_SAFE+= lib/cliqz/cliqz 73NOT_PAX_MPROTECT_SAFE+= lib/cliqz/cliqz
74NOT_PAX_MPROTECT_SAFE+= lib/cliqz/cliqz-bin 74NOT_PAX_MPROTECT_SAFE+= lib/cliqz/cliqz-bin
75NOT_PAX_MPROTECT_SAFE+= lib/cliqz/plugin-container 75NOT_PAX_MPROTECT_SAFE+= lib/cliqz/plugin-container
76 76
77post-extract: 77post-extract:
78 ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC} 78 ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC}
79 ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features 79 ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features
80 ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz${CLIQZ_PLUGIN_SUFX} \ 80 ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz${CLIQZ_PLUGIN_SUFX} \
81 ${DISTDIR}/${DIST_SUBDIR}/https-everywhere${CLIQZ_PLUGIN_SUFX} \ 81 ${DISTDIR}/${DIST_SUBDIR}/https-everywhere${CLIQZ_PLUGIN_SUFX} \
82 ${DISTDIR}/${DIST_SUBDIR}/gdprtool${CLIQZ_PLUGIN_SUFX} \ 82 ${DISTDIR}/${DIST_SUBDIR}/gdprtool${CLIQZ_PLUGIN_SUFX} \
83 ${WRKSRC}/obj/dist/bin/browser/features 83 ${WRKSRC}/obj/dist/bin/browser/features
84 84
85post-patch: 85post-patch:
86 ${SED} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \ 86 ${SED} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \
87 -e 's/@MOZ_APP_NAME@/cliqz/g' \ 87 -e 's/@MOZ_APP_NAME@/cliqz/g' \
88 -e '/Icon=cliqz/ s/cliqz/${CLIQZ_ICON}/' \ 88 -e '/Icon=cliqz/ s/cliqz/${CLIQZ_ICON}/' \
89 -e '/StartupWMClass/d' \ 89 -e '/StartupWMClass/d' \
90 < ${MOZ_DESKTOP} \ 90 < ${MOZ_DESKTOP} \
91 > ${CLIQZ_DESKTOP} 91 > ${CLIQZ_DESKTOP}
92 for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS}; do \ 92 for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS}; do \
93 ${ECHO} $$MOZ_CONFIGURE_ARG >> \ 93 ${ECHO} $$MOZ_CONFIGURE_ARG >> \
94 ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig; \ 94 ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig; \
95 done; 95 done;
96 96
97do-build: 97do-build:
98 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh 98 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh
99 99
100INSTALLATION_DIRS+= share/applications share/pixmaps bin lib/cliqz 100INSTALLATION_DIRS+= share/applications share/pixmaps bin lib/cliqz
101do-install: 101do-install:
102 cd ${WRKSRC}/obj/dist/cliqz && \ 102 cd ${WRKSRC}/obj/dist/cliqz && \
103 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/cliqz && \ 103 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/cliqz && \
104 ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${DESTDIR}${PREFIX}/lib/* 104 ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${DESTDIR}${PREFIX}/lib/*
105 cd ${DESTDIR}${PREFIX}/lib && \ 105 cd ${DESTDIR}${PREFIX}/lib && \
106 ${FIND} . \( -name \*.js -or \ 106 ${FIND} . \( -name \*.js -or \
107 -name \*.html -or \ 107 -name \*.html -or \
108 -name \*.xml -or \ 108 -name \*.xml -or \
109 -name \*.svg \ 109 -name \*.svg \
110 \) \ 110 \) \
111 -type f \ 111 -type f \
112 -exec ${CHMOD} 0644 '{}' \; 112 -exec ${CHMOD} 0644 '{}' \;
113 113
114post-install: 114post-install:
115 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/cliqz 115 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/cliqz
116 ${ECHO} 'exec ${PREFIX}/lib/cliqz/cliqz "$$@"' >> ${DESTDIR}${PREFIX}/bin/cliqz 116 ${ECHO} 'exec ${PREFIX}/lib/cliqz/cliqz "$$@"' >> ${DESTDIR}${PREFIX}/bin/cliqz
117 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/cliqz 117 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/cliqz
118 ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${DESTDIR}${PREFIX}/share/applications/ 118 ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${DESTDIR}${PREFIX}/share/applications/
119 ${INSTALL_DATA} ${CLIQZ_ICON_SRC} ${DESTDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON} 119 ${INSTALL_DATA} ${CLIQZ_ICON_SRC} ${DESTDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON}
120 120
121.include "../../lang/python/pyversion.mk" 121.include "../../lang/python/pyversion.mk"
122.include "../../mk/compiler.mk" 122.include "../../mk/compiler.mk"
123PKG_CC= clang 123PKG_CC= clang
124PKG_CXX= clang++ 124PKG_CXX= clang++
125BUILDLINK_DEPMETHOD.clang= build 125BUILDLINK_DEPMETHOD.clang= build
126BUILDLINK_API_DEPENDS.clang+= clang>=6.0.1nb1 126BUILDLINK_API_DEPENDS.clang+= clang>=6.0.1nb1
127.include "../../lang/clang/buildlink3.mk" 127.include "../../lang/clang/buildlink3.mk"
128BUILDLINK_DEPMETHOD.rust= build 128BUILDLINK_DEPMETHOD.rust= build
129BUILDLINK_API_DEPENDS.rust+= rust>=1.34.0 129BUILDLINK_API_DEPENDS.rust+= rust>=1.34.0
130.include "../../lang/rust/buildlink3.mk" 130.include "../../lang/rust/buildlink3.mk"
131.include "../../sysutils/desktop-file-utils/desktopdb.mk" 131.include "../../sysutils/desktop-file-utils/desktopdb.mk"
132.include "../../mk/bsd.pkg.mk" 132.include "../../mk/bsd.pkg.mk"