- Update snapshot to 20060130.

- Depends on normal mecab rather than mecab-razil.

Submitted by:	Tasuku SUENAGA <a@razil.jp>

5 files changed, 7 insertions, 79 deletions

diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index fbffdbe..1fbad39 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -8,13 +8,14 @@
 PORTNAME=	senna
 PORTVERSION=	0.${SNAPDATE}
 CATEGORIES=	textproc
-MASTER_SITES=	http://dev.razil.jp/archive/senna/
+MASTER_SITES=	http://dist.bsdlab.org/ \
+		http://dev.razil.jp/archive/senna/
 DISTNAME=	${PORTNAME}-${SNAPDATE}-svn
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Embeddable Fulltext Search Engine
 
-LIB_DEPENDS=	mecab-razil:${PORTSDIR}/japanese/mecab-razil
+LIB_DEPENDS=	mecab:${PORTSDIR}/japanese/mecab
 
 USE_AUTOTOOLS=	automake:14 autoconf:259 libtool:15
 USE_GMAKE=	YES
@@ -24,11 +25,7 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-SNAPDATE=	20050827
+SNAPDATE=	20060130
 SENNA_HOME?=	/var/senna
 
-post-patch:
-	cd ${WRKSRC}; \
-	${TOUCH} -r configure.ac.orig configure.ac
-
 .include <bsd.port.mk>
diff --git a/textproc/senna/distinfo b/textproc/senna/distinfo
index 55c5f04..42fb51d 100644
--- a/textproc/senna/distinfo
+++ b/textproc/senna/distinfo
@@ -1,3 +1,3 @@
-MD5 (senna-20050827-svn.tar.gz) = c5c0fcb8649b309ad6fb8d5bc78b849d
-SHA256 (senna-20050827-svn.tar.gz) = ddd9217fe218e7e107ee39ec963907ad9d2753eacb76d0ab4b291635da11855c
-SIZE (senna-20050827-svn.tar.gz) = 353158
+MD5 (senna-20060130-svn.tar.gz) = 3d13b040533d825c81dd89cc2a5a9efe
+SHA256 (senna-20060130-svn.tar.gz) = 075924055cdcdf340591a6379fe9c3899660cffbb7a588f52d2ccccb5350ee34
+SIZE (senna-20060130-svn.tar.gz) = 490772
diff --git a/textproc/senna/files/patch-configure b/textproc/senna/files/patch-configure
deleted file mode 100644
index 48379a4..0000000
--- a/textproc/senna/files/patch-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.orig	Thu May  5 20:51:43 2005
-+++ configure	Thu May  5 20:52:31 2005
-@@ -18635,13 +18635,13 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for mecab_new3 in -lmecab" >&5
--echo $ECHO_N "checking for mecab_new3 in -lmecab... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for mecab_new3 in -lmecab-razil" >&5
-+echo $ECHO_N "checking for mecab_new3 in -lmecab-razil... $ECHO_C" >&6
- if test "${ac_cv_lib_mecab_mecab_new3+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmecab  $LIBS"
-+LIBS="-lmecab-razil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -18703,7 +18703,7 @@
- #define HAVE_LIBMECAB 1
- _ACEOF
- 
--  LIBS="-lmecab $LIBS"
-+  LIBS="-lmecab-razil $LIBS"
- 
- else
-   echo "No libmecab found (You need a patched version, if using mecab without mecab_new3)"; exit 1
diff --git a/textproc/senna/files/patch-configure.ac b/textproc/senna/files/patch-configure.ac
deleted file mode 100644
index 3a58d8e..0000000
--- a/textproc/senna/files/patch-configure.ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	Thu May  5 21:23:50 2005
-+++ configure.ac	Thu May  5 21:24:17 2005
-@@ -11,6 +11,6 @@
- AM_PROG_LIBTOOL
- AC_CONFIG_FILES([Makefile test/Makefile lib/Makefile])
- AC_SUBST(SENNA_HOME)
--AC_CHECK_LIB(mecab, mecab_new3, [],[echo "No libmecab found (You need a patched version, if using mecab without mecab_new3)"; exit 1])
-+AC_CHECK_LIB(mecab-razil, mecab_new3, [],[echo "No libmecab-razil found (You need a patched version, if using mecab without mecab_new3)"; exit 1])
- 
- AC_OUTPUT
diff --git a/textproc/senna/files/patch-senna_in.h b/textproc/senna/files/patch-senna_in.h
deleted file mode 100644
index 198ff20..0000000
--- a/textproc/senna/files/patch-senna_in.h
+++ /dev/null
@@ -1,31 +0,0 @@
---- lib/senna_in.h.orig	Sat Aug 27 23:59:02 2005
-+++ lib/senna_in.h	Sun Aug 28 13:13:56 2005
-@@ -14,16 +14,28 @@
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-+#ifndef _SENNA_IN_H
-+#define _SENNA_IN_H
-+
- #include "config.h"
- 
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif /* HAVE_STDLIB_H */
- 
-+/* #include <sys/types.h> */
-+#include <unistd.h>
-+
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#else
-+#include <inttypes.h>
-+typedef	uint8_t	uint_least8_t;
-+typedef	int8_t	int_least8_t;
- #endif /* HAVE_STDINT_H */
- 
- #ifndef _SENNA_H
- #include "senna.h"
- #endif /* _SENNA_H */
-+
-+#endif /* _SENNA_IN_H */