Mon Mar 20 10:54:46 2017 UTC ()
reduce gtk2 include, move comment to options.mk


(szptvlfn)
diff -r1.89 -r1.90 pkgsrc/www/firefox/mozilla-common.mk
diff -r1.38 -r1.39 pkgsrc/www/firefox/options.mk
cvs diff -r1.89 -r1.90 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2017/03/07 20:45:43 1.89
+++ pkgsrc/www/firefox/mozilla-common.mk 2017/03/20 10:54:46 1.90
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.89 2017/03/07 20:45:43 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.90 2017/03/20 10:54:46 szptvlfn 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# used by www/seamonkey/Makefile 6# used by www/seamonkey/Makefile
7 7
8.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
9 9
10.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 10.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
11BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm 11BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
12 12
13# Enable Google widevine CDM. This requires external libwidevinecdm.so. 13# Enable Google widevine CDM. This requires external libwidevinecdm.so.
14#CONFIGURE_ARGS+= --enable-eme=widevine 14#CONFIGURE_ARGS+= --enable-eme=widevine
@@ -182,20 +182,17 @@ BUILDLINK_API_DEPENDS.nspr+= nspr>=4.10. @@ -182,20 +182,17 @@ BUILDLINK_API_DEPENDS.nspr+= nspr>=4.10.
182.include "../../devel/nspr/buildlink3.mk" 182.include "../../devel/nspr/buildlink3.mk"
183.include "../../textproc/icu/buildlink3.mk" 183.include "../../textproc/icu/buildlink3.mk"
184BUILDLINK_API_DEPENDS.nss+= nss>=3.28.1 184BUILDLINK_API_DEPENDS.nss+= nss>=3.28.1
185.include "../../devel/nss/buildlink3.mk" 185.include "../../devel/nss/buildlink3.mk"
186.include "../../devel/zlib/buildlink3.mk" 186.include "../../devel/zlib/buildlink3.mk"
187.include "../../mk/jpeg.buildlink3.mk" 187.include "../../mk/jpeg.buildlink3.mk"
188.include "../../graphics/MesaLib/buildlink3.mk" 188.include "../../graphics/MesaLib/buildlink3.mk"
189BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 189BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
190.include "../../graphics/cairo/buildlink3.mk" 190.include "../../graphics/cairo/buildlink3.mk"
191BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 191BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
192.include "../../multimedia/libvpx/buildlink3.mk" 192.include "../../multimedia/libvpx/buildlink3.mk"
193.include "../../net/libIDL/buildlink3.mk" 193.include "../../net/libIDL/buildlink3.mk"
194.include "../../textproc/hunspell/buildlink3.mk" 194.include "../../textproc/hunspell/buildlink3.mk"
195# gtk2 needed even if --enable-default-toolkit=cairo-gtk3 
196BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 
197.include "../../x11/gtk2/buildlink3.mk" 
198.include "../../multimedia/ffmpeg3/buildlink3.mk" 195.include "../../multimedia/ffmpeg3/buildlink3.mk"
199.include "../../x11/libXt/buildlink3.mk" 196.include "../../x11/libXt/buildlink3.mk"
200BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 197BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
201.include "../../x11/pixman/buildlink3.mk" 198.include "../../x11/pixman/buildlink3.mk"
cvs diff -r1.38 -r1.39 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2017/03/07 20:45:43 1.38
+++ pkgsrc/www/firefox/options.mk 2017/03/20 10:54:46 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.38 2017/03/07 20:45:43 ryoon Exp $ 1# $NetBSD: options.mk,v 1.39 2017/03/20 10:54:46 szptvlfn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= gtk 5PKG_OPTIONS_REQUIRED_GROUPS= gtk
6PKG_OPTIONS_GROUP.gtk= gtk2 gtk3 6PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
7PKG_SUGGESTED_OPTIONS= gtk3 7PKG_SUGGESTED_OPTIONS= gtk3
8 8
9PKG_SUPPORTED_OPTIONS= official-mozilla-branding 9PKG_SUPPORTED_OPTIONS= official-mozilla-branding
10PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 10PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
11PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus 11PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus
12PLIST_VARS+= gnome jemalloc debug 12PLIST_VARS+= gnome jemalloc debug
13 13
14.if ${OPSYS} == "Linux" 14.if ${OPSYS} == "Linux"
@@ -21,26 +21,27 @@ PKG_SUGGESTED_OPTIONS+= oss dbus @@ -21,26 +21,27 @@ PKG_SUGGESTED_OPTIONS+= oss dbus
21PKG_SUGGESTED_OPTIONS+= oss dbus 21PKG_SUGGESTED_OPTIONS+= oss dbus
22.else 22.else
23PKG_SUGGESTED_OPTIONS+= dbus pulseaudio 23PKG_SUGGESTED_OPTIONS+= dbus pulseaudio
24.endif 24.endif
25 25
26# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set. 26# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
27PKG_SUGGESTED_OPTIONS.Linux+= webrtc 27PKG_SUGGESTED_OPTIONS.Linux+= webrtc
28 28
29.include "../../mk/bsd.options.mk" 29.include "../../mk/bsd.options.mk"
30 30
31PLIST_VARS+= gtk3 31PLIST_VARS+= gtk3
32.if !empty(PKG_OPTIONS:Mgtk2) 32.if !empty(PKG_OPTIONS:Mgtk2)
33CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 33CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
 34# gtk2 needed even if --enable-default-toolkit=cairo-gtk3
34BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 35BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
35.include "../../x11/gtk2/buildlink3.mk" 36.include "../../x11/gtk2/buildlink3.mk"
36.endif 37.endif
37 38
38# As of firefox-51 gtk2 is still pulled in implicitly 39# As of firefox-51 gtk2 is still pulled in implicitly
39.if !empty(PKG_OPTIONS:Mgtk3) 40.if !empty(PKG_OPTIONS:Mgtk3)
40CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 41CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
41.include "../../x11/gtk3/buildlink3.mk" 42.include "../../x11/gtk3/buildlink3.mk"
42PLIST.gtk3= yes 43PLIST.gtk3= yes
43.endif 44.endif
44 45
45.if !empty(PKG_OPTIONS:Malsa) 46.if !empty(PKG_OPTIONS:Malsa)
46CONFIGURE_ARGS+= --enable-alsa 47CONFIGURE_ARGS+= --enable-alsa