CVS commit: pkgsrc/mail/thunderbird52

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Wed Mar 22 19:10:30 UTC 2023

Modified Files:
        pkgsrc/mail/thunderbird52: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/thunderbird52/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/thunderbird52/Makefile
diff -u pkgsrc/mail/thunderbird52/Makefile:1.27 pkgsrc/mail/thunderbird52/Makefile:1.28
--- pkgsrc/mail/thunderbird52/Makefile:1.27     Tue Mar 21 20:08:40 2023
+++ pkgsrc/mail/thunderbird52/Makefile  Wed Mar 22 19:10:30 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2023/03/21 20:08:40 abs Exp $
+# $NetBSD: Makefile,v 1.28 2023/03/22 19:10:30 abs Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird${TB_VER:C/\..*$//}-${TB_VER}
-PKGREVISION=   24
+PKGREVISION=   25
 TB_VER=                52.9.1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
@@ -34,13 +34,13 @@ ALL_ENV+=           MOZILLA_PKG_NAME=${PKGBASE}
 
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
+.if ${MACHINE_ARCH} == "sparc64"
 # Without this NetBSD/sparc64 gets "Bus error (core dumped)"
 SSP_SUPPORTED=no
 .endif
 
+.include "../../mk/bsd.prefs.mk"
+
 #SUBST_CLASSES+=               ext-compat
 #SUBST_STAGE.ext-compat=       pre-configure
 #SUBST_MESSAGE.ext-compat=     Fixing extension compatibility