Fix build under NetBSD 6.

* Avoid conflict of tolower function, Thank you, tsutsui@ (PR pkg/49262).
* GCC 4.6 is required to support nullptr at least.

3 files changed, 19 insertions, 10 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 76c1306d540..42fe8718f4c 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.163 2014/10/17 16:49:09 joerg Exp $
+$NetBSD: distinfo,v 1.164 2014/10/18 17:56:35 ryoon Exp $
 
 SHA1 (firefox-33.0.source.tar.bz2) = ad10e8fefcd9687d2b67bacafa4ecb5f5ca4af66
 RMD160 (firefox-33.0.source.tar.bz2) = f1f961927e12563db73cda811fe9557d5bc27f17
@@ -88,6 +88,7 @@ SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = d662f0f4c4a326071f59f7fff14018c62
 SHA1 (patch-media_libcubeb_src_moz.build) = a56289d1387e93bc62d7852520a488443bec233c
 SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a
 SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
+SHA1 (patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h) = 1325f23c87d2bb3fc0071b4cf0054e854dfea689
 SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = fdadd8b7e28290aabae4bab78597b4968f63eaf1
 SHA1 (patch-media_libtheora_Makefile.in) = 80ac9cb20760fe4d94047f7cb1c6a16bbdd6b505
 SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 68d5b63d4b8..ec62ba3df6d 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.44 2014/10/15 13:07:07 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.45 2014/10/18 17:56:35 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -16,17 +16,11 @@ UNLIMIT_RESOURCES+=	datasize
 TOOLS_PLATFORM.tar=	${TOOLS_PREFIX.bsdtar}/bin/bsdtar
 USE_TOOLS+=		bsdtar
 .endif
-# gcc45-4.5.3 of lang/gcc45 does not generate proper binary,
-# but gcc 4.5.4 of NetBSD 6.99 generates working binary.
-# gcc45 has no OpenBSD support, and gcc46 has it.
-.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) || !empty(MACHINE_PLATFORM:MOpenBSD*)
+# GCC 4.6 is required to support nullptr.
 GCC_REQD+=		4.6
-.  if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386"
 # Fix for PR pkg/48152.
 CPPFLAGS+=		-march=i486
-.  endif
-.else
-GCC_REQD+=		4.5
 .endif
 
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
diff --git a/www/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h b/www/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h
new file mode 100644
index 00000000000..974287a1d57
--- /dev/null
+++ b/www/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h,v 1.1 2014/10/18 17:56:35 ryoon Exp $
+
+--- media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h.orig	2014-10-11 09:06:39.000000000 +0000
++++ media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h
+@@ -75,6 +75,9 @@ struct AString {
+     bool startsWith(const char *prefix) const;
+     bool endsWith(const char *suffix) const;
+ 
++#if defined(__NetBSD__) && defined(tolower)
++#undef tolower
++#endif
+     void tolower();
+ 
+ private: