CVS commit: pkgsrc/www/firefox

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Jul 15 23:15:02 UTC 2018

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

Log Message:
Fix PR pkg/53429. Use libstdc++ from pkgsrc gcc61-libs to fix runtime error
BUmp PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.337 -r1.338 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.111 -r1.112 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.337 pkgsrc/www/firefox/Makefile:1.338
--- pkgsrc/www/firefox/Makefile:1.337   Fri Jul  6 20:51:57 2018
+++ pkgsrc/www/firefox/Makefile Sun Jul 15 23:15:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.337 2018/07/06 20:51:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.338 2018/07/15 23:15:01 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            61.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=       .1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.111 pkgsrc/www/firefox/mozilla-common.mk:1.112
--- pkgsrc/www/firefox/mozilla-common.mk:1.111  Fri Jul  6 20:50:03 2018
+++ pkgsrc/www/firefox/mozilla-common.mk        Sun Jul 15 23:15:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.111 2018/07/06 20:50:03 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.112 2018/07/15 23:15:01 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -48,7 +48,11 @@ test:
 TOOLS_PLATFORM.tar=    ${TOOLS_PATH.bsdtar}
 USE_TOOLS+=            bsdtar
 .endif
-GCC_REQD+=             6.1
+GCC_REQD=              6.1
+.if !empty(MACHINE_PLATFORM:MNetBSD-[0-7]**-*) || \
+       !empty(MACHINE_PLATFORM:MNetBSD-8.[0-8]*-*)
+USE_PKGSRC_GCC_RUNTIME=        yes
+.endif
 .if ${MACHINE_ARCH} == "i386"
 # Fix for PR pkg/48152.
 CXXFLAGS+=             -march=i586