[pkgsrc/trunk]: pkgsrc/textproc/mecab-base Pass appropriate flags related to ...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a727679c69ba
branches:  trunk
changeset: 528823:a727679c69ba
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu May 17 15:38:26 2007 +0000

description:
Pass appropriate flags related to pthread(Should fix build problem on DragonFly).
Remove subst for mecab-config, it was unneeded anymore.

diffstat:

 textproc/mecab-base/Makefile         |  12 +++++++-----
 textproc/mecab-base/distinfo         |   4 +++-
 textproc/mecab-base/patches/patch-aa |  17 +++++++++++++++++
 textproc/mecab-base/patches/patch-ab |  19 +++++++++++++++++++
 4 files changed, 46 insertions(+), 6 deletions(-)

diffs (82 lines):

diff -r c52d34a23898 -r a727679c69ba textproc/mecab-base/Makefile
--- a/textproc/mecab-base/Makefile      Thu May 17 14:54:14 2007 +0000
+++ b/textproc/mecab-base/Makefile      Thu May 17 15:38:26 2007 +0000
@@ -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_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 -r c52d34a23898 -r a727679c69ba textproc/mecab-base/distinfo
--- a/textproc/mecab-base/distinfo      Thu May 17 14:54:14 2007 +0000
+++ b/textproc/mecab-base/distinfo      Thu May 17 15:38:26 2007 +0000
@@ -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 -r c52d34a23898 -r a727679c69ba textproc/mecab-base/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/mecab-base/patches/patch-aa      Thu May 17 15:38:26 2007 +0000
@@ -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 -r c52d34a23898 -r a727679c69ba textproc/mecab-base/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/mecab-base/patches/patch-ab      Thu May 17 15:38:26 2007 +0000
@@ -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(