From 3f1915711db5e32dd082295bb1a3e4eb36969d34 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 20 Sep 2019 19:58:36 +0000 Subject: Switch default devel/llvm* to 90 PR: 239682 Reviewed by: tobik Differential Revision: https://reviews.freebsd.org/D21172 --- Mk/bsd.default-versions.mk | 4 ++-- Mk/bsd.gecko.mk | 3 +++ comms/gnuradio/Makefile | 2 +- databases/postgresql11-server/Makefile | 2 +- databases/postgresql12-server/Makefile | 2 +- devel/android-tools-simpleperf/Makefile | 2 +- devel/ccls/Makefile | 1 + devel/clazy/Makefile | 2 +- devel/cloudabi-toolchain/Makefile | 2 +- devel/cquery/Makefile | 2 +- devel/dmlc-core/Makefile | 6 ++++++ devel/ikos/Makefile | 1 + devel/ispc/Makefile | 6 ++++++ devel/kdevelop/Makefile | 1 + devel/libclc/Makefile | 1 + devel/oclgrind/Makefile | 6 ++++++ devel/pijul/Makefile | 2 +- devel/py-llvmcpy/Makefile | 1 + devel/qt5-qdoc/Makefile | 2 +- devel/qtcreator/Makefile | 4 ++++ devel/rust-bindgen/Makefile | 2 +- devel/shiboken2/Makefile | 1 + editors/jucipp/Makefile | 1 + graphics/mesa-dri/Makefile | 2 +- graphics/pcl-pointclouds/Makefile | 2 +- graphics/qgis-ltr/Makefile | 1 + lang/beignet/Makefile | 2 +- lang/clover/Makefile | 5 +++++ lang/rubinius/Makefile | 2 +- mail/thunderbird/Makefile | 2 +- math/casadi/Makefile | 2 +- misc/veles/Makefile | 2 +- net/aluminum/Makefile | 2 +- net/waypipe/Makefile | 1 + science/agrum/Makefile | 1 + science/erkale/Makefile | 1 + security/afl++/Makefile | 1 + security/afl/Makefile | 4 ++++ security/klee/Makefile | 6 ++++++ textproc/castxml/Makefile | 2 +- textproc/sonic/Makefile | 2 +- www/cliqz/Makefile | 1 + www/firefox-esr/Makefile | 2 +- www/firefox/Makefile | 1 + 44 files changed, 77 insertions(+), 23 deletions(-) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 788781177635..99188578b750 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -57,10 +57,10 @@ JULIA_DEFAULT?= 1.0 LAZARUS_DEFAULT?= 2.0.4 # Possible values: c6, c7 LINUX_DEFAULT?= c7 -# Possible values: 60, 70, 80, -devel (to be used when non-base compiler is required) +# Possible values: 60, 70, 80, 90, -devel (to be used when non-base compiler is required) # Please give notice to the Graphics Team (x11@FreeBSD.org) in advance before # bumping the LLVM version. -LLVM_DEFAULT?= 80 +LLVM_DEFAULT?= 90 # Possible values: 5.1, 5.2, 5.3 LUA_DEFAULT?= 5.2 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 10.3m, 5.5p, 5.6p, 5.7p, 5.6w diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 0e25b0a497ca..7a1417a10f38 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -90,6 +90,9 @@ MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}" # Require newer Clang than what's in base system unless user opted out . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 && ${ARCH} == i386 +LLVM_DEFAULT= 80 +.endif BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 1922f9dcd02b..1fad5149bb8a 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -2,7 +2,7 @@ PORTNAME= gnuradio PORTVERSION= 3.8.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms astro hamradio MASTER_SITES= http://gnuradio.org/releases/gnuradio/ diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile index af5383f62e48..5edf408cfd9a 100644 --- a/databases/postgresql11-server/Makefile +++ b/databases/postgresql11-server/Makefile @@ -4,7 +4,7 @@ DISTVERSION?= 11.5 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 0 +PORTREVISION?= 1 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile index 471df7b644a2..a51329da8e63 100644 --- a/databases/postgresql12-server/Makefile +++ b/databases/postgresql12-server/Makefile @@ -5,7 +5,7 @@ PORTNAME?= postgresql DISTVERSION?= 12beta4 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} diff --git a/devel/android-tools-simpleperf/Makefile b/devel/android-tools-simpleperf/Makefile index 23f41680cb3b..950f72486e7f 100644 --- a/devel/android-tools-simpleperf/Makefile +++ b/devel/android-tools-simpleperf/Makefile @@ -3,7 +3,7 @@ PORTNAME= android-tools-simpleperf DISTVERSIONPREFIX= android- DISTVERSION= 7.1.2_r17 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org diff --git a/devel/ccls/Makefile b/devel/ccls/Makefile index 3a650df10a62..e7ded3c014db 100644 --- a/devel/ccls/Makefile +++ b/devel/ccls/Makefile @@ -2,6 +2,7 @@ PORTNAME= ccls DISTVERSION= 0.20190823.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= LOCAL/tobik diff --git a/devel/clazy/Makefile b/devel/clazy/Makefile index 4539a0985525..6f494469e1a7 100644 --- a/devel/clazy/Makefile +++ b/devel/clazy/Makefile @@ -2,7 +2,7 @@ PORTNAME= clazy DISTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/src/ diff --git a/devel/cloudabi-toolchain/Makefile b/devel/cloudabi-toolchain/Makefile index f72b57513c9d..73ef6930b9a8 100644 --- a/devel/cloudabi-toolchain/Makefile +++ b/devel/cloudabi-toolchain/Makefile @@ -3,7 +3,7 @@ PORTNAME= cloudabi-toolchain PORTVERSION= 1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= # None DISTFILES= # None diff --git a/devel/cquery/Makefile b/devel/cquery/Makefile index cfd277c700f6..4f122e46c53c 100644 --- a/devel/cquery/Makefile +++ b/devel/cquery/Makefile @@ -3,7 +3,7 @@ PORTNAME= cquery PORTVERSION= 20180718 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= henry.hu.sh@gmail.com diff --git a/devel/dmlc-core/Makefile b/devel/dmlc-core/Makefile index bd5e02e0b540..87f38cc5c04c 100644 --- a/devel/dmlc-core/Makefile +++ b/devel/dmlc-core/Makefile @@ -25,4 +25,10 @@ CPP= clang-cpp${LLVM_DEFAULT} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} +.include + +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.endif + .include diff --git a/devel/ikos/Makefile b/devel/ikos/Makefile index a921f578d359..d5f682ed1121 100644 --- a/devel/ikos/Makefile +++ b/devel/ikos/Makefile @@ -3,6 +3,7 @@ PORTNAME= ikos DISTVERSIONPREFIX= v DISTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/ispc/Makefile b/devel/ispc/Makefile index 0eced20458ab..be3cfd47d202 100644 --- a/devel/ispc/Makefile +++ b/devel/ispc/Makefile @@ -41,4 +41,10 @@ run-examples: ./${e} .endfor +.include + +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.endif + .include diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 92fd518e4b21..d38b712783cb 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -2,6 +2,7 @@ PORTNAME= kdevelop DISTVERSION= 5.4.2 +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= KDE/stable/kdevelop/${DISTVERSION}/src DIST_SUBDIR= KDE/kdevelop diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile index 9844918130a9..9e2535ec3257 100644 --- a/devel/libclc/Makefile +++ b/devel/libclc/Makefile @@ -3,6 +3,7 @@ PORTNAME= libclc DISTVERSION= 0.4.0.20190527 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org diff --git a/devel/oclgrind/Makefile b/devel/oclgrind/Makefile index 8025a8c163a1..aca6e262cfb5 100644 --- a/devel/oclgrind/Makefile +++ b/devel/oclgrind/Makefile @@ -31,4 +31,10 @@ CPP= clang-cpp${LLVM_DEFAULT} CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm +.include + +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.endif + .include diff --git a/devel/pijul/Makefile b/devel/pijul/Makefile index 19602d73c2db..e7d6a68b6920 100644 --- a/devel/pijul/Makefile +++ b/devel/pijul/Makefile @@ -3,7 +3,7 @@ PORTNAME= pijul PORTVERSION= 0.12.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= https://pijul.org/releases/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/devel/py-llvmcpy/Makefile b/devel/py-llvmcpy/Makefile index 418f7254048b..0526a50f3584 100644 --- a/devel/py-llvmcpy/Makefile +++ b/devel/py-llvmcpy/Makefile @@ -3,6 +3,7 @@ PORTNAME= llvmcpy DISTVERSIONPREFIX= v DISTVERSION= 0.1.4 +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index eea703359093..c4e6df909c62 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -2,7 +2,7 @@ PORTNAME= qdoc DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel textproc PKGNAMEPREFIX= qt5- diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index d2a8a52b0b73..9b8e2db28b76 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -85,6 +85,10 @@ SHEBANG_FILES= tests/system/tools/objectsToTable.py \ .include +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.endif + .if ${CHOSEN_COMPILER_TYPE} == gcc PLIST_SUB+= GCC="" .else diff --git a/devel/rust-bindgen/Makefile b/devel/rust-bindgen/Makefile index cc65f7ed3ae6..b1e49658ded8 100644 --- a/devel/rust-bindgen/Makefile +++ b/devel/rust-bindgen/Makefile @@ -2,7 +2,7 @@ PORTNAME= bindgen DISTVERSION= 0.51.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- diff --git a/devel/shiboken2/Makefile b/devel/shiboken2/Makefile index 52f336e95f17..780cad1f90aa 100644 --- a/devel/shiboken2/Makefile +++ b/devel/shiboken2/Makefile @@ -2,6 +2,7 @@ PORTNAME= shiboken2 DISTVERSION= 5.12.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src DISTNAME= pyside-setup-everywhere-src-${DISTVERSION} diff --git a/editors/jucipp/Makefile b/editors/jucipp/Makefile index 62282dcca2d0..67ab8f35dbce 100644 --- a/editors/jucipp/Makefile +++ b/editors/jucipp/Makefile @@ -4,6 +4,7 @@ PORTNAME= jucipp DISTVERSIONPREFIX= v DISTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= info@babaei.net diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index d89fc4ee1d6d..7e3a4796157b 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -3,7 +3,7 @@ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile index e79a6d126d14..51441481e604 100644 --- a/graphics/pcl-pointclouds/Makefile +++ b/graphics/pcl-pointclouds/Makefile @@ -3,7 +3,7 @@ PORTNAME= pcl DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.9.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics math PKGNAMESUFFIX= -pointclouds diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index 9d2b0b566cb1..f160c554c4dd 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -4,6 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_4_11 +PORTREVISION= 1 CATEGORIES= graphics geography PKGNAMESUFFIX= -ltr diff --git a/lang/beignet/Makefile b/lang/beignet/Makefile index 4598f701670e..ca8e8a99aba2 100644 --- a/lang/beignet/Makefile +++ b/lang/beignet/Makefile @@ -4,7 +4,7 @@ PORTNAME= beignet DISTVERSION= 1.3.2 DISTVERSIONSUFFIX= -source -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang MASTER_SITES= https://01.org/sites/default/files/ diff --git a/lang/clover/Makefile b/lang/clover/Makefile index 744e6f2916b4..c9b9e41c9c22 100644 --- a/lang/clover/Makefile +++ b/lang/clover/Makefile @@ -17,6 +17,11 @@ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= Clover needs a GPU supported by the Radeon KMS driver .include + +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.endif + .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" CONFIGURE_ARGS+= --enable-opencl --enable-opencl-icd --disable-dri \ diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile index 59ed078c786e..ef9c66310eff 100644 --- a/lang/rubinius/Makefile +++ b/lang/rubinius/Makefile @@ -3,7 +3,7 @@ PORTNAME= rubinius PORTVERSION= 3.86 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://releases.rubini.us/:source DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 01ed1701cde5..60516207305e 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 68.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source diff --git a/math/casadi/Makefile b/math/casadi/Makefile index 29edfaed07be..24bebf0c7a35 100644 --- a/math/casadi/Makefile +++ b/math/casadi/Makefile @@ -3,7 +3,7 @@ PORTNAME= casadi DISTVERSION= 3.4.5-49 DISTVERSIONSUFFIX= -g6b0de13ac -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/misc/veles/Makefile b/misc/veles/Makefile index 5aebca9b2b06..0a7e5a8b9262 100644 --- a/misc/veles/Makefile +++ b/misc/veles/Makefile @@ -2,7 +2,7 @@ PORTNAME= veles DISTVERSION= 2018.05.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ diff --git a/net/aluminum/Makefile b/net/aluminum/Makefile index f8ae2ac9eeb1..090f60ae0398 100644 --- a/net/aluminum/Makefile +++ b/net/aluminum/Makefile @@ -4,7 +4,7 @@ PORTNAME= Aluminum DISTVERSIONPREFIX= v DISTVERSION= 0.2.1-6 DISTVERSIONSUFFIX= -g78fa7ea -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org diff --git a/net/waypipe/Makefile b/net/waypipe/Makefile index 0ced48e6bd2d..e682fdc4d321 100644 --- a/net/waypipe/Makefile +++ b/net/waypipe/Makefile @@ -3,6 +3,7 @@ PORTNAME= waypipe DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 +PORTREVISION= 0 CATEGORIES= net MAINTAINER= jbeich@FreeBSD.org diff --git a/science/agrum/Makefile b/science/agrum/Makefile index d34b27a2cea1..9c5afa20659f 100644 --- a/science/agrum/Makefile +++ b/science/agrum/Makefile @@ -2,6 +2,7 @@ PORTNAME= agrum DISTVERSION= 0.15.2 +PORTREVISION= 1 CATEGORIES= science math MAINTAINER= yuri@FreeBSD.org diff --git a/science/erkale/Makefile b/science/erkale/Makefile index 7beda08aaf4c..2986614daf98 100644 --- a/science/erkale/Makefile +++ b/science/erkale/Makefile @@ -2,6 +2,7 @@ PORTNAME= erkale DISTVERSION= g20190812 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/security/afl++/Makefile b/security/afl++/Makefile index e4525961c168..b4190fb8d136 100644 --- a/security/afl++/Makefile +++ b/security/afl++/Makefile @@ -3,6 +3,7 @@ PORTNAME= afl PORTVERSION= 2.54c +PORTREVISION= 1 CATEGORIES= security PKGNAMESUFFIX= ++ diff --git a/security/afl/Makefile b/security/afl/Makefile index ad09ae901509..73280ebb604a 100644 --- a/security/afl/Makefile +++ b/security/afl/Makefile @@ -42,6 +42,10 @@ LLVM_VARS= CC=clang${LLVM_DEFAULT} \ .include +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.endif + .if ${ARCH} == "i386" # Clang i386 emits .cfi_sections which base as(1) doesn't understand BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils diff --git a/security/klee/Makefile b/security/klee/Makefile index 7d5bceb6dc42..cdd4ffb9629e 100644 --- a/security/klee/Makefile +++ b/security/klee/Makefile @@ -48,4 +48,10 @@ STP_CMAKE_BOOL= ENABLE_SOLVER_STP STP_CMAKE_ON= -DFREEBSD_STP_STATIC_LIBRARY:STRING=${LOCALBASE}/lib/libstp.a STP_BUILD_DEPENDS= stp>0:math/stp +.include + +.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.endif + .include diff --git a/textproc/castxml/Makefile b/textproc/castxml/Makefile index a8f12ed81c5c..a3e7d00da418 100644 --- a/textproc/castxml/Makefile +++ b/textproc/castxml/Makefile @@ -2,7 +2,7 @@ PORTNAME= castxml PORTVERSION= g20181115 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc devel MAINTAINER= yuri@FreeBSD.org diff --git a/textproc/sonic/Makefile b/textproc/sonic/Makefile index fe3614287d05..796765fb6e64 100644 --- a/textproc/sonic/Makefile +++ b/textproc/sonic/Makefile @@ -3,7 +3,7 @@ PORTNAME= sonic DISTVERSIONPREFIX= v DISTVERSION= 1.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MAINTAINER= tobik@FreeBSD.org diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile index 1eb60abf5539..a28f9574e8b1 100644 --- a/www/cliqz/Makefile +++ b/www/cliqz/Makefile @@ -2,6 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.28.2 +PORTREVISION= 1 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 diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index f5d6da8cc5da..ceeb5dc5e08d 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 68.1.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index a1aef9436612..abf6cb894bf7 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 69.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ -- cgit v1.2.3