svn commit: r514628 - head/www/cliqz

[Santhosh Raju]

Author: fox
Date: Thu Oct 17 00:27:24 2019
New Revision: 514628
URL: https://svnweb.freebsd.org/changeset/ports/514628

Log:
  www/cliqz: Update to 1.29.3
  
  - Moves Makefile.options to the correct location in Makefile.
  - Options now use option helpers.
  
  Reported by:	mat
  
  Changes since 1.29.2:
  
  Merge with Firefox 69.0.3
  
  https://github.com/cliqz-oss/browser-f/compare/1.29.2...1.29.3
  
  Approved by:	philip (mentor)

Modified:
  head/www/cliqz/Makefile
  head/www/cliqz/Makefile.options
  head/www/cliqz/distinfo

Modified: head/www/cliqz/Makefile
==============================================================================
--- head/www/cliqz/Makefile	Wed Oct 16 23:03:49 2019	(r514627)
+++ head/www/cliqz/Makefile	Thu Oct 17 00:27:24 2019	(r514628)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cliqz
-DISTVERSION=	1.29.2
+DISTVERSION=	1.29.3
 CATEGORIES=	www
 MASTER_SITES=	https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \
 		http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz
@@ -64,8 +64,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	cliqz-oss
 GH_PROJECT=	browser-f
 
-.include "${.CURDIR}/Makefile.options"
-
 USE_LDCONFIG=	yes
 
 bash_OLD_CMD=	"/bin/bash"
@@ -75,7 +73,7 @@ SHEBANG_FILES=	magic_build_and_package.sh
 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
-CLIQZ_LAST_BUILD_ID=	20191008110659
+CLIQZ_LAST_BUILD_ID=	20191011101006
 CLIQZ_ICON=		${PORTNAME}.png
 CLIQZ_ICON_SRC=		${WRKSRC}/mozilla-release/browser/branding/${PORTNAME}/default48.png
 MOZ_DESKTOP=		${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop
@@ -96,6 +94,8 @@ MOZ_CONFIGURE_ARGS+=	"ac_add_options --disable-crashre
 			"ac_add_options --libclang-path=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" \
 			"ac_add_options --with-system-graphite2" \
 			"ac_add_options --with-system-harfbuzz"
+
+.include "${.CURDIR}/Makefile.options"
 
 .include <bsd.port.pre.mk>
 

Modified: head/www/cliqz/Makefile.options
==============================================================================
--- head/www/cliqz/Makefile.options	Wed Oct 16 23:03:49 2019	(r514627)
+++ head/www/cliqz/Makefile.options	Thu Oct 17 00:27:24 2019	(r514628)
@@ -6,27 +6,19 @@ OPTIONS_MULTI_AUDIO=	JACK PULSEAUDIO SNDIO
 OPTIONS_DEFAULT=	JACK PULSEAUDIO SNDIO
 AUDIO_DESC=		Choose your audio options
 
-.include <bsd.port.options.mk>
+JACK_BUILD_DEPENDS=	${LOCALBASE}/include/jack/jack.h:audio/jack
+JACK_VARS=		MOZ_CONFIGURE_ARGS+=	"ac_add_options --enable-jack"
 
-.if ${PORT_OPTIONS:MJACK}
-BUILD_DEPENDS+=	${LOCALBASE}/include/jack/jack.h:audio/jack
-MOZ_CONFIGURE_ARGS+=	"ac_add_options --enable-jack"
-.endif
+PULSEAUDIO_BUILD_DEPENDS=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
+PULSEAUDIO_VARS=		MOZ_CONFIGURE_ARGS+=	"ac_add_options	--enable-pulseaudio"
+PULSEAUDIO_VARS_OFF=		MOZ_CONFIGURE_ARGS+=	"ac_add_options --disable-pulseaudio"
 
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-BUILD_DEPENDS+=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
-MOZ_CONFIGURE_ARGS+=	"ac_add_options	--enable-pulseaudio"
-.else
-MOZ_CONFIGURE_ARGS+=	"ac_add_options --disable-pulseaudio"
-.endif
+SNDIO_BUILD_DEPENDS+=	${LOCALBASE}/include/sndio.h:audio/sndio
+SNDIO_LIB_DEPENDS+=	libsndio.so:audio/sndio
 
-.if ${PORT_OPTIONS:MSNDIO}
-BUILD_DEPENDS+=	${LOCALBASE}/include/sndio.h:audio/sndio
-LIB_DEPENDS+=	libsndio.so:audio/sndio
 post-patch-SNDIO-on:
 	@${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \
 		${WRKSRC}/mozilla-release/media/libcubeb/src/moz.build \
 		${WRKSRC}/mozilla-release/toolkit/library/moz.build
 	@${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \
 		${WRKSRC}/mozilla-release/media/libcubeb/gtest/moz.build
-.endif

Modified: head/www/cliqz/distinfo
==============================================================================
--- head/www/cliqz/distinfo	Wed Oct 16 23:03:49 2019	(r514627)
+++ head/www/cliqz/distinfo	Thu Oct 17 00:27:24 2019	(r514628)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1570787248
+TIMESTAMP = 1571225186
 SHA256 (cliqz/adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65
 SIZE (cliqz/adult-domains.bin) = 528392
 SHA256 (cliqz/cliqz at cliqz.com.xpi) = c729bf22cd90c3312f0ea6f142eb6857f50cfe978dafc74710d9e1841cd602b8
@@ -7,5 +7,5 @@ SHA256 (cliqz/gdprtool at cliqz.com.xpi) = 95ce7bd4ba1ea3
 SIZE (cliqz/gdprtool at cliqz.com.xpi) = 222247
 SHA256 (cliqz/https-everywhere at cliqz.com.xpi) = 094516da166aa984c836130075184315c5636033899c49fe6bca5b7190f488fc
 SIZE (cliqz/https-everywhere at cliqz.com.xpi) = 2147608
-SHA256 (cliqz/cliqz-oss-browser-f-1.29.2_GH0.tar.gz) = dd63c2d435501614ad46df7d934362284f591144cacea6b06dd1b95be1203481
-SIZE (cliqz/cliqz-oss-browser-f-1.29.2_GH0.tar.gz) = 501536649
+SHA256 (cliqz/cliqz-oss-browser-f-1.29.3_GH0.tar.gz) = 05881a2890a3248f7d9e6b38de3784a07e42b1555bd783045976ccb8f42ae24f
+SIZE (cliqz/cliqz-oss-browser-f-1.29.3_GH0.tar.gz) = 501544279