Wed Nov 11 11:11:30 2020 UTC ()
firefox52: clean up some pkglint problems.


(nia)
diff -r1.8 -r1.9 pkgsrc/www/firefox52/mozilla-common.mk
diff -r1.5 -r1.6 pkgsrc/www/firefox52/options.mk
cvs diff -r1.8 -r1.9 pkgsrc/www/firefox52/mozilla-common.mk (switch to unified diff)

--- pkgsrc/www/firefox52/mozilla-common.mk 2020/06/04 13:47:19 1.8
+++ pkgsrc/www/firefox52/mozilla-common.mk 2020/11/11 11:11:30 1.9
@@ -1,196 +1,166 @@ @@ -1,196 +1,166 @@
1# $NetBSD: mozilla-common.mk,v 1.8 2020/06/04 13:47:19 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.9 2020/11/11 11:11:30 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# used by www/seamonkey/Makefile 6# used by www/seamonkey/Makefile
7 7
8# GCC 4.6 is required to support nullptr. 8# GCC 4.6 is required to support nullptr.
9GCC_REQD+= 4.8 9GCC_REQD+= 4.8
10 10
11.include "../../mk/bsd.prefs.mk" 11.include "../../mk/bsd.prefs.mk"
12 12
13.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 13.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
14BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm 14BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
15 15
16# Enable Google widevine CDM. This requires external libwidevinecdm.so. 16# Enable Google widevine CDM. This requires external libwidevinecdm.so.
17#CONFIGURE_ARGS+= --enable-eme=widevine 17#CONFIGURE_ARGS+= --enable-eme=widevine
18.endif 18.endif
19 19
20HAS_CONFIGURE= yes 20HAS_CONFIGURE= yes
21CONFIGURE_ARGS+= --prefix=${PREFIX} 21CONFIGURE_ARGS+= --prefix=${PREFIX}
22USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 22USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
23USE_LANGUAGES+= c99 c++ 23USE_LANGUAGES+= c99 c++
24UNLIMIT_RESOURCES+= datasize 24UNLIMIT_RESOURCES+= datasize
25 25
26test: 26test:
27 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 27 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
28 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey 28 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
29 29
30# tar(1) of OpenBSD 5.5 has no --exclude command line option. 30# tar(1) of OpenBSD 5.5 has no --exclude command line option.
31.if ${OPSYS} == "OpenBSD" 31.if ${OPSYS} == "OpenBSD"
32TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} 32TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
33USE_TOOLS+= bsdtar 33USE_TOOLS+= bsdtar
34.endif 34.endif
35.if ${MACHINE_ARCH} == "i386" 35.if ${MACHINE_ARCH} == "i386"
36# Fix for PR pkg/48152. 36# Fix for PR pkg/48152.
37CXXFLAGS+= -march=i586 37CXXFLAGS+= -march=i586
38# This is required for SSE2 code under i386. 38# This is required for SSE2 code under i386.
39CXXFLAGS+= -mstackrealign 39CXXFLAGS+= -mstackrealign
40.endif 40.endif
41 41
42CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 42CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
43CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 43CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
44CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh 44CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
45CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure 45CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
46CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 46CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
47CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 47CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
48 48
49.if ${OPSYS} != "SunOS" 49.if ${OPSYS} != "SunOS"
50CONFIGURE_ARGS+= --enable-pie 50CONFIGURE_ARGS+= --enable-pie
51.endif 51.endif
52CONFIGURE_ARGS+= --disable-tests 52CONFIGURE_ARGS+= --disable-tests
53CONFIGURE_ARGS+= --with-pthreads 53CONFIGURE_ARGS+= --with-pthreads
54CONFIGURE_ARGS+= --enable-system-cairo 54CONFIGURE_ARGS+= --enable-system-cairo
55CONFIGURE_ARGS+= --enable-system-pixman 55CONFIGURE_ARGS+= --enable-system-pixman
56CONFIGURE_ARGS+= --with-system-libvpx 56CONFIGURE_ARGS+= --with-system-libvpx
57CONFIGURE_ARGS+= --enable-system-hunspell 57CONFIGURE_ARGS+= --enable-system-hunspell
58CONFIGURE_ARGS+= --enable-system-ffi 58CONFIGURE_ARGS+= --enable-system-ffi
59CONFIGURE_ARGS+= --with-system-icu 59CONFIGURE_ARGS+= --with-system-icu
60CONFIGURE_ARGS+= --with-system-nss 60CONFIGURE_ARGS+= --with-system-nss
61CONFIGURE_ARGS+= --with-system-nspr 61CONFIGURE_ARGS+= --with-system-nspr
62CONFIGURE_ARGS+= --with-system-jpeg 62CONFIGURE_ARGS+= --with-system-jpeg
63CONFIGURE_ARGS+= --with-system-zlib 63CONFIGURE_ARGS+= --with-system-zlib
64CONFIGURE_ARGS+= --with-system-bz2 64CONFIGURE_ARGS+= --with-system-bz2
65CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent} 65CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent}
66CONFIGURE_ARGS+= --disable-crashreporter 66CONFIGURE_ARGS+= --disable-crashreporter
67CONFIGURE_ARGS+= --disable-necko-wifi 67CONFIGURE_ARGS+= --disable-necko-wifi
68CONFIGURE_ARGS+= --enable-chrome-format=flat 68CONFIGURE_ARGS+= --enable-chrome-format=flat
69CONFIGURE_ARGS+= --disable-libjpeg-turbo 69CONFIGURE_ARGS+= --disable-libjpeg-turbo
70 70
71CONFIGURE_ARGS+= --disable-elf-hack 71CONFIGURE_ARGS+= --disable-elf-hack
72CONFIGURE_ARGS+= --disable-gconf 72CONFIGURE_ARGS+= --disable-gconf
73CONFIGURE_ARGS+= --enable-gio 73CONFIGURE_ARGS+= --enable-gio
74CONFIGURE_ARGS+= --enable-extensions=gio 74CONFIGURE_ARGS+= --enable-extensions=gio
75#CONFIGURE_ARGS+= --enable-readline 75#CONFIGURE_ARGS+= --enable-readline
76CONFIGURE_ARGS+= --enable-url-classifier 76CONFIGURE_ARGS+= --enable-url-classifier
77CONFIGURE_ARGS+= --disable-icf 77CONFIGURE_ARGS+= --disable-icf
78CONFIGURE_ARGS+= --disable-updater 78CONFIGURE_ARGS+= --disable-updater
79 79
80SUBST_CLASSES+= fix-paths 80SUBST_CLASSES+= fix-paths
81SUBST_STAGE.fix-paths= pre-configure 81SUBST_STAGE.fix-paths= pre-configure
82SUBST_MESSAGE.fix-paths= Fixing absolute paths. 82SUBST_MESSAGE.fix-paths= Fixing absolute paths.
83SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp 83SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
84SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g' 84SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
85 85
86CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess 86CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess
87CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess 87CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess
88CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess 88CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
89CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess 89CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess
90CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub 90CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub
91CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub 91CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub
92CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub 92CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
93CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub 93CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
94 94
95CONFIGURE_ENV+= CPP=${CPP} 95CONFIGURE_ENV+= CPP=${CPP}
96ALL_ENV+= SHELL=${CONFIG_SHELL:Q} 96ALL_ENV+= SHELL=${CONFIG_SHELL:Q}
97 97
98# Build outside ${WRKSRC} 98# Build outside ${WRKSRC}
99# Try to avoid conflict with config/makefiles/xpidl/Makefile.in 99# Try to avoid conflict with config/makefiles/xpidl/Makefile.in
100OBJDIR= ../build 100OBJDIR= ../build
101CONFIGURE_DIRS= ${OBJDIR} 101CONFIGURE_DIRS= ${OBJDIR}
102CONFIGURE_SCRIPT= ${WRKSRC}/configure 102CONFIGURE_SCRIPT= ${WRKSRC}/configure
103 103
104PLIST_VARS+= sps vorbis tremor glskia throwwrapper mozglue avx86 104PLIST_VARS+= avx86
105 
106.include "../../mk/endian.mk" 
107.if ${MACHINE_ENDIAN} == "little" 
108PLIST.glskia= yes 
109.endif 
110 105
111.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 106.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
112PLIST.avx86= yes # see media/libav/README_MOZILLA: only used on x86 107PLIST.avx86= yes # see media/libav/README_MOZILLA: only used on x86
113.endif 108.endif
114 109
115.if ${MACHINE_ARCH} != "sparc64" 
116# For some reasons the configure test for GCC bug 26905 still triggers on 
117# sparc64, which makes mozilla skip the installation of a few wrapper headers. 
118# Other archs end up with one additional file in the SDK headers 
119PLIST.throwwrapper= yes 
120.endif 
121 
122.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*) 
123PLIST.sps= yes 
124.endif 
125 
126.if !empty(MACHINE_PLATFORM:MLinux-*-arm*) 
127PLIST.tremor= yes 
128.else 
129PLIST.vorbis= yes 
130.endif 
131 
132# See ${WRKSRC}/mozglue/build/moz.build: libmozglue is built and 
133# installed as a shared library on these platforms. 
134.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" # or Android 
135PLIST.mozglue= yes 
136.endif 
137 
138# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing 110# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing
139# support is only available when the toolkit is cairo-cocoa. 111# support is only available when the toolkit is cairo-cocoa.
140CONFIGURE_ARGS.Darwin+= --disable-sandbox 112CONFIGURE_ARGS.Darwin+= --disable-sandbox
141 113
142# See ${WRKSRC}/configure.in: It tries to use MacOS X 10.6 SDK by 114# See ${WRKSRC}/configure.in: It tries to use MacOS X 10.6 SDK by
143# default, which is not always possible. 115# default, which is not always possible.
144.if !empty(MACHINE_PLATFORM:MDarwin-8.*-*) 116.if !empty(MACHINE_PLATFORM:MDarwin-8.*-*)
145CONFIGURE_ARGS+= --enable-macos-target=10.4 117CONFIGURE_ARGS+= --enable-macos-target=10.4
146.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) 118.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
147CONFIGURE_ARGS+= --enable-macos-target=10.5 119CONFIGURE_ARGS+= --enable-macos-target=10.5
148.endif 120.endif
149 121
150# Makefiles sometimes call "rm -f" without more arguments. Kludge around ... 122# Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
151.PHONY: create-rm-wrapper 123.PHONY: create-rm-wrapper
152pre-configure: create-rm-wrapper 124pre-configure: create-rm-wrapper
153create-rm-wrapper: 125create-rm-wrapper:
154 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ 126 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
155 ${WRAPPER_DIR}/bin/rm 127 ${WRAPPER_DIR}/bin/rm
156 chmod +x ${WRAPPER_DIR}/bin/rm 128 chmod +x ${WRAPPER_DIR}/bin/rm
157 129
158# The configure test for __thread succeeds, but later we end up with: 130# The configure test for __thread succeeds, but later we end up with:
159# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 131# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
160CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 132CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
161 133
162.if ${OPSYS} == "SunOS" 134.if ${OPSYS} == "SunOS"
163# native libbz2.so hides BZ2_crc32Table 135# native libbz2.so hides BZ2_crc32Table
164PREFER.bzip2?= pkgsrc 136PREFER.bzip2?= pkgsrc
165.endif 137.endif
166 138
167.if ${OPSYS} == "OpenBSD" 139.if ${OPSYS} == "OpenBSD"
168PLIST_SUBST+= DLL_SUFFIX=".so.1.0" 140PLIST_SUBST+= DLL_SUFFIX=".so.1.0"
169.elif ${OPSYS} == "Darwin" 141.elif ${OPSYS} == "Darwin"
170PLIST_SUBST+= DLL_SUFFIX=".dylib" 142PLIST_SUBST+= DLL_SUFFIX=".dylib"
171.else 143.else
172PLIST_SUBST+= DLL_SUFFIX=".so" 144PLIST_SUBST+= DLL_SUFFIX=".so"
173.endif 145.endif
174 146
175.include "../../archivers/bzip2/buildlink3.mk" 147.include "../../archivers/bzip2/buildlink3.mk"
176BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 148BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
177.include "../../devel/libevent/buildlink3.mk" 149.include "../../devel/libevent/buildlink3.mk"
178.include "../../devel/libffi/buildlink3.mk" 150.include "../../devel/libffi/buildlink3.mk"
179BUILDLINK_API_DEPENDS.nspr+= nspr>=4.12 151BUILDLINK_API_DEPENDS.nspr+= nspr>=4.12
180.include "../../devel/nspr/buildlink3.mk" 152.include "../../devel/nspr/buildlink3.mk"
181.include "../../textproc/icu/buildlink3.mk" 153.include "../../textproc/icu/buildlink3.mk"
182BUILDLINK_API_DEPENDS.nss+= nss>=3.28.1 
183.include "../../devel/nss/buildlink3.mk" 154.include "../../devel/nss/buildlink3.mk"
184.include "../../devel/zlib/buildlink3.mk" 155.include "../../devel/zlib/buildlink3.mk"
185.include "../../mk/jpeg.buildlink3.mk" 156.include "../../mk/jpeg.buildlink3.mk"
186.include "../../graphics/MesaLib/buildlink3.mk" 157.include "../../graphics/MesaLib/buildlink3.mk"
187BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 158BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
188.include "../../graphics/cairo/buildlink3.mk" 159.include "../../graphics/cairo/buildlink3.mk"
189BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 
190.include "../../multimedia/libvpx/buildlink3.mk" 160.include "../../multimedia/libvpx/buildlink3.mk"
191.include "../../net/libIDL/buildlink3.mk" 161.include "../../net/libIDL/buildlink3.mk"
192.include "../../textproc/hunspell/buildlink3.mk" 162.include "../../textproc/hunspell/buildlink3.mk"
193.include "../../multimedia/ffmpeg4/buildlink3.mk" 163.include "../../multimedia/ffmpeg4/buildlink3.mk"
194.include "../../x11/libXt/buildlink3.mk" 164.include "../../x11/libXt/buildlink3.mk"
195BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 165BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
196.include "../../x11/pixman/buildlink3.mk" 166.include "../../x11/pixman/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/www/firefox52/options.mk (switch to unified diff)

--- pkgsrc/www/firefox52/options.mk 2020/06/04 13:47:19 1.5
+++ pkgsrc/www/firefox52/options.mk 2020/11/11 11:11:30 1.6
@@ -1,129 +1,128 @@ @@ -1,129 +1,128 @@
1# $NetBSD: options.mk,v 1.5 2020/06/04 13:47:19 nia Exp $ 1# $NetBSD: options.mk,v 1.6 2020/11/11 11:11:30 nia 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+= jemalloc debug 12PLIST_VARS+= debug
13 13
14.if ${OPSYS} == "Linux" 14.if ${OPSYS} == "Linux"
15PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus 15PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus
16.elif ${OPSYS} == "NetBSD" 16.elif ${OPSYS} == "NetBSD"
17PKG_SUGGESTED_OPTIONS+= oss dbus 17PKG_SUGGESTED_OPTIONS+= oss dbus
18.elif ${OPSYS} == "FreeBSD" 18.elif ${OPSYS} == "FreeBSD"
19PKG_SUGGESTED_OPTIONS+= oss dbus 19PKG_SUGGESTED_OPTIONS+= oss dbus
20.elif ${OPSYS} == "DragonFly" 20.elif ${OPSYS} == "DragonFly"
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
34BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 34BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
35.include "../../x11/gtk2/buildlink3.mk" 35.include "../../x11/gtk2/buildlink3.mk"
36.endif 36.endif
37 37
38# As of firefox-51 gtk2 is still pulled in implicitly 38# As of firefox-51 gtk2 is still pulled in implicitly
39.if !empty(PKG_OPTIONS:Mgtk3) 39.if !empty(PKG_OPTIONS:Mgtk3)
40CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 40CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
41# gtk2 needed even if --enable-default-toolkit=cairo-gtk3 41# gtk2 needed even if --enable-default-toolkit=cairo-gtk3
42BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 42BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
43.include "../../x11/gtk2/buildlink3.mk" 43.include "../../x11/gtk2/buildlink3.mk"
44.include "../../x11/gtk3/buildlink3.mk" 44.include "../../x11/gtk3/buildlink3.mk"
45PLIST.gtk3= yes 45PLIST.gtk3= yes
46.endif 46.endif
47 47
48.if !empty(PKG_OPTIONS:Malsa) 48.if !empty(PKG_OPTIONS:Malsa)
49CONFIGURE_ARGS+= --enable-alsa 49CONFIGURE_ARGS+= --enable-alsa
50.include "../../audio/alsa-lib/buildlink3.mk" 50.include "../../audio/alsa-lib/buildlink3.mk"
51.else 51.else
52CONFIGURE_ARGS+= --disable-alsa 52CONFIGURE_ARGS+= --disable-alsa
53.endif 53.endif
54 54
55.if !empty(PKG_OPTIONS:Moss) 55.if !empty(PKG_OPTIONS:Moss)
56CONFIGURE_ARGS+= --with-oss 56CONFIGURE_ARGS+= --with-oss
57.include "../../mk/oss.buildlink3.mk" 57.include "../../mk/oss.buildlink3.mk"
58.endif 58.endif
59 59
60.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 60.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
61PLIST.jemalloc= yes 
62CONFIGURE_ARGS+= --enable-jemalloc 61CONFIGURE_ARGS+= --enable-jemalloc
63CONFIGURE_ARGS+= --enable-replace-malloc 62CONFIGURE_ARGS+= --enable-replace-malloc
64.else 63.else
65CONFIGURE_ARGS+= --disable-jemalloc 64CONFIGURE_ARGS+= --disable-jemalloc
66.endif 65.endif
67 66
68.include "../../mk/compiler.mk" 67.include "../../mk/compiler.mk"
69.if !empty(PKGSRC_COMPILER:Mgcc) 68.if !empty(PKGSRC_COMPILER:Mgcc)
70. if ${CC_VERSION:S/gcc-//:S/.//g} >= 480 69. if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
71# Modern gcc does not run any "tracking" passes when compiling with -O0, 70# Modern gcc does not run any "tracking" passes when compiling with -O0,
72# which makes the generated debug info mostly useless. So explicitly 71# which makes the generated debug info mostly useless. So explicitly
73# request them. 72# request them.
74O0TRACKING=-fvar-tracking-assignments -fvar-tracking 73O0TRACKING=-fvar-tracking-assignments -fvar-tracking
75. endif 74. endif
76.endif 75.endif
77 76
78.if !empty(PKG_OPTIONS:Mdebug) 77.if !empty(PKG_OPTIONS:Mdebug)
79CONFIGURE_ARGS+= --enable-debug="-g -O0 ${O0TRACKING}" 78CONFIGURE_ARGS+= --enable-debug="-g -O0 ${O0TRACKING}"
80CONFIGURE_ARGS+= --disable-optimize 79CONFIGURE_ARGS+= --disable-optimize
81CONFIGURE_ARGS+= --enable-debug-js-modules 80CONFIGURE_ARGS+= --enable-debug-js-modules
82CONFIGURE_ARGS+= --disable-install-strip 81CONFIGURE_ARGS+= --disable-install-strip
83PLIST.debug= yes 82PLIST.debug= yes
84.else 83.else
85. if !empty(PKG_OPTIONS:Mdebug-info) 84. if !empty(PKG_OPTIONS:Mdebug-info)
86CONFIGURE_ARGS+= --enable-debug-symbols 85CONFIGURE_ARGS+= --enable-debug-symbols
87CONFIGURE_ARGS+= --enable-optimize=-O0 86CONFIGURE_ARGS+= --enable-optimize=-O0
88. else 87. else
89CONFIGURE_ARGS+= --disable-debug-symbols 88CONFIGURE_ARGS+= --disable-debug-symbols
90. endif 89. endif
91CONFIGURE_ARGS+= --disable-debug 90CONFIGURE_ARGS+= --disable-debug
92CONFIGURE_ARGS+= --enable-optimize=-O2 91CONFIGURE_ARGS+= --enable-optimize=-O2
93CONFIGURE_ARGS+= --enable-install-strip 92CONFIGURE_ARGS+= --enable-install-strip
94.endif 93.endif
95 94
96.if !empty(PKG_OPTIONS:Mpulseaudio) 95.if !empty(PKG_OPTIONS:Mpulseaudio)
97.include "../../audio/pulseaudio/buildlink3.mk" 96.include "../../audio/pulseaudio/buildlink3.mk"
98CONFIGURE_ARGS+= --enable-pulseaudio 97CONFIGURE_ARGS+= --enable-pulseaudio
99.else 98.else
100CONFIGURE_ARGS+= --disable-pulseaudio 99CONFIGURE_ARGS+= --disable-pulseaudio
101.endif 100.endif
102 101
103.if !empty(PKG_OPTIONS:Mdbus) 102.if !empty(PKG_OPTIONS:Mdbus)
104.include "../../sysutils/dbus-glib/buildlink3.mk" 103.include "../../sysutils/dbus-glib/buildlink3.mk"
105CONFIGURE_ARGS+= --enable-dbus 104CONFIGURE_ARGS+= --enable-dbus
106.else 105.else
107CONFIGURE_ARGS+= --disable-dbus 106CONFIGURE_ARGS+= --disable-dbus
108.endif 107.endif
109 108
110PLIST_VARS+= branding nobranding 109PLIST_VARS+= branding nobranding
111.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 110.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
112CONFIGURE_ARGS+= --enable-official-branding 111CONFIGURE_ARGS+= --enable-official-branding
113LICENSE= mozilla-trademark-license 112LICENSE= mozilla-trademark-license
114RESTRICTED= Trademark holder prohibits distribution of modified versions. 113RESTRICTED= Trademark holder prohibits distribution of modified versions.
115NO_BIN_ON_CDROM= ${RESTRICTED} 114NO_BIN_ON_CDROM= ${RESTRICTED}
116NO_BIN_ON_FTP= ${RESTRICTED} 115NO_BIN_ON_FTP= ${RESTRICTED}
117PLIST.branding= yes 116PLIST.branding= yes
118.else 117.else
119PLIST.nobranding= yes 118PLIST.nobranding= yes
120.endif 119.endif
121 120
122PLIST_VARS+= webrtc 121PLIST_VARS+= webrtc
123.if !empty(PKG_OPTIONS:Mwebrtc) 122.if !empty(PKG_OPTIONS:Mwebrtc)
124PLIST.webrtc= yes 123PLIST.webrtc= yes
125.include "../../graphics/libv4l/buildlink3.mk" 124.include "../../graphics/libv4l/buildlink3.mk"
126CONFIGURE_ARGS+= --enable-webrtc 125CONFIGURE_ARGS+= --enable-webrtc
127.else 126.else
128CONFIGURE_ARGS+= --disable-webrtc 127CONFIGURE_ARGS+= --disable-webrtc
129.endif 128.endif