Mon Jun 29 11:59:42 2020 UTC ()
Correct sense of condition.

please supply one bottle of club mate to nia alarie, london


(nia)
diff -r1.172 -r1.173 pkgsrc/www/firefox/mozilla-common.mk
diff -r1.13 -r1.14 pkgsrc/www/firefox68/mozilla-common.mk
cvs diff -r1.172 -r1.173 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2020/06/29 11:53:09 1.172
+++ pkgsrc/www/firefox/mozilla-common.mk 2020/06/29 11:59:41 1.173
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.172 2020/06/29 11:53:09 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.173 2020/06/29 11:59:41 nia 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./}
@@ -260,17 +260,17 @@ RUST_REQ= 1.41.0 @@ -260,17 +260,17 @@ RUST_REQ= 1.41.0
260# webrtc option requires internal libvpx 260# webrtc option requires internal libvpx
261#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 261#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
262#.include "../../multimedia/libvpx/buildlink3.mk" 262#.include "../../multimedia/libvpx/buildlink3.mk"
263.include "../../net/libIDL/buildlink3.mk" 263.include "../../net/libIDL/buildlink3.mk"
264# textproc/hunspell 1.3 is too old 264# textproc/hunspell 1.3 is too old
265#.include "../../textproc/hunspell/buildlink3.mk" 265#.include "../../textproc/hunspell/buildlink3.mk"
266.include "../../multimedia/ffmpeg4/buildlink3.mk" 266.include "../../multimedia/ffmpeg4/buildlink3.mk"
267.include "../../x11/libXt/buildlink3.mk" 267.include "../../x11/libXt/buildlink3.mk"
268BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 268BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
269.include "../../x11/pixman/buildlink3.mk" 269.include "../../x11/pixman/buildlink3.mk"
270.include "../../x11/gtk2/buildlink3.mk" 270.include "../../x11/gtk2/buildlink3.mk"
271.include "../../x11/gtk3/buildlink3.mk" 271.include "../../x11/gtk3/buildlink3.mk"
272PLIST_VARS+= wayland 272PLIST_VARS+= wayland
273.if ${PKG_BUILD_OPTIONS.gtk3:Mx11} 273.if ${PKG_BUILD_OPTIONS.gtk3:Mwayland}
274PLIST.wayland= yes 274PLIST.wayland= yes
275.endif 275.endif
276.include "../../lang/python/pyversion.mk" 276.include "../../lang/python/pyversion.mk"
cvs diff -r1.13 -r1.14 pkgsrc/www/firefox68/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/mozilla-common.mk 2020/06/29 11:53:09 1.13
+++ pkgsrc/www/firefox68/Attic/mozilla-common.mk 2020/06/29 11:59:42 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.13 2020/06/29 11:53:09 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.14 2020/06/29 11:59:42 nia 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
7GCC_REQD+= 6.1 7GCC_REQD+= 6.1
8 8
9.include "../../mk/bsd.prefs.mk" 9.include "../../mk/bsd.prefs.mk"
10 10
11# Python 2.7 and Python 3.6 or later are required simultaneously. 11# Python 2.7 and Python 3.6 or later are required simultaneously.
12PYTHON_VERSIONS_ACCEPTED= 27 12PYTHON_VERSIONS_ACCEPTED= 27
13PYTHON_FOR_BUILD_ONLY= tool 13PYTHON_FOR_BUILD_ONLY= tool
14.if !empty(PYTHON_VERSION_DEFAULT:M3[6789]) 14.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
@@ -226,17 +226,17 @@ RUST_REQ= 1.34.0 @@ -226,17 +226,17 @@ RUST_REQ= 1.34.0
226# webrtc option requires internal libvpx 226# webrtc option requires internal libvpx
227#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 227#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
228#.include "../../multimedia/libvpx/buildlink3.mk" 228#.include "../../multimedia/libvpx/buildlink3.mk"
229.include "../../net/libIDL/buildlink3.mk" 229.include "../../net/libIDL/buildlink3.mk"
230# textproc/hunspell 1.3 is too old 230# textproc/hunspell 1.3 is too old
231#.include "../../textproc/hunspell/buildlink3.mk" 231#.include "../../textproc/hunspell/buildlink3.mk"
232.include "../../multimedia/ffmpeg4/buildlink3.mk" 232.include "../../multimedia/ffmpeg4/buildlink3.mk"
233.include "../../x11/libXt/buildlink3.mk" 233.include "../../x11/libXt/buildlink3.mk"
234BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 234BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
235.include "../../x11/pixman/buildlink3.mk" 235.include "../../x11/pixman/buildlink3.mk"
236.include "../../x11/gtk2/buildlink3.mk" 236.include "../../x11/gtk2/buildlink3.mk"
237.include "../../x11/gtk3/buildlink3.mk" 237.include "../../x11/gtk3/buildlink3.mk"
238PLIST_VARS+= wayland 238PLIST_VARS+= wayland
239.if ${PKG_BUILD_OPTIONS.gtk3:Mx11} 239.if ${PKG_BUILD_OPTIONS.gtk3:Mwayland}
240PLIST.wayland= yes 240PLIST.wayland= yes
241.endif 241.endif
242.include "../../lang/python/pyversion.mk" 242.include "../../lang/python/pyversion.mk"