[pkgsrc/trunk]: pkgsrc/www/firefox Simplify nasm and yasm conditional

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d01dde8d22b1
branches:  trunk
changeset: 334894:d01dde8d22b1
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Jun 08 11:46:02 2019 +0000

description:
Simplify nasm and yasm conditional

Noticed by szptvlfn@, thank you.

diffstat:

 www/firefox/Makefile          |  6 +-----
 www/firefox/mozilla-common.mk |  3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 8338bd9ac7d4 -r d01dde8d22b1 www/firefox/Makefile
--- a/www/firefox/Makefile      Sat Jun 08 11:04:27 2019 +0000
+++ b/www/firefox/Makefile      Sat Jun 08 11:46:02 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.382 2019/06/07 19:15:44 maya Exp $
+# $NetBSD: Makefile,v 1.383 2019/06/08 11:46:02 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            67.0
@@ -38,10 +38,6 @@
 NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox-bin
 NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/plugin-container
 
-.if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+=        nasm-[0-9]*:../../devel/nasm
-.endif
-
 # Avoid ld "invalid section index" errors.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-fdata-sections
 BUILDLINK_TRANSFORM.SunOS+=    rm:-ffunction-sections
diff -r 8338bd9ac7d4 -r d01dde8d22b1 www/firefox/mozilla-common.mk
--- a/www/firefox/mozilla-common.mk     Sat Jun 08 11:04:27 2019 +0000
+++ b/www/firefox/mozilla-common.mk     Sat Jun 08 11:46:02 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.133 2019/06/08 09:31:33 szptvlfn Exp $
+# $NetBSD: mozilla-common.mk,v 1.134 2019/06/08 11:46:02 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -31,6 +31,7 @@
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_DEPENDS+=                nasm>=1.1:../../devel/nasm
 BUILD_DEPENDS+=                yasm>=1.1:../../devel/yasm
 .endif