Wed Mar 18 01:27:14 2020 UTC ()
firefox: remove stale and now redundant override


(gutteridge)
diff -r1.156 -r1.157 pkgsrc/www/firefox/mozilla-common.mk
cvs diff -r1.156 -r1.157 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2020/03/15 18:50:58 1.156
+++ pkgsrc/www/firefox/mozilla-common.mk 2020/03/18 01:27:14 1.157
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.156 2020/03/15 18:50:58 gutteridge Exp $ 1# $NetBSD: mozilla-common.mk,v 1.157 2020/03/18 01:27:14 gutteridge Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9# Python 2.7 and Python 3.6 or later are required simultaneously. 9# Python 2.7 and Python 3.6 or later are required simultaneously.
10PYTHON_VERSIONS_ACCEPTED= 27 10PYTHON_VERSIONS_ACCEPTED= 27
11PYTHON_FOR_BUILD_ONLY= tool 11PYTHON_FOR_BUILD_ONLY= tool
12.if !empty(PYTHON_VERSION_DEFAULT:M3[6789]) 12.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
13TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT} 13TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
14ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./} 14ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
@@ -214,27 +214,26 @@ BUILDLINK_API_DEPENDS.nspr+= nspr>=4.25 @@ -214,27 +214,26 @@ BUILDLINK_API_DEPENDS.nspr+= nspr>=4.25
214.include "../../textproc/icu/buildlink3.mk" 214.include "../../textproc/icu/buildlink3.mk"
215BUILDLINK_API_DEPENDS.nss+= nss>=3.50 215BUILDLINK_API_DEPENDS.nss+= nss>=3.50
216.include "../../devel/nss/buildlink3.mk" 216.include "../../devel/nss/buildlink3.mk"
217.include "../../devel/zlib/buildlink3.mk" 217.include "../../devel/zlib/buildlink3.mk"
218#.include "../../mk/jpeg.buildlink3.mk" 218#.include "../../mk/jpeg.buildlink3.mk"
219.include "../../graphics/MesaLib/buildlink3.mk" 219.include "../../graphics/MesaLib/buildlink3.mk"
220#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 220#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
221#.include "../../graphics/cairo/buildlink3.mk" 221#.include "../../graphics/cairo/buildlink3.mk"
222BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2 222BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2
223.include "../../graphics/libwebp/buildlink3.mk" 223.include "../../graphics/libwebp/buildlink3.mk"
224PKG_CC= ${PREFIX}/bin/clang 224PKG_CC= ${PREFIX}/bin/clang
225PKG_CXX= ${PREFIX}/bin/clang++ 225PKG_CXX= ${PREFIX}/bin/clang++
226BUILDLINK_DEPMETHOD.clang= build 226BUILDLINK_DEPMETHOD.clang= build
227BUILDLINK_API_DEPENDS.clang+= clang>=6.0.1nb1 
228.include "../../lang/clang/buildlink3.mk" 227.include "../../lang/clang/buildlink3.mk"
229BUILDLINK_DEPMETHOD.rust= build 228BUILDLINK_DEPMETHOD.rust= build
230BUILDLINK_API_DEPENDS.rust+= rust>=1.39.0 229BUILDLINK_API_DEPENDS.rust+= rust>=1.39.0
231.include "../../lang/rust/buildlink3.mk" 230.include "../../lang/rust/buildlink3.mk"
232# webrtc option requires internal libvpx 231# webrtc option requires internal libvpx
233#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 232#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
234#.include "../../multimedia/libvpx/buildlink3.mk" 233#.include "../../multimedia/libvpx/buildlink3.mk"
235.include "../../net/libIDL/buildlink3.mk" 234.include "../../net/libIDL/buildlink3.mk"
236# textproc/hunspell 1.3 is too old 235# textproc/hunspell 1.3 is too old
237#.include "../../textproc/hunspell/buildlink3.mk" 236#.include "../../textproc/hunspell/buildlink3.mk"
238.include "../../multimedia/ffmpeg4/buildlink3.mk" 237.include "../../multimedia/ffmpeg4/buildlink3.mk"
239.include "../../x11/libXt/buildlink3.mk" 238.include "../../x11/libXt/buildlink3.mk"
240BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 239BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2