Index: head/www/cliqz/Makefile =================================================================== --- head/www/cliqz/Makefile (revision 510067) +++ head/www/cliqz/Makefile (revision 510068) @@ -1,127 +1,127 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.28.1 -PORTREVISION= 1 +DISTVERSION= 1.28.2 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 DISTFILES= adult-domains.bin:amazon \ cliqz@cliqz.com.xpi:cliqz \ - https-everywhere@cliqz.com.xpi:cliqz \ - gdprtool@cliqz.com.xpi:cliqz + gdprtool@cliqz.com.xpi:cliqz \ + https-everywhere@cliqz.com.xpi:cliqz +DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} MAINTAINER= santhosh.raju@gmail.com COMMENT= Secure browser (Mozilla based) with built-in quick search LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE FETCH_DEPENDS= ca_root_nss>=0:security/ca_root_nss LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libnspr4.so:devel/nspr \ + libnssutil3.so:security/nss \ libplc4.so:devel/nspr \ - libplds4.so:devel/nspr \ - libnssutil3.so:security/nss + libplds4.so:devel/nspr -BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \ +BUILD_DEPENDS= ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \ + ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${RUST_DEFAULT}>=1.28:lang/${RUST_DEFAULT} \ + autoconf-2.13:devel/autoconf213 \ bash:shells/bash \ graphite2>=1.3.12:graphics/graphite2 \ harfbuzz>=1.8.8:print/harfbuzz \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ libvorbis>=1.3.6,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ - ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \ nasm:devel/nasm \ node:www/node \ nspr>=4.19:devel/nspr \ nss>=3.39:security/nss \ png>=1.6.34:graphics/png \ - ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - ${RUST_DEFAULT}>=1.28:lang/${RUST_DEFAULT} \ rust-cbindgen>=0.6.2:devel/rust-cbindgen \ sqlite3>=3.24.0:databases/sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm \ zip:archivers/zip -USES= tar:xz gmake pkgconfig gnome python:2.7,build desktop-file-utils \ - compiler:c11 shebangfix +USES= compiler:c11 desktop-file-utils gmake gnome pkgconfig \ + python:2.7,build shebangfix tar:xz -USE_GNOME= gconf2 gtk20 gtk30 cairo gdkpixbuf2 +USE_GNOME= cairo gconf2 gdkpixbuf2 gtk20 gtk30 -USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender \ - xcb xt +USE_XORG= x11 xcb xcb xcomposite xcursor xdamage xext xfixes xi xrender \ + xt USE_GITHUB= yes GH_ACCOUNT= cliqz-oss GH_PROJECT= browser-f USE_LDCONFIG= yes bash_OLD_CMD= "/bin/bash" bash_CMD= ${LOCALBASE}/bin/bash 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= 20190802181254 +CLIQZ_LAST_BUILD_ID= 20190816174655 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 CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop -MAKE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} -MAKE_ENV+= LLVM_OBJDUMP=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin/llvm-objdump -MAKE_ENV+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} -MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} -MAKE_ENV+= MOZBUILD_STATE_PATH=${WRKDIR} +MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \ + CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} \ + LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ + LLVM_OBJDUMP=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin/llvm-objdump \ + MOZBUILD_STATE_PATH=${WRKDIR} post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC} ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/https-everywhere@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/gdprtool@cliqz.com.xpi \ ${WRKSRC}/obj/dist/bin/browser/features .include post-patch: @${CP} ${MOZ_DESKTOP} ${CLIQZ_DESKTOP} @${REINPLACE_CMD} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \ -e 's/@MOZ_APP_NAME@/${PORTNAME}/g' \ -e '/Icon=${PORTNAME}/ s/${PORTNAME}/${CLIQZ_ICON}/' \ -e '/StartupWMClass/d' \ ${CLIQZ_DESKTOP} .if ${ARCH} == "i386" # This prevents linker exhausting memory in i386 builds @${ECHO_CMD} 'export LDFLAGS="-Wl,--no-keep-memory -Wl,--as-needed"' >> \ ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig .endif do-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} (cd ${WRKSRC}/obj/dist/${PORTNAME} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME} post-install: ${RLN} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps @${CP} ${CLIQZ_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON} .include Index: head/www/cliqz/distinfo =================================================================== --- head/www/cliqz/distinfo (revision 510067) +++ head/www/cliqz/distinfo (revision 510068) @@ -1,11 +1,11 @@ -TIMESTAMP = 1565224721 -SHA256 (adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65 -SIZE (adult-domains.bin) = 528392 -SHA256 (cliqz@cliqz.com.xpi) = 833455156987be6100e444df4cb12aa0f8a1a4df45b82198bed8f50958045a1c -SIZE (cliqz@cliqz.com.xpi) = 7795084 -SHA256 (https-everywhere@cliqz.com.xpi) = 92d43d3c7313bd890cb8ded3229aa1814ca3ebaec1b74bb317154a823b35355b -SIZE (https-everywhere@cliqz.com.xpi) = 1765469 -SHA256 (gdprtool@cliqz.com.xpi) = 1b07623b967694ca0bf45a2f88c52317f90bda1436633800cf4d02b3de54fb76 -SIZE (gdprtool@cliqz.com.xpi) = 222806 -SHA256 (cliqz-oss-browser-f-1.28.1_GH0.tar.gz) = 4d6d0dbf87d30e760b66e6e891ab80ff5e9863168ce9641cebfe4b114fe38e10 -SIZE (cliqz-oss-browser-f-1.28.1_GH0.tar.gz) = 496805470 +TIMESTAMP = 1566401840 +SHA256 (cliqz/adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65 +SIZE (cliqz/adult-domains.bin) = 528392 +SHA256 (cliqz/cliqz@cliqz.com.xpi) = 833455156987be6100e444df4cb12aa0f8a1a4df45b82198bed8f50958045a1c +SIZE (cliqz/cliqz@cliqz.com.xpi) = 7795084 +SHA256 (cliqz/gdprtool@cliqz.com.xpi) = 1b07623b967694ca0bf45a2f88c52317f90bda1436633800cf4d02b3de54fb76 +SIZE (cliqz/gdprtool@cliqz.com.xpi) = 222806 +SHA256 (cliqz/https-everywhere@cliqz.com.xpi) = 92d43d3c7313bd890cb8ded3229aa1814ca3ebaec1b74bb317154a823b35355b +SIZE (cliqz/https-everywhere@cliqz.com.xpi) = 1765469 +SHA256 (cliqz/cliqz-oss-browser-f-1.28.2_GH0.tar.gz) = eb22c3c06530a78012e300cd0be28d03e386270477fee29087941ec19d093982 +SIZE (cliqz/cliqz-oss-browser-f-1.28.2_GH0.tar.gz) = 496816279 Index: head/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h =================================================================== --- head/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h (nonexistent) +++ head/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h (revision 510068) @@ -0,0 +1,16 @@ +Firefox pulls in if_var.h which causes "class thread" conflicts with +"struct thread" in sys/lock.h. + +https://lists.freebsd.org/pipermail/svn-src-all/2019-August/184844.html + +--- mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h.orig 2019-08-23 20:05:51 UTC ++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h +@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O + #include + #ifndef LINUX + #include +-#if !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) + #include + #endif + #include Property changes on: head/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property