Fri May 10 08:29:38 2024 UTC (13d)
mozilla: Support config-override.


(jperkin)
diff -r1.15 -r1.16 pkgsrc/mail/thunderbird/mozilla-common.mk
diff -r1.4 -r1.5 pkgsrc/mail/thunderbird102/mozilla-common.mk
diff -r1.281 -r1.282 pkgsrc/www/firefox/mozilla-common.mk
diff -r1.8 -r1.9 pkgsrc/www/firefox102/mozilla-common.mk
diff -r1.8 -r1.9 pkgsrc/www/firefox115/mozilla-common.mk
cvs diff -r1.15 -r1.16 pkgsrc/mail/thunderbird/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/mozilla-common.mk 2024/05/10 08:23:15 1.15
+++ pkgsrc/mail/thunderbird/mozilla-common.mk 2024/05/10 08:29:37 1.16
@@ -1,31 +1,34 @@ @@ -1,31 +1,34 @@
1# $NetBSD: mozilla-common.mk,v 1.15 2024/05/10 08:23:15 jperkin Exp $ 1# $NetBSD: mozilla-common.mk,v 1.16 2024/05/10 08:29:37 jperkin 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 mail/thunderbird/Makefile 5# used by mail/thunderbird/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 27 312 9PYTHON_VERSIONS_INCOMPATIBLE= 27 312
10 10
11PYTHON_FOR_BUILD_ONLY= tool 11PYTHON_FOR_BUILD_ONLY= tool
12ALL_ENV+= PYTHON3=${PYTHONBIN} 12ALL_ENV+= PYTHON3=${PYTHONBIN}
13 13
14HAS_CONFIGURE= yes 14HAS_CONFIGURE= yes
15CONFIGURE_ARGS+= --prefix=${PREFIX} 15CONFIGURE_ARGS+= --prefix=${PREFIX}
16USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 16USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
17UNLIMIT_RESOURCES+= datasize virtualsize 17UNLIMIT_RESOURCES+= datasize virtualsize
18 18
 19OVERRIDE_GNU_CONFIG_SCRIPTS= yes
 20OVERRIDE_DIRDEPTH= 4
 21
19USE_LANGUAGES+= c c++ 22USE_LANGUAGES+= c c++
20 23
21# ERROR: Only GCC 8.1 or newer is supported (found version 7.5.0). 24# ERROR: Only GCC 8.1 or newer is supported (found version 7.5.0).
22GCC_REQD+= 8 25GCC_REQD+= 8
23 26
24TOOL_DEPENDS+= cbindgen>=0.24.0:../../devel/cbindgen 27TOOL_DEPENDS+= cbindgen>=0.24.0:../../devel/cbindgen
25.if ${MACHINE_ARCH} == "sparc64" 28.if ${MACHINE_ARCH} == "sparc64"
26CONFIGURE_ARGS+= --disable-nodejs 29CONFIGURE_ARGS+= --disable-nodejs
27.else 30.else
28TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 31TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
29.endif 32.endif
30 33
31# malloc_usable_size() 34# malloc_usable_size()
cvs diff -r1.4 -r1.5 pkgsrc/mail/thunderbird102/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird102/mozilla-common.mk 2024/05/10 08:23:15 1.4
+++ pkgsrc/mail/thunderbird102/mozilla-common.mk 2024/05/10 08:29:37 1.5
@@ -1,31 +1,34 @@ @@ -1,31 +1,34 @@
1# $NetBSD: mozilla-common.mk,v 1.4 2024/05/10 08:23:15 jperkin Exp $ 1# $NetBSD: mozilla-common.mk,v 1.5 2024/05/10 08:29:37 jperkin 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 mail/thunderbird/Makefile 5# used by mail/thunderbird/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 27 312 9PYTHON_VERSIONS_INCOMPATIBLE= 27 312
10 10
11PYTHON_FOR_BUILD_ONLY= tool 11PYTHON_FOR_BUILD_ONLY= tool
12ALL_ENV+= PYTHON3=${PYTHONBIN} 12ALL_ENV+= PYTHON3=${PYTHONBIN}
13 13
14HAS_CONFIGURE= yes 14HAS_CONFIGURE= yes
15CONFIGURE_ARGS+= --prefix=${PREFIX} 15CONFIGURE_ARGS+= --prefix=${PREFIX}
16USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 16USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
17UNLIMIT_RESOURCES+= datasize stacksize virtualsize 17UNLIMIT_RESOURCES+= datasize stacksize virtualsize
18 18
 19OVERRIDE_GNU_CONFIG_SCRIPTS= yes
 20OVERRIDE_DIRDEPTH= 4
 21
