Do not depend on gcc46. Bump PKGREVISION.

Do not mix libstdc++ from gcc46-libs (libstdc++.so.6) and
NetBSD base (libstdc++.so.7) under netbsd-6.
Patch from tnozaki.

9 files changed, 30 insertions, 11 deletions

diff --git a/inputmethod/ibus-mozc/Makefile b/inputmethod/ibus-mozc/Makefile
index 90c8bbcd2fc..a04f31ef19a 100644
--- a/inputmethod/ibus-mozc/Makefile
+++ b/inputmethod/ibus-mozc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2015/09/23 11:53:27 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2015/10/12 07:24:50 ryoon Exp $
 
 PKGNAME=	ibus-${DISTNAME}
+PKGREVISION=	1
 
 INSTALLATION_DIRS+=	libexec share/ibus share/ibus/component \
 			share/ibus-mozc
diff --git a/inputmethod/mozc-elisp/Makefile b/inputmethod/mozc-elisp/Makefile
index bddabbe143b..733463b1c65 100644
--- a/inputmethod/mozc-elisp/Makefile
+++ b/inputmethod/mozc-elisp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2015/07/31 13:07:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2015/10/12 07:24:50 ryoon Exp $
 #
 
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
+PKGREVISION=	1
 CATEGORIES=	inputmethod editors
 
 EMACS_MODULES=	base leim
diff --git a/inputmethod/mozc-renderer/Makefile b/inputmethod/mozc-renderer/Makefile
index 0f56a151776..12fd86d3021 100644
--- a/inputmethod/mozc-renderer/Makefile
+++ b/inputmethod/mozc-renderer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2015/07/31 13:07:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2015/10/12 07:24:50 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-renderer-/}
+PKGREVISION=	1
 
 CONFLICTS+=	ibus-mozc<=1.13.1651.102
 
diff --git a/inputmethod/mozc-server/Makefile b/inputmethod/mozc-server/Makefile
index b58accc318b..0918c69a4ac 100644
--- a/inputmethod/mozc-server/Makefile
+++ b/inputmethod/mozc-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2015/07/31 13:07:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2015/10/12 07:24:50 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-server-/}
+PKGREVISION=	1
 
 INSTALLATION_DIRS+=	libexec
 
diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index a4e5bd8d3b3..99411792a59 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2015/10/12 00:21:48 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.21 2015/10/12 07:24:50 ryoon Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -38,9 +38,6 @@ BUILD_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-gyp
 
 USE_LANGUAGES=	c c++
-# nullptr requires -std=c++11, and -std=c++11 requires gcc 4.6 or later
-GCC_REQD+=	4.6
-CXXFLAGS+=	-std=c++03
 
 USE_TOOLS+=	gmake pkg-config
 
diff --git a/inputmethod/mozc-server/distinfo b/inputmethod/mozc-server/distinfo
index a8c97e88a86..8f8dec7872b 100644
--- a/inputmethod/mozc-server/distinfo
+++ b/inputmethod/mozc-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2015/10/12 00:21:48 ryoon Exp $
+$NetBSD: distinfo,v 1.16 2015/10/12 07:24:50 ryoon Exp $
 
 SHA1 (mozc-2.17.2116.102-fd0f5b347d35fe287f4cc9be49f650c87f82ba03.tar.gz) = bb35db84e85bbcf413c36dc2a0d05d8af3f483e2
 RMD160 (mozc-2.17.2116.102-fd0f5b347d35fe287f4cc9be49f650c87f82ba03.tar.gz) = d24b1e1caf00a919620bf6da0855d137a41cb82e
@@ -16,6 +16,7 @@ SHA1 (patch-base_logging.cc) = 96ee9d1426ef1cf946a00fb15c9754603ab15bb8
 SHA1 (patch-base_mutex.cc) = aed8588d4ff7b057fed072097ef09ddbc2696d31
 SHA1 (patch-base_mutex.h) = 6c3c8f0845f0fdad815c4877026894000d5eac2c
 SHA1 (patch-base_password__manager.cc) = f16982447f54e397d1aa103260d8f4d10aa76f96
+SHA1 (patch-base_port.h) = 47231ec5b4c46005b626da21d63bb3e714ed93bd
 SHA1 (patch-base_process.cc) = abdd6a955e87506972e7f71fd4bc3a300f49b304
 SHA1 (patch-base_run__level.cc) = ead96536246093bd3d44f59a80085da2f39904e8
 SHA1 (patch-base_system__util.cc) = f3ef575a15cd518fe7d29264b39f775ccf502802
diff --git a/inputmethod/mozc-server/patches/patch-base_port.h b/inputmethod/mozc-server/patches/patch-base_port.h
new file mode 100644
index 00000000000..9970a4e5fea
--- /dev/null
+++ b/inputmethod/mozc-server/patches/patch-base_port.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-base_port.h,v 1.1 2015/10/12 07:24:51 ryoon Exp $
+
+--- base/port.h.orig	2015-09-05 17:32:12.000000000 +0000
++++ base/port.h
+@@ -130,6 +130,10 @@ static const  int64 kint64max  = (( int6
+ #define AS_STRING(x)   AS_STRING_INTERNAL(x)
+ #define AS_STRING_INTERNAL(x)   #x
+ 
++// gcc>=46 has nullptr, otherwise use __null instead.
++#if defined(__GNUC__) && __GNUC__ * 1000 + __GNUC__MINOR__ < 4006
++#define nullptr __null
++#endif
+ 
+ // TODO(yukawa): Simplify following includes
+ #include "base/flags.h"
diff --git a/inputmethod/mozc-tool/Makefile b/inputmethod/mozc-tool/Makefile
index 23e97da064d..ddc5eda5caa 100644
--- a/inputmethod/mozc-tool/Makefile
+++ b/inputmethod/mozc-tool/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2015/07/31 13:07:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2015/10/12 07:24:51 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-tool-/}
+PKGREVISION=	1
 
 INSTALLATION_DIRS+=	libexec
 
diff --git a/inputmethod/uim-mozc/Makefile b/inputmethod/uim-mozc/Makefile
index 6db371be6dc..74d43acf674 100644
--- a/inputmethod/uim-mozc/Makefile
+++ b/inputmethod/uim-mozc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2015/07/31 13:07:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2015/10/12 07:24:51 ryoon Exp $
 
 PKGNAME=	uim-${DISTNAME}
+PKGREVISION=	1
 
 CONFLICTS+=	ibus-mozc<=1.13.1651.102