Don't try to explicitly link in libstdc++.

6 files changed, 65 insertions, 12 deletions

diff --git a/textproc/cabocha/distinfo b/textproc/cabocha/distinfo
index d8f1c3ebf69..ce1363ed006 100644
--- a/textproc/cabocha/distinfo
+++ b/textproc/cabocha/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2012/04/22 20:31:29 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/05/09 15:07:58 joerg Exp $
 
 SHA1 (cabocha-0.53.tar.gz) = 6b8903aa6843887bb669d9d5baea8a0eae320d80
 RMD160 (cabocha-0.53.tar.gz) = 39b637adc8b882542ecc3b6df34d8f6b99be3e38
 Size (cabocha-0.53.tar.gz) = 11552551 bytes
 SHA1 (patch-aa) = cb868fa8b88180ed5f84d55796d042e5774862af
 SHA1 (patch-ab) = 3dcaae627c12a8ffc3595177768445335c5a3bd4
+SHA1 (patch-configure) = be6ea41b105f3d4c78b240cfc2ec8de6b604713f
 SHA1 (patch-src_cabocha.h) = 85bbf0da32677b7d4a33f1ef8d9aa7915fa1da1f
 SHA1 (patch-src_common.h) = 33a84611497ff0d98a6d9d9abaf0cd3ff60c3a83
diff --git a/textproc/cabocha/patches/patch-configure b/textproc/cabocha/patches/patch-configure
new file mode 100644
index 00000000000..dce95a226be
--- /dev/null
+++ b/textproc/cabocha/patches/patch-configure
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.1 2013/05/09 15:07:59 joerg Exp $
+
+--- configure.orig	2013-05-09 15:00:15.000000000 +0000
++++ configure
+@@ -20635,6 +20635,7 @@ CABOCHA_DEFAULT_RC="$sysconfdir/cabochar
+ CABOCHA_TXTMODEL_LIST=`(cd model; echo *.txtmodel.gz)`
+ CABOCHA_MODEL_LIST=`(cd model; echo *.txtmodel.gz | sed s/.txtmodel.gz/.model/g)`
+ 
++if false; then
+ echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
+ echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6
+ if test "${ac_cv_lib_stdcpp_main+set}" = set; then
+@@ -20696,6 +20697,7 @@ echo "${ECHO_T}$ac_cv_lib_stdcpp_main" >
+ if test $ac_cv_lib_stdcpp_main = yes; then
+   STDCPP_LIBS="-lstdc++"
+ fi
++fi
+ 
+ LIBS="$YAMCHA_LIBS $STDCPP_LIBS $LIBS"
+ CABOCHA_LIBS="$LIBS"
diff --git a/textproc/mecab-base/distinfo b/textproc/mecab-base/distinfo
index c6c8c18bee9..d4d6718f988 100644
--- a/textproc/mecab-base/distinfo
+++ b/textproc/mecab-base/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2013/02/28 12:31:38 obache Exp $
+$NetBSD: distinfo,v 1.9 2013/05/09 15:07:59 joerg Exp $
 
 SHA1 (mecab-0.996.tar.gz) = 15baca0983a61c1a49cffd4a919463a0a39ef127
 RMD160 (mecab-0.996.tar.gz) = a06fa0c0eb44eef8c45171b769b43c655971ac4a
 Size (mecab-0.996.tar.gz) = 1398663 bytes
-SHA1 (patch-aa) = 58d512643fcd8298eea8f8357aca4f9b364f3220
+SHA1 (patch-aa) = 063e3eea0530c0ea66761f8357fc1c4de4ab31fd
 SHA1 (patch-ab) = 801df711f04aff5ea1ef1280f7642b36733df8ec
diff --git a/textproc/mecab-base/patches/patch-aa b/textproc/mecab-base/patches/patch-aa
index e9defa75dc7..56a293a560a 100644
--- a/textproc/mecab-base/patches/patch-aa
+++ b/textproc/mecab-base/patches/patch-aa
@@ -1,10 +1,26 @@
-$NetBSD: patch-aa,v 1.6 2012/06/10 11:54:44 obache Exp $
+$NetBSD: patch-aa,v 1.7 2013/05/09 15:07:59 joerg Exp $
 
 * Use own optimization flags.
 
---- configure.orig	2012-06-04 14:15:35.000000000 +0000
+--- configure.orig	2013-02-15 08:08:00.000000000 +0000
 +++ configure
-@@ -18036,8 +18036,8 @@ $as_echo "no" >&6; }
+@@ -17804,6 +17804,7 @@ $as_echo "#define HAVE_MMAP 1" >>confdef
+ fi
+ rm -f conftest.mmap conftest.txt
+ 
++if false; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lstdc++" >&5
+ $as_echo_n "checking for main in -lstdc++... " >&6; }
+ if ${ac_cv_lib_stdcpp_main+:} false; then :
+@@ -17837,6 +17838,7 @@ $as_echo "$ac_cv_lib_stdcpp_main" >&6; }
+ if test "x$ac_cv_lib_stdcpp_main" = xyes; then :
+   MECAB_LIBS="-lstdc++"
+ fi
++fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+ $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+@@ -17989,8 +17991,8 @@ $as_echo "no" >&6; }
  fi
  
  if test -n "$GCC"; then
diff --git a/textproc/yamcha/distinfo b/textproc/yamcha/distinfo
index 87332b9b1bd..fff92b7e4f8 100644
--- a/textproc/yamcha/distinfo
+++ b/textproc/yamcha/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2012/10/03 14:40:23 marino Exp $
+$NetBSD: distinfo,v 1.6 2013/05/09 15:07:59 joerg Exp $
 
 SHA1 (yamcha-0.33.tar.gz) = 4ee6d8150557761f86fcb8af118636b7c23920c0
 RMD160 (yamcha-0.33.tar.gz) = ac21fa16a45efa40775d426cd6229f612a7aa21e
 Size (yamcha-0.33.tar.gz) = 488670 bytes
 SHA1 (patch-aa) = 16120e3f052a1046ee360bbe449d95dfdb6a3990
-SHA1 (patch-configure) = e8ce916348987c5defa16bde2fca4a748ff36a3d
+SHA1 (patch-configure) = c8ad42d53eb50ce6aab60dda1c7c953d927b9468
 SHA1 (patch-libexec_mkdarts.cpp) = 7fb2dfae8f6b312530f0774f9e8f227b98fdfd5e
 SHA1 (patch-libexec_mktrie.cpp) = 4816974718c57819902b4b947a69ffafe82b98a9
 SHA1 (patch-libexec_pkemine.cpp) = 09fcb52d2b652676b277cb9f148a9d799324bf45
diff --git a/textproc/yamcha/patches/patch-configure b/textproc/yamcha/patches/patch-configure
index f54ad740b6d..8cb151e8cd1 100644
--- a/textproc/yamcha/patches/patch-configure
+++ b/textproc/yamcha/patches/patch-configure
@@ -1,8 +1,24 @@
-$NetBSD: patch-configure,v 1.1 2011/09/14 17:47:38 hans Exp $
+$NetBSD: patch-configure,v 1.2 2013/05/09 15:07:59 joerg Exp $
 
---- configure.orig	2005-09-03 04:33:48.000000000 +0200
-+++ configure	2011-09-13 18:13:16.246039614 +0200
-@@ -20250,11 +20250,6 @@ echo "${ECHO_T}yes" >&6
+--- configure.orig	2005-09-03 02:33:48.000000000 +0000
++++ configure
+@@ -20169,6 +20169,7 @@ if test $ac_cv_lib_m_pow = yes; then
+   M_LIBS="-lm"
+ fi
+ 
++if false; then
+ echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
+ echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6
+ if test "${ac_cv_lib_stdcpp_main+set}" = set; then
+@@ -20230,6 +20231,7 @@ echo "${ECHO_T}$ac_cv_lib_stdcpp_main" >
+ if test $ac_cv_lib_stdcpp_main = yes; then
+   STDCPP_LIBS="-lstdc++"
+ fi
++fi
+ 
+ ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -20250,11 +20252,6 @@ echo "${ECHO_T}yes" >&6
  else
          echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6