Pass appropriate flags related to pthread(Should fix build problem on DragonFly).

Remove subst for mecab-config, it was unneeded anymore.

4 files changed, 46 insertions, 6 deletions

diff --git a/textproc/mecab-base/Makefile b/textproc/mecab-base/Makefile
index 76701723abf..19a3ed002fc 100644
--- a/textproc/mecab-base/Makefile
+++ b/textproc/mecab-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/12 13:47:03 obache Exp $
+# $NetBSD: Makefile,v 1.2 2007/05/17 15:38:26 obache Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -31,10 +31,12 @@ SUBST_STAGE.confdir=	pre-configure
 SUBST_FILES.confdir=	Makefile.in
 SUBST_SED.confdir=	-e "s,\$$(sysconfdir),${EGDIR},"
 
-SUBST_CLASSES+=		rpaths
-SUBST_STAGE.rpaths=	pre-configure
-SUBST_FILES.rpaths=	mecab-config.in
-SUBST_SED.rpaths=	-e '/echo[ 	]*-L/s|-L\([ 	]*[^ 	]*\)|${COMPILER_RPATH_FLAG}\1 -L\1|g'
+SUBST_CLASSES+=		pthread
+SUBST_STAGE.pthread=	pre-configure
+SUBST_FILES.pthread=	configure
+SUBST_SED.pthread=	-e 's|-lpthread||g'
+
+PTHREAD_AUTO_VARS=	yes
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mecab-base/distinfo b/textproc/mecab-base/distinfo
index d14f9335773..aaccddf1b74 100644
--- a/textproc/mecab-base/distinfo
+++ b/textproc/mecab-base/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/12 13:47:03 obache Exp $
+$NetBSD: distinfo,v 1.2 2007/05/17 15:38:26 obache Exp $
 
 SHA1 (mecab-0.95.tar.gz) = 676af69b652393e3fdbb58ddf99b9aae13a87c4a
 RMD160 (mecab-0.95.tar.gz) = bd8393ddae802fc98a999dd68f25564e8317f5c0
 Size (mecab-0.95.tar.gz) = 1385805 bytes
+SHA1 (patch-aa) = 1d0229b81f6d1b376be8868ae4f243cd26e0f725
+SHA1 (patch-ab) = e1c5749239bf75fe19ab150552604ccb1d08d8de
diff --git a/textproc/mecab-base/patches/patch-aa b/textproc/mecab-base/patches/patch-aa
new file mode 100644
index 00000000000..1e80b03eb61
--- /dev/null
+++ b/textproc/mecab-base/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2007/05/17 15:38:26 obache Exp $
+
+--- configure.orig	2007-03-11 15:31:34.000000000 +0000
++++ configure
+@@ -25843,12 +25843,6 @@ echo "$as_me: error: \"SUN make does not
+         fi
+ fi
+ 
+-if test -n "$GCC"; then
+-   CFLAGS="-O3 -Wall -Wno-deprecated"
+-   CXXFLAGS="-O3 -Wall -Wno-deprecated"
+-fi
+-
+-
+ # Check whether --with-charset was given.
+ if test "${with_charset+set}" = set; then
+   withval=$with_charset; CHARSET=${withval}
diff --git a/textproc/mecab-base/patches/patch-ab b/textproc/mecab-base/patches/patch-ab
new file mode 100644
index 00000000000..8b994a7f1aa
--- /dev/null
+++ b/textproc/mecab-base/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 2007/05/17 15:38:26 obache Exp $
+
+--- configure.in.orig	2007-03-07 14:05:27.000000000 +0000
++++ configure.in
+@@ -94,14 +94,6 @@ else
+ fi
+ 
+ dnl
+-dnl check gcc
+-dnl
+-if test -n "$GCC"; then
+-   CFLAGS="-O3 -Wall -Wno-deprecated"
+-   CXXFLAGS="-O3 -Wall -Wno-deprecated"
+-fi
+-
+-dnl
+ dnl check Char Code
+ dnl 
+ AC_ARG_WITH(