Wed Mar 22 19:10:30 2023 UTC ()
Fix NetBSD/sparc64 SSP_SUPPORTED=no check

It was set after the include of bsd.prefs.mk to be able to use
MACHINE_PLATFORM, but needed to be before bsd.prefs.mk to take
effect. Switch to testing MACHINE_ARCH, and target all sparc64


(abs)
diff -r1.27 -r1.28 pkgsrc/mail/thunderbird52/Makefile
cvs diff -r1.27 -r1.28 pkgsrc/mail/thunderbird52/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird52/Makefile 2023/03/21 20:08:40 1.27
+++ pkgsrc/mail/thunderbird52/Makefile 2023/03/22 19:10:30 1.28
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.27 2023/03/21 20:08:40 abs Exp $ 1# $NetBSD: Makefile,v 1.28 2023/03/22 19:10:30 abs Exp $
2 2
3DISTNAME= thunderbird-${TB_VER}.source 3DISTNAME= thunderbird-${TB_VER}.source
4PKGNAME= thunderbird${TB_VER:C/\..*$//}-${TB_VER} 4PKGNAME= thunderbird${TB_VER:C/\..*$//}-${TB_VER}
5PKGREVISION= 24 5PKGREVISION= 25
6TB_VER= 52.9.1 6TB_VER= 52.9.1
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} 8MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.thunderbird.net/en-US/ 12HOMEPAGE= https://www.thunderbird.net/en-US/
13COMMENT= Organize, secure and customize your mail 13COMMENT= Organize, secure and customize your mail
14LICENSE= mpl-1.1 14LICENSE= mpl-1.1
15 15
16USE_TOOLS+= unzip pax 16USE_TOOLS+= unzip pax
17WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//} 17WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//}
18MOZILLA_DIR= mozilla/ 18MOZILLA_DIR= mozilla/
@@ -24,33 +24,33 @@ CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/co @@ -24,33 +24,33 @@ CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/co
24CONFIGURE_ARGS+= --enable-application=mail 24CONFIGURE_ARGS+= --enable-application=mail
25# Disable WebRTC support for Thunderbird unconditionally. 25# Disable WebRTC support for Thunderbird unconditionally.
26CONFIGURE_ARGS+= --disable-webrtc 26CONFIGURE_ARGS+= --disable-webrtc
27CONFIGURE_ARGS+= --disable-dbus 27CONFIGURE_ARGS+= --disable-dbus
28CONFIGURE_ARGS+= --disable-gnomeui 28CONFIGURE_ARGS+= --disable-gnomeui
29 29
30NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird 30NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird
31NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird-bin 31NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird-bin
32 32
33ALL_ENV+= MOZILLA_PKG_NAME=${PKGBASE} 33ALL_ENV+= MOZILLA_PKG_NAME=${PKGBASE}
34 34
35LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} 35LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
36 36
37.include "../../mk/bsd.prefs.mk" 37.if ${MACHINE_ARCH} == "sparc64"
38 
39.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) 
40# Without this NetBSD/sparc64 gets "Bus error (core dumped)" 38# Without this NetBSD/sparc64 gets "Bus error (core dumped)"
41SSP_SUPPORTED=no 39SSP_SUPPORTED=no
42.endif 40.endif
43 41
 42.include "../../mk/bsd.prefs.mk"
 43
44#SUBST_CLASSES+= ext-compat 44#SUBST_CLASSES+= ext-compat
45#SUBST_STAGE.ext-compat= pre-configure 45#SUBST_STAGE.ext-compat= pre-configure
46#SUBST_MESSAGE.ext-compat= Fixing extension compatibility 46#SUBST_MESSAGE.ext-compat= Fixing extension compatibility
47#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf 47#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf
48#SUBST_FILES.ext-compat+= calendar/*/install.rdf 48#SUBST_FILES.ext-compat+= calendar/*/install.rdf
49#SUBST_FILES.ext-compat+= calendar/*/*/install.rdf 49#SUBST_FILES.ext-compat+= calendar/*/*/install.rdf
50#SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g' 50#SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g'
51 51
52SUBST_CLASSES+= sys-dic 52SUBST_CLASSES+= sys-dic
53SUBST_STAGE.sys-dic= pre-configure 53SUBST_STAGE.sys-dic= pre-configure
54SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries. 54SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries.
55SUBST_FILES.sys-dic= mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp 55SUBST_FILES.sys-dic= mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp
56SUBST_VARS.sys-dic= LOCALBASE 56SUBST_VARS.sys-dic= LOCALBASE