CVS commit: pkgsrc/www/firefox52

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Wed Mar 22 19:09:54 UTC 2023

Modified Files:
        pkgsrc/www/firefox52: 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.84 -r1.85 pkgsrc/www/firefox52/Makefile

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

Modified files:

Index: pkgsrc/www/firefox52/Makefile
diff -u pkgsrc/www/firefox52/Makefile:1.84 pkgsrc/www/firefox52/Makefile:1.85
--- pkgsrc/www/firefox52/Makefile:1.84  Tue Mar 21 20:08:16 2023
+++ pkgsrc/www/firefox52/Makefile       Wed Mar 22 19:09:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2023/03/21 20:08:16 abs Exp $
+# $NetBSD: Makefile,v 1.85 2023/03/22 19:09:54 abs Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            52.9
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   53
+PKGREVISION=   54
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
@@ -46,14 +46,14 @@ SUBST_SED.dfly_malloc_h=    -e 's,HAVE_MALL
 SUBST_FILES.dfly_malloc_h=     media/libav/libavutil/mem.c
 SUBST_FILES.dfly_malloc_h+=    media/ffvpx/libavutil/mem.c
 
-.include "mozilla-common.mk"
-.include "options.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 "mozilla-common.mk"
+.include "options.mk"
+
 CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/header.py
 CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/typelib.py
 CHECK_INTERPRETER_SKIP+=       lib/firefox-sdk/sdk/bin/xpidl.py