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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -91,60 +91,32 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}bui @@ -91,60 +91,32 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}bui
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 ...
@@ -169,28 +141,26 @@ PLIST_SUBST+= DLL_SUFFIX=".so.1.0" @@ -169,28 +141,26 @@ PLIST_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 (expand / 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,25 +1,25 @@ @@ -1,25 +1,25 @@
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
@@ -48,27 +48,26 @@ PLIST.gtk3= yes @@ -48,27 +48,26 @@ PLIST.gtk3= yes
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