CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Jun  8 11:46:02 UTC 2019

Modified Files:
        pkgsrc/www/firefox: Makefile mozilla-common.mk

Log Message:
Simplify nasm and yasm conditional

Noticed by szptvlfn@, thank you.


To generate a diff of this commit:
cvs rdiff -u -r1.382 -r1.383 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.133 -r1.134 pkgsrc/www/firefox/mozilla-common.mk

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

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.382 pkgsrc/www/firefox/Makefile:1.383
--- pkgsrc/www/firefox/Makefile:1.382   Fri Jun  7 19:15:44 2019
+++ pkgsrc/www/firefox/Makefile Sat Jun  8 11:46:02 2019
@@ -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}/f
 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

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.133 pkgsrc/www/firefox/mozilla-common.mk:1.134
--- pkgsrc/www/firefox/mozilla-common.mk:1.133  Sat Jun  8 09:31:33 2019
+++ pkgsrc/www/firefox/mozilla-common.mk        Sat Jun  8 11:46:02 2019
@@ -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 @@ TOOL_DEPENDS+=                nodejs-[0-9]*:../../lang
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_DEPENDS+=                nasm>=1.1:../../devel/nasm
 BUILD_DEPENDS+=                yasm>=1.1:../../devel/yasm
 .endif