8 files changed, 67 insertions, 20 deletions

diff --git a/devel/gonzui/Makefile b/devel/gonzui/Makefile
index 12cfa077cd70..5e8b0dfe8688 100644
--- a/devel/gonzui/Makefile
+++ b/devel/gonzui/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gonzui
-PORTVERSION=	0.2
+PORTVERSION=	0.4
 CATEGORIES=	devel
-MASTER_SITES=	http://namazu.org/~satoru/gonzui/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gonzui
 
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	A source code search engine
diff --git a/devel/gonzui/distinfo b/devel/gonzui/distinfo
index e72dfaa0b439..a265bae5234c 100644
--- a/devel/gonzui/distinfo
+++ b/devel/gonzui/distinfo
@@ -1,2 +1,2 @@
-MD5 (gonzui-0.2.tar.gz) = 300acdc7241b4b629469f229713e84d6
-SIZE (gonzui-0.2.tar.gz) = 200351
+MD5 (gonzui-0.4.tar.gz) = b58accfc400f9b75e4888bd13051b8e2
+SIZE (gonzui-0.4.tar.gz) = 274822
diff --git a/devel/gonzui/files/patch-langscan-php-php.c b/devel/gonzui/files/patch-langscan-php-php.c
new file mode 100644
index 000000000000..1e90cab7f726
--- /dev/null
+++ b/devel/gonzui/files/patch-langscan-php-php.c
@@ -0,0 +1,13 @@
+--- langscan/php/php.c-	Mon Feb  7 11:17:11 2005
++++ langscan/php/php.c	Mon Feb  7 11:17:27 2005
+@@ -31,9 +31,9 @@
+ {
+   VALUE user_io = (VALUE)*user_data_p;
+   VALUE str = rb_funcall(user_io, id_read, 1, INT2NUM(maxlen));
++  size_t len = maxlen;
+   if (NIL_P(str))
+     return 0;
+-  size_t len = maxlen;
+   StringValue(str);
+   if (RSTRING(str)->len < len)
+     len = RSTRING(str)->len;
diff --git a/devel/gonzui/files/patch-langscan-php-phptok.c.dist b/devel/gonzui/files/patch-langscan-php-phptok.c.dist
new file mode 100644
index 000000000000..fbe9d3d18b24
--- /dev/null
+++ b/devel/gonzui/files/patch-langscan-php-phptok.c.dist
@@ -0,0 +1,13 @@
+--- langscan/php/phptok.c.dist-	Wed Feb  9 03:01:40 2005
++++ langscan/php/phptok.c.dist	Wed Feb  9 03:01:59 2005
+@@ -1144,8 +1144,8 @@
+ /* rule 7 can match eol */
+ YY_RULE_SETUP
+ #line 76 "phptok.l"
+-{ UPD;
+-	char *p = yytext+3;
++{ char *p = NULL; UPD;
++	p = yytext+3;
+ 	p += strspn(p, " \t");
+ 	heredocident = strdup(p);
+ 	*strpbrk(heredocident, "\r\n") = '\0';
diff --git a/devel/gonzui/files/patch-langscan-python-python.c b/devel/gonzui/files/patch-langscan-python-python.c
new file mode 100644
index 000000000000..bd82c6e26a85
--- /dev/null
+++ b/devel/gonzui/files/patch-langscan-python-python.c
@@ -0,0 +1,13 @@
+--- langscan/python/python.c-	Mon Feb  7 11:18:05 2005
++++ langscan/python/python.c	Mon Feb  7 11:18:11 2005
+@@ -31,9 +31,9 @@
+ {
+   VALUE user_io = (VALUE)*user_data_p;
+   VALUE str = rb_funcall(user_io, id_read, 1, INT2NUM(maxlen));
++  size_t len = maxlen;
+   if (NIL_P(str))
+     return 0;
+-  size_t len = maxlen;
+   StringValue(str);
+   if (RSTRING(str)->len < len)
+     len = RSTRING(str)->len;
diff --git a/devel/gonzui/files/patch-util.rb b/devel/gonzui/files/patch-util.rb
deleted file mode 100644
index c9989020698f..000000000000
--- a/devel/gonzui/files/patch-util.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- gonzui/util.rb~	Mon Nov 29 08:29:48 2004
-+++ gonzui/util.rb	Wed Dec  1 17:29:47 2004
-@@ -223,7 +223,7 @@
- 
-   module UTF8
-     # FIXME: should be customizable.
--    Preference = ["iso-2022-jp", "euc-jp", "utf-8", "shift_jis", "windows-31j"]
-+    Preference = ["iso-2022-jp", "euc-jp", "utf-8", "shift_jis"]
- 
-     module_function
-     def to_utf8 (str)
diff --git a/devel/gonzui/pkg-descr b/devel/gonzui/pkg-descr
index cdb43c0c5d1b..438ec66675b2 100644
--- a/devel/gonzui/pkg-descr
+++ b/devel/gonzui/pkg-descr
@@ -5,4 +5,4 @@ goal is to help programmers develop programs effectively by creating a
 source code search engine that covers vast quantities of open source
 codes available on the Internet.
 
-WWW: http://namazu.org/~satoru/gonzui/
+WWW: http://gonzui.sourceforge.net/
diff --git a/devel/gonzui/pkg-plist b/devel/gonzui/pkg-plist
index 4ffb75d43e91..78aa90cdb203 100644
--- a/devel/gonzui/pkg-plist
+++ b/devel/gonzui/pkg-plist
@@ -12,42 +12,60 @@ share/gonzui/doc/gonzui.js
 share/gonzui/doc/text.png
 %%RUBY_SITEARCHLIBDIR%%/langscan/c/c.so
 %%RUBY_SITEARCHLIBDIR%%/langscan/java/java.so
+%%RUBY_SITEARCHLIBDIR%%/langscan/php/php.so
+%%RUBY_SITEARCHLIBDIR%%/langscan/python/python.so
+%%RUBY_SITEARCHLIBDIR%%/gonzui/delta.so
+%%RUBY_SITEARCHLIBDIR%%/gonzui/texttokenizer.so
 %%RUBY_SITEARCHLIBDIR%%/gonzui/webapp/xmlformatter.so
 %%RUBY_SITELIBDIR%%/gonzui.rb
 %%RUBY_SITELIBDIR%%/gonzui/apt.rb
 %%RUBY_SITELIBDIR%%/gonzui/autopack.rb
+%%RUBY_SITELIBDIR%%/gonzui/bdbdbm.rb
 %%RUBY_SITELIBDIR%%/gonzui/cmdapp.rb
 %%RUBY_SITELIBDIR%%/gonzui/cmdapp/app.rb
 %%RUBY_SITELIBDIR%%/gonzui/cmdapp/search.rb
 %%RUBY_SITELIBDIR%%/gonzui/config.rb
 %%RUBY_SITELIBDIR%%/gonzui/dbm.rb
+%%RUBY_SITELIBDIR%%/gonzui/deindexer.rb
 %%RUBY_SITELIBDIR%%/gonzui/extractor.rb
 %%RUBY_SITELIBDIR%%/gonzui/gettext.rb
 %%RUBY_SITELIBDIR%%/gonzui/importer.rb
+%%RUBY_SITELIBDIR%%/gonzui/indexer.rb
 %%RUBY_SITELIBDIR%%/gonzui/logger.rb
+%%RUBY_SITELIBDIR%%/gonzui/monitor.rb
 %%RUBY_SITELIBDIR%%/gonzui/package.rb
-%%RUBY_SITELIBDIR%%/gonzui/plugin.rb
+%%RUBY_SITELIBDIR%%/gonzui/progressbar.rb
+%%RUBY_SITELIBDIR%%/gonzui/searcher.rb
+%%RUBY_SITELIBDIR%%/gonzui/searchquery.rb
+%%RUBY_SITELIBDIR%%/gonzui/searchresult.rb
 %%RUBY_SITELIBDIR%%/gonzui/type.rb
 %%RUBY_SITELIBDIR%%/gonzui/util.rb
 %%RUBY_SITELIBDIR%%/gonzui/webapp.rb
-%%RUBY_SITELIBDIR%%/gonzui/webapp/_searcher.rb
-%%RUBY_SITELIBDIR%%/gonzui/webapp/_servlet.rb
-%%RUBY_SITELIBDIR%%/gonzui/webapp/_webrick.rb
+%%RUBY_SITELIBDIR%%/gonzui/webapp/advsearch.rb
 %%RUBY_SITELIBDIR%%/gonzui/webapp/filehandler.rb
 %%RUBY_SITELIBDIR%%/gonzui/webapp/jsfeed.rb
 %%RUBY_SITELIBDIR%%/gonzui/webapp/markup.rb
 %%RUBY_SITELIBDIR%%/gonzui/webapp/search.rb
+%%RUBY_SITELIBDIR%%/gonzui/webapp/servlet.rb
 %%RUBY_SITELIBDIR%%/gonzui/webapp/source.rb
 %%RUBY_SITELIBDIR%%/gonzui/webapp/stat.rb
 %%RUBY_SITELIBDIR%%/gonzui/webapp/top.rb
+%%RUBY_SITELIBDIR%%/gonzui/webapp/url.rb
+%%RUBY_SITELIBDIR%%/gonzui/webapp/webrick.rb
 %%RUBY_SITELIBDIR%%/langscan.rb
 %%RUBY_SITELIBDIR%%/langscan/_common.rb
 %%RUBY_SITELIBDIR%%/langscan/c.rb
+%%RUBY_SITELIBDIR%%/langscan/elisp.rb
 %%RUBY_SITELIBDIR%%/langscan/java.rb
+%%RUBY_SITELIBDIR%%/langscan/php.rb
+%%RUBY_SITELIBDIR%%/langscan/python.rb
 %%RUBY_SITELIBDIR%%/langscan/ruby.rb
+%%RUBY_SITELIBDIR%%/langscan/text.rb
 @dirrm share/gonzui/catalog
 @dirrm share/gonzui/doc
 @dirrm share/gonzui
+@dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/python
+@dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/php
 @dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/java
 @dirrm %%RUBY_SITEARCHLIBDIR%%/langscan/c
 @dirrm %%RUBY_SITEARCHLIBDIR%%/langscan