cliqz: Implemented the suggestions from leot.

[Santhosh Raju <fox%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Fri Dec 14 19:01:34 2018 +0530
Changeset:	2811eb2cbef0601126ad09a9b81b8b32273e3ffd

Modified Files:
	cliqz/Makefile
	cliqz/mozilla-common.mk
	cliqz/options.mk

Log Message:
cliqz: Implemented the suggestions from leot.

1. Removed O0TRACKING section.
2. Fixed the regexp for NetBSD version check.
3. Replaced DISTVERSION with PKGVERSION_NOREV.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2811eb2cbef0601126ad09a9b81b8b32273e3ffd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cliqz/Makefile          | 21 ++++++++++-----------
 cliqz/mozilla-common.mk |  2 +-
 cliqz/options.mk        | 10 ----------
 3 files changed, 11 insertions(+), 22 deletions(-)

diffs:
diff --git a/cliqz/Makefile b/cliqz/Makefile
index 6596ccc86f..8b071a7f31 100644
--- a/cliqz/Makefile
+++ b/cliqz/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD$
 
-DISTNAME=	cliqz-${DISTVERSION}
-DISTVERSION=	1.23.3
+DISTNAME=	cliqz-1.23.3
 CATEGORIES=	www
-MASTER_SITES+=	${MASTER_SITE_GITHUB:=cliqz-oss/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=cliqz-oss/}
 GITHUB_PROJECT=	browser-f
 GITHUB_TAG=	${PKGVERSION_NOREV}
 DISTFILES=	adult-domains.bin \
@@ -20,18 +19,18 @@ HOMEPAGE=	https://cliqz.com/en/desktop
 COMMENT=	Secure browser (Mozilla based) with built-in quick search
 LICENSE=	mpl-2.0
 
-USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip bash pax
-USE_LANGUAGES+=		c99 gnu++14
+USE_TOOLS+=	pkg-config perl gmake autoconf213 unzip zip bash pax
+USE_LANGUAGES+=	c99 gnu++14
 
 TOOL_DEPENDS+=	python37-[0-9]*:../../lang/python37
 TOOL_DEPENDS+=	cbindgen-[0-9]*:../../devel/cbindgen
 TOOL_DEPENDS+=	nodejs-[0-9]*:../../lang/nodejs
 
-WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${DISTVERSION}
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
 CLIQZ_CHANNEL=		release
-# If the DISTVERSION is updated, make sure to update the last build id from
-# fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid
+# If the PKGVERSION_NOREV is updated, make sure to update the last build id from
+# fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/lastbuildid
 CLIQZ_LAST_BUILD_ID=	20181116003917
 CLIQZ_ICON=		cliqz.png
 CLIQZ_ICON_SRC=		${WRKSRC}/mozilla-release/browser/branding/cliqz/default48.png
@@ -42,11 +41,11 @@ CLIQZ_PLUGIN_SUFX=	@cliqz.com.xpi
 SITES.adult-domains.bin= \
 	https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/
 SITES.cliqz${CLIQZ_PLUGIN_SUFX}= \
-	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/
+	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
 SITES.https-everywhere${CLIQZ_PLUGIN_SUFX}= \
-	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/
+	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
 SITES.gdprtool${CLIQZ_PLUGIN_SUFX}= \
-	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/
+	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
 
 MAKE_ENV+=	CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL}
 MAKE_ENV+=	CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID}
diff --git a/cliqz/mozilla-common.mk b/cliqz/mozilla-common.mk
index 72a6571c76..78064e7038 100644
--- a/cliqz/mozilla-common.mk
+++ b/cliqz/mozilla-common.mk
@@ -12,7 +12,7 @@ UNLIMIT_RESOURCES+=	datasize
 # for lang/gcc6
 GCC_REQD+=	6.1
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-[0-7]**-*) || \
+.if !empty(MACHINE_PLATFORM:MNetBSD-[0-7].*-*) || \
 	!empty(MACHINE_PLATFORM:MNetBSD-8.[0-8]*-*)
 USE_PKGSRC_GCC_RUNTIME=	yes
 .endif
diff --git a/cliqz/options.mk b/cliqz/options.mk
index b8e74dc96d..0ef1b0f10b 100644
--- a/cliqz/options.mk
+++ b/cliqz/options.mk
@@ -15,16 +15,6 @@ MOZ_CONFIGURE_ARGS+=	"ac_add_options --enable-alsa"
 MOZ_CONFIGURE_ARGS+=	"ac_add_options --disable-alsa"
 .endif
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mgcc)
-.  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
-# Modern gcc does not run any "tracking" passes when compiling with -O0,
-# which makes the generated debug info mostly useless. So explicitly
-# request them.
-O0TRACKING=-fvar-tracking-assignments -fvar-tracking
-.  endif
-.endif
-
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
 MOZ_CONFIGURE_ARGS+=	"ac_add_options --enable-pulseaudio"