4 files changed, 7 insertions, 120 deletions

diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index 8591e55156ff..aa16034203d6 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	senna
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.9
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	senna/25130
+MASTER_SITE_SUBDIR=	senna/27317
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Embeddable Fulltext Search Engine
diff --git a/textproc/senna/distinfo b/textproc/senna/distinfo
index e0ccff5a9fc1..608d5002cc45 100644
--- a/textproc/senna/distinfo
+++ b/textproc/senna/distinfo
@@ -1,3 +1,3 @@
-MD5 (senna-1.0.5.tar.gz) = d86c567db245297caf9a906ef7935815
-SHA256 (senna-1.0.5.tar.gz) = cca9a5877fad9d33d7d14ba3db130cee252867066e29c850f962f9ba92c8f5fd
-SIZE (senna-1.0.5.tar.gz) = 1045919
+MD5 (senna-1.0.9.tar.gz) = fed9f190e06fefcbb4d3a44830e96224
+SHA256 (senna-1.0.9.tar.gz) = 569dcfb062beff8c772e4e168568e75db46f9eebf1e13c4ab33508a14552a373
+SIZE (senna-1.0.9.tar.gz) = 1046287
diff --git a/textproc/senna/files/patch-configure b/textproc/senna/files/patch-configure
deleted file mode 100644
index 6ff33598655f..000000000000
--- a/textproc/senna/files/patch-configure
+++ /dev/null
@@ -1,115 +0,0 @@
---- 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-plist b/textproc/senna/pkg-plist
index dbecb2a6192a..a94ec0072ad2 100644
--- a/textproc/senna/pkg-plist
+++ b/textproc/senna/pkg-plist
@@ -1,4 +1,6 @@
+bin/senna
 bin/senna-cfg
+bin/sennachk
 include/senna/senna.h
 lib/libsenna.a
 lib/libsenna.la