19USE_LANGUAGES+= c c++ 22USE_LANGUAGES+= c c++
20 23
21# ERROR: Only GCC 7.1 or newer is supported (found version 5.5.0). 24# ERROR: Only GCC 7.1 or newer is supported (found version 5.5.0).
22GCC_REQD+= 7 25GCC_REQD+= 7
23 26
24TOOL_DEPENDS+= cbindgen>=0.24.0:../../devel/cbindgen 27TOOL_DEPENDS+= cbindgen>=0.24.0:../../devel/cbindgen
25.if ${MACHINE_ARCH} == "sparc64" 28.if ${MACHINE_ARCH} == "sparc64"
26CONFIGURE_ARGS+= --disable-nodejs 29CONFIGURE_ARGS+= --disable-nodejs
27.else 30.else
28TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 31TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
29.endif 32.endif
30 33
31.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 34.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
cvs diff -r1.281 -r1.282 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2024/05/10 08:23:15 1.281
+++ pkgsrc/www/firefox/mozilla-common.mk 2024/05/10 08:29:37 1.282
@@ -1,32 +1,35 @@ @@ -1,32 +1,35 @@
1# $NetBSD: mozilla-common.mk,v 1.281 2024/05/10 08:23:15 jperkin Exp $ 1# $NetBSD: mozilla-common.mk,v 1.282 2024/05/10 08:29:37 jperkin 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
9PYTHON_VERSIONS_INCOMPATIBLE= 27 9PYTHON_VERSIONS_INCOMPATIBLE= 27
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13REPLACE_PYTHON= build/cargo-linker 13REPLACE_PYTHON= build/cargo-linker
14 14
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16CONFIGURE_ARGS+= --prefix=${PREFIX} 16CONFIGURE_ARGS+= --prefix=${PREFIX}
17USE_TOOLS+= pkg-config perl gmake gm4 unzip zip # autoconf213 17USE_TOOLS+= pkg-config perl gmake gm4 unzip zip # autoconf213
18UNLIMIT_RESOURCES+= datasize stacksize virtualsize 18UNLIMIT_RESOURCES+= datasize stacksize virtualsize
19 19
 20OVERRIDE_GNU_CONFIG_SCRIPTS= yes
 21OVERRIDE_DIRDEPTH= 4
 22
20USE_LANGUAGES+= c c++ 23USE_LANGUAGES+= c c++
21 24
22# XXX: As of 114.0.2 25# XXX: As of 114.0.2
23# For nested constant initializer support in rlbox, requires 8. 26# For nested constant initializer support in rlbox, requires 8.
24GCC_REQD+= 8 27GCC_REQD+= 8
25 28
26TOOL_DEPENDS+= cbindgen>=0.26.0:../../devel/cbindgen 29TOOL_DEPENDS+= cbindgen>=0.26.0:../../devel/cbindgen
27 30
28.if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL) 31.if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL)
29TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 32TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
30USE_TOOLS+= diff 33USE_TOOLS+= diff
31.else 34.else
32CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh" 35CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh"
cvs diff -r1.8 -r1.9 pkgsrc/www/firefox102/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox102/mozilla-common.mk 2024/05/10 08:23:15 1.8
+++ pkgsrc/www/firefox102/mozilla-common.mk 2024/05/10 08:29:38 1.9
@@ -1,30 +1,33 @@ @@ -1,30 +1,33 @@
1# $NetBSD: mozilla-common.mk,v 1.8 2024/05/10 08:23:15 jperkin Exp $ 1# $NetBSD: mozilla-common.mk,v 1.9 2024/05/10 08:29:38 jperkin 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
9PYTHON_VERSIONS_INCOMPATIBLE= 27 312 9PYTHON_VERSIONS_INCOMPATIBLE= 27 312
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
14CONFIGURE_ARGS+= --prefix=${PREFIX} 14CONFIGURE_ARGS+= --prefix=${PREFIX}
15USE_TOOLS+= pkg-config perl gmake autoconf213 gm4 unzip zip 15USE_TOOLS+= pkg-config perl gmake autoconf213 gm4 unzip zip
16UNLIMIT_RESOURCES+= datasize stacksize virtualsize 16UNLIMIT_RESOURCES+= datasize stacksize virtualsize
17 17
 18OVERRIDE_GNU_CONFIG_SCRIPTS= yes
 19OVERRIDE_DIRDEPTH= 4
 20
