Sun Jan 5 17:55:22 2020 UTC ()
*: Enable Wayland where supported in GTK and Firefox.

Bump PKGREVISIONs


(nia)
diff -r1.403 -r1.404 pkgsrc/www/firefox/Makefile
diff -r1.149 -r1.150 pkgsrc/www/firefox/PLIST
diff -r1.51 -r1.52 pkgsrc/www/firefox/options.mk
diff -r1.5 -r1.6 pkgsrc/www/firefox68/Makefile
diff -r1.4 -r1.5 pkgsrc/www/firefox68/options.mk
diff -r1.176 -r1.177 pkgsrc/www/webkit-gtk/Makefile
diff -r1.19 -r1.20 pkgsrc/www/webkit-gtk/options.mk
diff -r1.138 -r1.139 pkgsrc/x11/gtk3/Makefile
diff -r1.15 -r1.16 pkgsrc/x11/gtk3/options.mk
cvs diff -r1.403 -r1.404 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2019/12/03 14:21:20 1.403
+++ pkgsrc/www/firefox/Makefile 2020/01/05 17:55:22 1.404
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.403 2019/12/03 14:21:20 ryoon Exp $ 1# $NetBSD: Makefile,v 1.404 2020/01/05 17:55:22 nia Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 71.0 4MOZ_BRANCH= 71.0
5MOZ_BRANCH_MINOR=  5MOZ_BRANCH_MINOR=
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
 9PKGREVISION= 1
9CATEGORIES= www 10CATEGORIES= www
10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
12 13
13MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
14HOMEPAGE= https://www.mozilla.com/en-US/firefox/ 15HOMEPAGE= https://www.mozilla.com/en-US/firefox/
15COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//}) 16COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//})
16LICENSE= mpl-1.1 17LICENSE= mpl-1.1
17 18
18WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:C/b.*//} 19WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:C/b.*//}
19 20
20MOZILLA_DIR= # empty 21MOZILLA_DIR= # empty
21 22
cvs diff -r1.149 -r1.150 pkgsrc/www/firefox/PLIST (expand / switch to unified diff)

--- pkgsrc/www/firefox/PLIST 2019/12/03 14:21:20 1.149
+++ pkgsrc/www/firefox/PLIST 2020/01/05 17:55:22 1.150
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.149 2019/12/03 14:21:20 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.150 2020/01/05 17:55:22 nia Exp $
2bin/firefox 2bin/firefox
3lib/firefox/actors/AudioPlaybackChild.jsm 3lib/firefox/actors/AudioPlaybackChild.jsm
4lib/firefox/actors/AudioPlaybackParent.jsm 4lib/firefox/actors/AudioPlaybackParent.jsm
5lib/firefox/actors/AutoCompleteChild.jsm 5lib/firefox/actors/AutoCompleteChild.jsm
6lib/firefox/actors/AutoCompleteParent.jsm 6lib/firefox/actors/AutoCompleteParent.jsm
7lib/firefox/actors/AutoplayChild.jsm 7lib/firefox/actors/AutoplayChild.jsm
8lib/firefox/actors/AutoplayParent.jsm 8lib/firefox/actors/AutoplayParent.jsm
9lib/firefox/actors/BrowserElementChild.jsm 9lib/firefox/actors/BrowserElementChild.jsm
10lib/firefox/actors/BrowserElementParent.jsm 10lib/firefox/actors/BrowserElementParent.jsm
11lib/firefox/actors/ControllersChild.jsm 11lib/firefox/actors/ControllersChild.jsm
12lib/firefox/actors/DateTimePickerChild.jsm 12lib/firefox/actors/DateTimePickerChild.jsm
13lib/firefox/actors/DateTimePickerParent.jsm 13lib/firefox/actors/DateTimePickerParent.jsm
14lib/firefox/actors/ExtFindChild.jsm 14lib/firefox/actors/ExtFindChild.jsm
@@ -5096,26 +5096,27 @@ lib/firefox/hyphenation/hyph_nn.dic @@ -5096,26 +5096,27 @@ lib/firefox/hyphenation/hyph_nn.dic
5096lib/firefox/hyphenation/hyph_pl.dic 5096lib/firefox/hyphenation/hyph_pl.dic
5097lib/firefox/hyphenation/hyph_pt.dic 5097lib/firefox/hyphenation/hyph_pt.dic
5098lib/firefox/hyphenation/hyph_ru.dic 5098lib/firefox/hyphenation/hyph_ru.dic
5099lib/firefox/hyphenation/hyph_sh.dic 5099lib/firefox/hyphenation/hyph_sh.dic
5100lib/firefox/hyphenation/hyph_sl.dic 5100lib/firefox/hyphenation/hyph_sl.dic
5101lib/firefox/hyphenation/hyph_sv.dic 5101lib/firefox/hyphenation/hyph_sv.dic
5102lib/firefox/hyphenation/hyph_tr.dic 5102lib/firefox/hyphenation/hyph_tr.dic
5103lib/firefox/hyphenation/hyph_uk.dic 5103lib/firefox/hyphenation/hyph_uk.dic
5104lib/firefox/liblgpllibs.so 5104lib/firefox/liblgpllibs.so
5105${PLIST.ffvpx}lib/firefox/libmozavcodec.so 5105${PLIST.ffvpx}lib/firefox/libmozavcodec.so
5106${PLIST.ffvpx}lib/firefox/libmozavutil.so 5106${PLIST.ffvpx}lib/firefox/libmozavutil.so
5107lib/firefox/libmozgtk.so 5107lib/firefox/libmozgtk.so
5108lib/firefox/libmozsqlite3.so 5108lib/firefox/libmozsqlite3.so
 5109${PLIST.wayland}lib/firefox68/libmozwayland.so
5109lib/firefox/libxul.so 5110lib/firefox/libxul.so
5110lib/firefox/localization/en-US/crashreporter/aboutcrashes.ftl 5111lib/firefox/localization/en-US/crashreporter/aboutcrashes.ftl
5111lib/firefox/localization/en-US/security/certificates/certManager.ftl 5112lib/firefox/localization/en-US/security/certificates/certManager.ftl
5112lib/firefox/localization/en-US/security/certificates/deviceManager.ftl 5113lib/firefox/localization/en-US/security/certificates/deviceManager.ftl
5113lib/firefox/localization/en-US/toolkit/about/aboutAbout.ftl 5114lib/firefox/localization/en-US/toolkit/about/aboutAbout.ftl
5114lib/firefox/localization/en-US/toolkit/about/aboutAddons.ftl 5115lib/firefox/localization/en-US/toolkit/about/aboutAddons.ftl
5115lib/firefox/localization/en-US/toolkit/about/aboutCompat.ftl 5116lib/firefox/localization/en-US/toolkit/about/aboutCompat.ftl
5116lib/firefox/localization/en-US/toolkit/about/aboutConfig.ftl 5117lib/firefox/localization/en-US/toolkit/about/aboutConfig.ftl
5117lib/firefox/localization/en-US/toolkit/about/aboutNetworking.ftl 5118lib/firefox/localization/en-US/toolkit/about/aboutNetworking.ftl
5118lib/firefox/localization/en-US/toolkit/about/aboutPerformance.ftl 5119lib/firefox/localization/en-US/toolkit/about/aboutPerformance.ftl
5119lib/firefox/localization/en-US/toolkit/about/aboutPlugins.ftl 5120lib/firefox/localization/en-US/toolkit/about/aboutPlugins.ftl
5120lib/firefox/localization/en-US/toolkit/about/aboutProfiles.ftl 5121lib/firefox/localization/en-US/toolkit/about/aboutProfiles.ftl
5121lib/firefox/localization/en-US/toolkit/about/aboutRights.ftl 5122lib/firefox/localization/en-US/toolkit/about/aboutRights.ftl
cvs diff -r1.51 -r1.52 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2019/12/03 14:21:20 1.51
+++ pkgsrc/www/firefox/options.mk 2020/01/05 17:55:22 1.52
@@ -1,22 +1,27 @@ @@ -1,22 +1,27 @@
1# $NetBSD: options.mk,v 1.51 2019/12/03 14:21:20 ryoon Exp $ 1# $NetBSD: options.mk,v 1.52 2020/01/05 17:55:22 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_SUPPORTED_OPTIONS= official-mozilla-branding 5PKG_SUPPORTED_OPTIONS= official-mozilla-branding
6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus 7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus wayland
8PLIST_VARS+= gnome jemalloc debug 8PLIST_VARS+= gnome jemalloc debug
9 9
 10.include "../../devel/wayland/platform.mk"
 11.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 12PKG_SUGGESTED_OPTIONS+= wayland
 13.endif
 14
10.if ${OPSYS} == "Linux" 15.if ${OPSYS} == "Linux"
11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus 16PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus
12.else 17.else
13PKG_SUGGESTED_OPTIONS+= dbus 18PKG_SUGGESTED_OPTIONS+= dbus
14.endif 19.endif
15 20
16PKG_SUGGESTED_OPTIONS.Linux+= webrtc 21PKG_SUGGESTED_OPTIONS.Linux+= webrtc
17 22
18.include "../../mk/bsd.options.mk" 23.include "../../mk/bsd.options.mk"
19 24
20.if !empty(PKG_OPTIONS:Malsa) 25.if !empty(PKG_OPTIONS:Malsa)
21CONFIGURE_ARGS+= --enable-alsa 26CONFIGURE_ARGS+= --enable-alsa
22.include "../../audio/alsa-lib/buildlink3.mk" 27.include "../../audio/alsa-lib/buildlink3.mk"
@@ -75,13 +80,19 @@ NO_BIN_ON_FTP= ${RESTRICTED} @@ -75,13 +80,19 @@ NO_BIN_ON_FTP= ${RESTRICTED}
75#PLIST.branding= yes 80#PLIST.branding= yes
76.else 81.else
77#PLIST.nobranding= yes 82#PLIST.nobranding= yes
78.endif 83.endif
79 84
80PLIST_VARS+= webrtc 85PLIST_VARS+= webrtc
81.if !empty(PKG_OPTIONS:Mwebrtc) 86.if !empty(PKG_OPTIONS:Mwebrtc)
82.include "../../graphics/libv4l/buildlink3.mk" 87.include "../../graphics/libv4l/buildlink3.mk"
83CONFIGURE_ARGS+= --enable-webrtc 88CONFIGURE_ARGS+= --enable-webrtc
84PLIST.webrtc= yes 89PLIST.webrtc= yes
85.else 90.else
86CONFIGURE_ARGS+= --disable-webrtc 91CONFIGURE_ARGS+= --disable-webrtc
87.endif 92.endif
 93
 94PLIST_VARS+= wayland
 95.if !empty(PKG_OPTIONS:Mwayland)
 96# \todo Instead of using an option, determine if gtk3 was built with wayland.
 97PLIST.wayland= yes
 98.endif
cvs diff -r1.5 -r1.6 pkgsrc/www/firefox68/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/Makefile 2019/12/08 20:09:41 1.5
+++ pkgsrc/www/firefox68/Attic/Makefile 2020/01/05 17:55:22 1.6
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.5 2019/12/08 20:09:41 nia Exp $ 1# $NetBSD: Makefile,v 1.6 2020/01/05 17:55:22 nia Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 68.3 4MOZ_BRANCH= 68.3
5MOZ_BRANCH_MINOR= .0esr 5MOZ_BRANCH_MINOR= .0esr
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/}
 9PKGREVISION= 1
9CATEGORIES= www 10CATEGORIES= www
10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
12 13
13MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
14HOMEPAGE= https://www.mozilla.com/en-US/firefox/ 15HOMEPAGE= https://www.mozilla.com/en-US/firefox/
15COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//}) 16COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//})
16LICENSE= mpl-1.1 17LICENSE= mpl-1.1
17 18
18WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:S/esr//} 19WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:S/esr//}
19 20
20MOZILLA_DIR= # empty 21MOZILLA_DIR= # empty
21 22
cvs diff -r1.4 -r1.5 pkgsrc/www/firefox68/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/options.mk 2019/12/22 16:07:48 1.4
+++ pkgsrc/www/firefox68/Attic/options.mk 2020/01/05 17:55:22 1.5
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1# $NetBSD: options.mk,v 1.4 2019/12/22 16:07:48 nia Exp $ 1# $NetBSD: options.mk,v 1.5 2020/01/05 17:55:22 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_SUPPORTED_OPTIONS= official-mozilla-branding 5PKG_SUPPORTED_OPTIONS= official-mozilla-branding
6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
7PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus 7PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus wayland
8PKG_SUPPORTED_OPTIONS+= wayland 
9PLIST_VARS+= gnome jemalloc debug 8PLIST_VARS+= gnome jemalloc debug
10 9
 10.include "../../devel/wayland/platform.mk"
 11.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 12PKG_SUGGESTED_OPTIONS+= wayland
 13.endif
 14
11.if ${OPSYS} == "Linux" 15.if ${OPSYS} == "Linux"
12PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus 16PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus
13.else 17.else
14PKG_SUGGESTED_OPTIONS+= oss dbus 18PKG_SUGGESTED_OPTIONS+= oss dbus
15.endif 19.endif
16 20
17PKG_SUGGESTED_OPTIONS.Linux+= webrtc 21PKG_SUGGESTED_OPTIONS.Linux+= webrtc
18 22
19.include "../../mk/bsd.options.mk" 23.include "../../mk/bsd.options.mk"
20 24
21.if !empty(PKG_OPTIONS:Malsa) 25.if !empty(PKG_OPTIONS:Malsa)
22CONFIGURE_ARGS+= --enable-alsa 26CONFIGURE_ARGS+= --enable-alsa
23.include "../../audio/alsa-lib/buildlink3.mk" 27.include "../../audio/alsa-lib/buildlink3.mk"
cvs diff -r1.176 -r1.177 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2019/12/15 15:38:59 1.176
+++ pkgsrc/www/webkit-gtk/Makefile 2020/01/05 17:55:21 1.177
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.176 2019/12/15 15:38:59 taca Exp $ 1# $NetBSD: Makefile,v 1.177 2020/01/05 17:55:21 nia Exp $
2 2
3DISTNAME= webkitgtk-2.26.2 3DISTNAME= webkitgtk-2.26.2
4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://www.webkitgtk.org/releases/ 7MASTER_SITES= https://www.webkitgtk.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.webkitgtk.org/ 11HOMEPAGE= https://www.webkitgtk.org/
12COMMENT= GTK port of the WebKit browser engine 12COMMENT= GTK port of the WebKit browser engine
13LICENSE= 2-clause-bsd AND gnu-lgpl-v2 13LICENSE= 2-clause-bsd AND gnu-lgpl-v2
14 14
15# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 15# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
16NOT_FOR_PLATFORM= NetBSD-[1-6].*-* 16NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
17 17
18TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools 18TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
cvs diff -r1.19 -r1.20 pkgsrc/www/webkit-gtk/options.mk (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/options.mk 2019/10/05 14:59:47 1.19
+++ pkgsrc/www/webkit-gtk/options.mk 2020/01/05 17:55:21 1.20
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1# $NetBSD: options.mk,v 1.19 2019/10/05 14:59:47 nia Exp $ 1# $NetBSD: options.mk,v 1.20 2020/01/05 17:55:21 nia Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk 4PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
5PKG_SUPPORTED_OPTIONS= debug enchant introspection opengl webkit-jit wayland 5PKG_SUPPORTED_OPTIONS= debug enchant introspection opengl webkit-jit wayland
6PKG_SUGGESTED_OPTIONS= enchant introspection opengl 6PKG_SUGGESTED_OPTIONS= enchant introspection opengl
 7.include "../../devel/wayland/platform.mk"
 8.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 9PKG_SUGGESTED_OPTIONS+= wayland
 10.endif
7 11
8PLIST_VARS= introspection 12PLIST_VARS= introspection
9 13
10.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.fast.prefs.mk"
11 15
12# 16#
13# Platforms that support the webkit-jit option 17# Platforms that support the webkit-jit option
14# 18#
15# Please see: 19# Please see:
16# Source/cmake/WebKitFeatures.cmake 20# Source/cmake/WebKitFeatures.cmake
17# Source/WTF/wtf/Platform.h 21# Source/WTF/wtf/Platform.h
18# 22#
19WEBKIT_JIT_MACHINE_PLATFORMS+= Darwin-*-* 23WEBKIT_JIT_MACHINE_PLATFORMS+= Darwin-*-*
20WEBKIT_JIT_MACHINE_PLATFORMS+= DragonFly-*-* 24WEBKIT_JIT_MACHINE_PLATFORMS+= DragonFly-*-*
21WEBKIT_JIT_MACHINE_PLATFORMS+= FreeBSD-*-x86_64 FreeBSD-*-aarch64 25WEBKIT_JIT_MACHINE_PLATFORMS+= FreeBSD-*-x86_64 FreeBSD-*-aarch64
22WEBKIT_JIT_MACHINE_PLATFORMS+= Linux-*-x86_64 Linux-*-arm* 26WEBKIT_JIT_MACHINE_PLATFORMS+= Linux-*-x86_64 Linux-*-arm*
23WEBKIT_JIT_MACHINE_PLATFORMS+= Linux-*-aarch64 Linux-*-mips* 27WEBKIT_JIT_MACHINE_PLATFORMS+= Linux-*-aarch64 Linux-*-mips*
cvs diff -r1.138 -r1.139 pkgsrc/x11/gtk3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/Makefile 2019/12/31 12:21:00 1.138
+++ pkgsrc/x11/gtk3/Makefile 2020/01/05 17:55:22 1.139
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.138 2019/12/31 12:21:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.139 2020/01/05 17:55:22 nia Exp $
2 2
3DISTNAME= gtk+-3.24.13 3DISTNAME= gtk+-3.24.13
4PKGNAME= ${DISTNAME:S/gtk/gtk3/} 4PKGNAME= ${DISTNAME:S/gtk/gtk3/}
 5PKGREVISION= 1
5CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.gtk.org/ 11HOMEPAGE= https://www.gtk.org/
11COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces 12COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
15USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge 16USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge
16USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
cvs diff -r1.15 -r1.16 pkgsrc/x11/gtk3/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/options.mk 2019/08/20 13:55:05 1.15
+++ pkgsrc/x11/gtk3/options.mk 2020/01/05 17:55:22 1.16
@@ -1,21 +1,25 @@ @@ -1,21 +1,25 @@
1# $NetBSD: options.mk,v 1.15 2019/08/20 13:55:05 wiz Exp $ 1# $NetBSD: options.mk,v 1.16 2020/01/05 17:55:22 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3 3PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3
4PKG_SUPPORTED_OPTIONS+= gtk3-atk-bridge cups debug 4PKG_SUPPORTED_OPTIONS+= gtk3-atk-bridge cups debug
5PKG_SUPPORTED_OPTIONS+= wayland x11 5PKG_SUPPORTED_OPTIONS+= wayland x11
6.if exists(/System/Library/Frameworks/Quartz.framework) 6.if exists(/System/Library/Frameworks/Quartz.framework)
7PKG_SUPPORTED_OPTIONS+= quartz 7PKG_SUPPORTED_OPTIONS+= quartz
8.endif 8.endif
 9.include "../../devel/wayland/platform.mk"
 10.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 11PKG_SUGGESTED_OPTIONS+= wayland
 12.endif
9PKG_SUGGESTED_OPTIONS= gtk3-atk-bridge x11 13PKG_SUGGESTED_OPTIONS= gtk3-atk-bridge x11
10 14
11.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
12 16
13PLIST_VARS+= cups 17PLIST_VARS+= cups
14.if !empty(PKG_OPTIONS:Mcups) 18.if !empty(PKG_OPTIONS:Mcups)
15BUILDLINK_API_DEPENDS.cups-base+= cups-base>=1.7 19BUILDLINK_API_DEPENDS.cups-base+= cups-base>=1.7
16.include "../../print/cups-base/buildlink3.mk" 20.include "../../print/cups-base/buildlink3.mk"
17PLIST.cups= yes 21PLIST.cups= yes
18.else 22.else
19CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=no 23CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=no
20.endif 24.endif
21 25