ports/129958: [PATCH] japanese/chasen-base: update to 2.4.4

[Paul Guyot]

>Number:         129958
>Category:       ports
>Synopsis:       [PATCH] japanese/chasen-base: update to 2.4.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 26 16:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Paul Guyot
>Release:        FreeBSD 7.0-RELEASE amd64
>Organization:
>Environment:
FreeBSD localhost 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Wed May 21 10:13:51 UTC 2008     root at localhost.localdomain:/usr/obj/usr/src/sys/OVH7  amd64
>Description:
- Update to 2.4.4

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ru chasen-base.orig/Makefile chasen-base/Makefile
--- chasen-base.orig/Makefile	2008-11-17 20:43:55.000000000 +0000
+++ chasen-base/Makefile	2008-12-26 15:58:55.000000000 +0000
@@ -7,16 +7,12 @@
 #
 
 PORTNAME=	chasen
-PORTVERSION=	2.3.3
-PORTREVISION=	3
+PORTVERSION=	2.4.4
 CATEGORIES=	japanese textproc
-MASTER_SITES=	http://chasen.aist-nara.ac.jp/stable/chasen/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=     chasen-legacy/32224
 PKGNAMESUFFIX=	-base
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	chasen-2.3.3.20030821.patch chasen-2.3.3.20030822.patch chasen-2.3.3.20031024.patch
-PATCH_DIST_STRIP=	-p0
-
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Japanese Morphological Analysis System
 
diff -ru chasen-base.orig/distinfo chasen-base/distinfo
--- chasen-base.orig/distinfo	2005-11-24 23:01:53.000000000 +0000
+++ chasen-base/distinfo	2008-12-26 16:01:38.000000000 +0000
@@ -1,12 +1,3 @@
-MD5 (chasen-2.3.3.tar.gz) = 629e90d9490bac95606c38c2d344cc5f
-SHA256 (chasen-2.3.3.tar.gz) = a91b422398f30c9c6c2d27fdbcc1aeb8e026ded44d6e729fc060d5d18bfaefdb
-SIZE (chasen-2.3.3.tar.gz) = 425981
-MD5 (chasen-2.3.3.20030821.patch) = 44b14a50c8269f982fc0d59cb580ecc5
-SHA256 (chasen-2.3.3.20030821.patch) = 5eef51a5037fee614675ee8ace0578a046e2fc9e91efd7105b93ae36f4e65a5e
-SIZE (chasen-2.3.3.20030821.patch) = 3496
-MD5 (chasen-2.3.3.20030822.patch) = 22466f08c3916b415d222508fdcc9bbe
-SHA256 (chasen-2.3.3.20030822.patch) = f6662869d61280908233264f211a76750cac6339edf8c7f25efa6b9547717cf7
-SIZE (chasen-2.3.3.20030822.patch) = 2007
-MD5 (chasen-2.3.3.20031024.patch) = 1b8e836d5ed378e6f8b7d43fa8cf7b68
-SHA256 (chasen-2.3.3.20031024.patch) = 7c0b3a6e5ac089e22c43c56d162cfd97f086d1358f2af54e987ee62afaea116e
-SIZE (chasen-2.3.3.20031024.patch) = 1095
+MD5 (chasen-2.4.4.tar.gz) = 42b20d41a33e1f5e7a05cc56aaa548b0
+SHA256 (chasen-2.4.4.tar.gz) = 09e41f681097f87ba6c953d3724c34c1826c3cfa590898a2166fb310a006f932
+SIZE (chasen-2.4.4.tar.gz) = 845720
diff -ru chasen-base.orig/files/patch-dartsdic.cpp chasen-base/files/patch-dartsdic.cpp
--- chasen-base.orig/files/patch-dartsdic.cpp	2008-06-22 20:11:26.000000000 +0000
+++ chasen-base/files/patch-dartsdic.cpp	2008-12-26 15:47:15.000000000 +0000
@@ -1,15 +1,6 @@
---- lib/dartsdic.cpp.orig	2003-07-30 18:06:57.000000000 +0200
-+++ lib/dartsdic.cpp	2008-06-22 21:44:25.000000000 +0200
-@@ -68,7 +68,7 @@
- 
-     da = (darts_t*)cha_malloc(sizeof(darts_t));
-     da->da_mmap = cha_mmap_file(daname);
--    darts->setArray(cha_mmap_map(da->da_mmap));
-+    darts->set_array(cha_mmap_map(da->da_mmap));
-     da->da = darts;
-     da->lex_mmap = cha_mmap_file(lexname);
-     da->dat_mmap = cha_mmap_file(datname);
-@@ -160,7 +160,7 @@
+--- lib/dartsdic.cpp.orig	2008-12-26 15:45:32.000000000 +0000
++++ lib/dartsdic.cpp	2008-12-26 15:46:13.000000000 +0000
+@@ -168,7 +168,7 @@
  {
      Hash::iterator i, last;
      Hash* entries = builder->entries;
@@ -18,11 +9,11 @@
      size_t* lens = new size_t[entries->size()];
      long* vals = new long[entries->size()];
      int size = 0;
-@@ -177,7 +177,7 @@
+@@ -185,7 +185,7 @@
  	    lex_indices.push_back(i->second);
  	}
  	lens[size] = key.size();
--	(const char*)keys[size] = key.data();
+-	keys[size] = (char*) key.data();
 +	keys[size] = (const char*) key.data();
  	vals[size] = redump_lex(lens[size], lex_indices, tmpfile, lexfile);
  	if (vals[size] < 0) {
diff -ru chasen-base.orig/pkg-plist chasen-base/pkg-plist
--- chasen-base.orig/pkg-plist	2008-11-22 08:22:28.000000000 +0000
+++ chasen-base/pkg-plist	2008-12-26 16:06:17.000000000 +0000
@@ -1,10 +1,10 @@
- at comment $NetBSD: PLIST,v 1.1.1.1 2001/01/10 14:45:03 taca Exp $
+ at comment $NetBSD: PLIST,v 1.5 2007/08/02 15:03:10 taca Exp $
 bin/chasen
 bin/chasen-config
 include/chasen.h
 lib/libchasen.a
 lib/libchasen.so
-lib/libchasen.so.0
+lib/libchasen.so.2
 libexec/chasen/makeda
 libexec/chasen/makemat
 @dirrm libexec/chasen


>Release-Note:
>Audit-Trail:
>Unformatted: