4 files changed, 121 insertions, 6 deletions

diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index 0a29e9c4d6d7..8591e55156ff 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	senna
-PORTVERSION=	0.8.1
+PORTVERSION=	1.0.5
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	senna/21716
+MASTER_SITE_SUBDIR=	senna/25130
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Embeddable Fulltext Search Engine
diff --git a/textproc/senna/distinfo b/textproc/senna/distinfo
index 7e55e815c6e1..e0ccff5a9fc1 100644
--- a/textproc/senna/distinfo
+++ b/textproc/senna/distinfo
@@ -1,3 +1,3 @@
-MD5 (senna-0.8.1.tar.gz) = 6b0c795dbc2ecca32d16f4b99ec5919c
-SHA256 (senna-0.8.1.tar.gz) = 9d842f528a198f12065f6a973367e5685f9d3c2aa1566e564d87f87086d4f4b7
-SIZE (senna-0.8.1.tar.gz) = 1019008
+MD5 (senna-1.0.5.tar.gz) = d86c567db245297caf9a906ef7935815
+SHA256 (senna-1.0.5.tar.gz) = cca9a5877fad9d33d7d14ba3db130cee252867066e29c850f962f9ba92c8f5fd
+SIZE (senna-1.0.5.tar.gz) = 1045919
diff --git a/textproc/senna/files/patch-configure b/textproc/senna/files/patch-configure
new file mode 100644
index 000000000000..6ff33598655f
--- /dev/null
+++ b/textproc/senna/files/patch-configure
@@ -0,0 +1,115 @@
+--- configure.orig	Sat Apr 28 02:32:01 2007
++++ configure	Tue May  1 20:11:40 2007
+@@ -1057,9 +1057,9 @@
+                           specify Senna default initial_n_segments
+   --with-query-escalation-threshold=NUMBER
+                           specify Senna default query escalation threshold
++  --with-mecab            use mecab for morphological analysis. [default=yes]
+   --with-mecab-config=PATH
+                           set mecab-config location. [search], [path]
+-  --with-mecab            use mecab for morphological analysis. [default=yes]
+   --with-mysqlsrc=DIR     specify MySQL source dictionary.
+ 
+ Some influential environment variables:
+@@ -21440,13 +21440,52 @@
+ _ACEOF
+ 
+ 
+-# mecab-config
++# mecab
++
++# Check whether --with-mecab or --without-mecab was given.
++if test "${with_mecab+set}" = set; then
++  withval="$with_mecab"
++  with_mecab="$withval"
++else
++  with_mecab="yes"
++fi;
++if test "x$with_mecab" = "xno"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define NO_MECAB 1
++_ACEOF
++
++else
++  # mecab-config
+ 
+ # Check whether --with-mecab-config or --without-mecab-config was given.
+ if test "${with_mecab_config+set}" = set; then
+   withval="$with_mecab_config"
++  as_ac_File=`echo "ac_cv_file_"$withval"" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for \"$withval\"" >&5
++echo $ECHO_N "checking for \"$withval\"... $ECHO_C" >&6
++if eval "test \"\${$as_ac_File+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  test "$cross_compiling" = yes &&
++  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
++echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
++   { (exit 1); exit 1; }; }
++if test -r ""$withval""; then
++  eval "$as_ac_File=yes"
++else
++  eval "$as_ac_File=no"
++fi
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
++if test `eval echo '${'$as_ac_File'}'` = yes; then
+   MECAB_CONFIG="$withval"
+ else
++  MECAB_CONFIG=no
++fi
++
++else
+   # Extract the first word of "mecab-config", so it can be a program name with args.
+ set dummy mecab-config; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -21488,24 +21527,13 @@
+ fi
+ 
+ fi;
++  if test "x$MECAB_CONFIG" = "xno"; then
++    { { echo "$as_me:$LINENO: error: mecab-config is missing." >&5
++echo "$as_me: error: mecab-config is missing." >&2;}
++   { (exit 1); exit 1; }; }
++  fi
+ 
+-# mecab
+-
+-# Check whether --with-mecab or --without-mecab was given.
+-if test "${with_mecab+set}" = set; then
+-  withval="$with_mecab"
+-  with_mecab="$withval"
+-else
+-  with_mecab="yes"
+-fi;
+-if test "x$with_mecab" = "xno"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define NO_MECAB 1
+-_ACEOF
+-
+-else
+-  INCLUDES="$INCLUDES `$MECAB_CONFIG --inc-dir`"
++  MECAB_CFLAGS="-I`$MECAB_CONFIG --inc-dir`"
+   LDFLAGS="$LDFLAGS -L`$MECAB_CONFIG --libs-only-L`"
+ 
+ echo "$as_me:$LINENO: checking for mecab_new in -lmecab" >&5
+@@ -21585,6 +21613,7 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
++  CPPFLAGS="$CPPFLAGS $MECAB_CFLAGS"
+   if test "${ac_cv_header_mecab_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for mecab.h" >&5
+ echo $ECHO_N "checking for mecab.h... $ECHO_C" >&6
+@@ -22053,7 +22082,7 @@
+ 
+ 
+ # flags for compile senna
+-CFLAGS="$CFLAGS $OPT_CFLAGS $GCOV_CFLAGS"
++CFLAGS="$CFLAGS $MECAB_CFLAGS $OPT_CFLAGS $GCOV_CFLAGS"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define CONFIGURE_OPTIONS "$ac_configure_args"
diff --git a/textproc/senna/pkg-descr b/textproc/senna/pkg-descr
index df90edf7414a..ecb44e465de3 100644
--- a/textproc/senna/pkg-descr
+++ b/textproc/senna/pkg-descr
@@ -5,4 +5,4 @@ indexing and word indexing to achieve fast, precise searches. While
 senna codebase is rather compact it is scalable enough to handle large
 amounts of data and queries.
 
-WWW: http://dev.razil.jp/project/senna/?lang=en
+WWW: http://qwik.jp/senna/