18USE_LANGUAGES+= c c++ 21USE_LANGUAGES+= c c++
19 22
20# ERROR: Only GCC 7.1 or newer is supported (found version 5.5.0). 23# ERROR: Only GCC 7.1 or newer is supported (found version 5.5.0).
21GCC_REQD+= 7 24GCC_REQD+= 7
22 25
23TOOL_DEPENDS+= cbindgen>=0.24.0:../../devel/cbindgen 26TOOL_DEPENDS+= cbindgen>=0.24.0:../../devel/cbindgen
24 27
25.if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL) 28.if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL)
26TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 29TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
27USE_TOOLS+= diff 30USE_TOOLS+= diff
28.else 31.else
29CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh" 32CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh"
30.endif 33.endif
cvs diff -r1.8 -r1.9 pkgsrc/www/firefox115/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox115/mozilla-common.mk 2024/05/10 08:23:15 1.8
+++ pkgsrc/www/firefox115/mozilla-common.mk 2024/05/10 08:29:38 1.9
@@ -1,32 +1,35 @@ @@ -1,32 +1,35 @@
1# $NetBSD: mozilla-common.mk,v 1.8 2024/05/10 08:23:15 jperkin Exp $ 1# $NetBSD: mozilla-common.mk,v 1.9 2024/05/10 08:29:38 jperkin 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
9PYTHON_VERSIONS_INCOMPATIBLE= 27 312 9PYTHON_VERSIONS_INCOMPATIBLE= 27 312
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13REPLACE_PYTHON= build/cargo-linker 13REPLACE_PYTHON= build/cargo-linker
14 14
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16CONFIGURE_ARGS+= --prefix=${PREFIX} 16CONFIGURE_ARGS+= --prefix=${PREFIX}
17USE_TOOLS+= pkg-config perl gmake gm4 unzip zip # autoconf213 17USE_TOOLS+= pkg-config perl gmake gm4 unzip zip # autoconf213
18UNLIMIT_RESOURCES+= datasize virtualsize 18UNLIMIT_RESOURCES+= datasize virtualsize
19 19
 20OVERRIDE_GNU_CONFIG_SCRIPTS= yes
 21OVERRIDE_DIRDEPTH= 4
 22
20USE_LANGUAGES+= c c++ 23USE_LANGUAGES+= c c++
21 24
22# XXX: As of 114.0.2 25# XXX: As of 114.0.2
23# For nested constant initializer support in rlbox, requires 8. 26# For nested constant initializer support in rlbox, requires 8.
24GCC_REQD+= 8 27GCC_REQD+= 8
25 28
26TOOL_DEPENDS+= cbindgen>=0.24.3:../../devel/cbindgen 29TOOL_DEPENDS+= cbindgen>=0.24.3:../../devel/cbindgen
27 30
28.if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL) 31.if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL)
29TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 32TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
30USE_TOOLS+= diff 33USE_TOOLS+= diff
31.else 34.else
32CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh" 35CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh"