diff -urN /usr/ports/databases/namazu2/Makefile databases/namazu2/Makefile
--- /usr/ports/databases/namazu2/Makefile	2007-06-12 03:51:27.000000000 +0900
+++ databases/namazu2/Makefile	2008-03-16 20:52:03.000000000 +0900
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	namazu
-PORTVERSION=	2.0.17
+PORTVERSION=	2.0.18
 CATEGORIES+=	databases www textproc
 MASTER_SITES=	http://www.namazu.org/stable/
 PKGNAMESUFFIX=	2
@@ -19,21 +19,29 @@
 
 PM_BASE=	${SITE_PERL}
 
-USE_AUTOTOOLS=	libtool:15
+USE_GNOME=	gnometarget
+USE_PERL5=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-perl5="${PERL}" \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE}
+USE_LDCONFIG=	yes
 
 MAN1=		namazu.1 mknmz.1
-USE_LDCONFIG=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in
 
 post-install:
-.if defined(NOPORTDOCS)
-	${RM} -rf ${PREFIX}/share/namazu/doc
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.css ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/*.html ${DOCSDIR}/en
+	@${MKDIR} ${DOCSDIR}/ja
+	${INSTALL_DATA} ${WRKSRC}/doc/ja/*.html ${DOCSDIR}/ja
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/databases/namazu2/distinfo databases/namazu2/distinfo
--- /usr/ports/databases/namazu2/distinfo	2007-06-12 03:51:27.000000000 +0900
+++ databases/namazu2/distinfo	2008-03-16 20:47:22.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (namazu-2.0.17.tar.gz) = 83a62ae5f8a915dcc2745de1950e4a96
-SHA256 (namazu-2.0.17.tar.gz) = 4697c019e7d19f6bf1aaeb9731fc3b4580877dbff4099b120e7002d13574e745
-SIZE (namazu-2.0.17.tar.gz) = 1379981
+MD5 (namazu-2.0.18.tar.gz) = 340c6a4d2571b042c2fc3e5a5f9c5f5b
+SHA256 (namazu-2.0.18.tar.gz) = d288ca0a81403a34495a465e7ab0e0ec09720851b6be83c0e0ba400f06fa258a
+SIZE (namazu-2.0.18.tar.gz) = 1388095
diff -urN /usr/ports/databases/namazu2/pkg-plist databases/namazu2/pkg-plist
--- /usr/ports/databases/namazu2/pkg-plist	2007-06-12 03:51:28.000000000 +0900
+++ databases/namazu2/pkg-plist	2008-03-16 21:00:17.000000000 +0900
@@ -14,8 +14,9 @@
 bin/rfnmz
 bin/vfnmz
 etc/namazu/mknmzrc-sample
+etc/namazu/mknmzrc-sample.win32
 etc/namazu/namazurc-sample
-@dirrm etc/namazu
+etc/namazu/namazurc-sample.win32
 include/namazu/codeconv.h
 include/namazu/field.h
 include/namazu/hlist.h
@@ -23,6 +24,7 @@
 include/namazu/idxname.h
 include/namazu/l10n-ja.h
 include/namazu/libnamazu.h
+include/namazu/list.h
 include/namazu/parser.h
 include/namazu/query.h
 include/namazu/re.h
@@ -32,28 +34,26 @@
 include/namazu/util.h
 include/namazu/var.h
 include/namazu/wakati.h
-@dirrm include/namazu
 lib/libnmz.a
 lib/libnmz.la
 lib/libnmz.so
-lib/libnmz.so.7
+lib/libnmz.so.8
 libexec/namazu.cgi
+%%PORTDOCS%%%%DOCSDIR%%/en/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/en/nmz.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tips.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/nmz.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/tips.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/namazu.css
+share/locale/de/LC_MESSAGES/namazu.mo
 share/locale/es/LC_MESSAGES/namazu.mo
 share/locale/fr/LC_MESSAGES/namazu.mo
 share/locale/ja/LC_MESSAGES/namazu.mo
 share/locale/ja_JP.SJIS/LC_MESSAGES/namazu.mo
-%%PORTDOCS%%%%DATADIR%%/doc/en/manual.html
-%%PORTDOCS%%%%DATADIR%%/doc/en/nmz.html
-%%PORTDOCS%%%%DATADIR%%/doc/en/tips.html
-%%PORTDOCS%%%%DATADIR%%/doc/en/tutorial.html
-%%PORTDOCS%%@dirrm %%DATADIR%%/doc/en
-%%PORTDOCS%%%%DATADIR%%/doc/ja/manual.html
-%%PORTDOCS%%%%DATADIR%%/doc/ja/nmz.html
-%%PORTDOCS%%%%DATADIR%%/doc/ja/tips.html
-%%PORTDOCS%%%%DATADIR%%/doc/ja/tutorial.html
-%%PORTDOCS%%@dirrm %%DATADIR%%/doc/ja
-%%PORTDOCS%%%%DATADIR%%/doc/namazu.css
-%%PORTDOCS%%@dirrm %%DATADIR%%/doc
+share/locale/pl/LC_MESSAGES/namazu.mo
 %%DATADIR%%/etc/AUTHORS
 %%DATADIR%%/etc/COPYING
 %%DATADIR%%/etc/CREDITS
@@ -70,7 +70,6 @@
 %%DATADIR%%/etc/THANKS
 %%DATADIR%%/etc/TODO
 %%DATADIR%%/etc/namazu.png
-@dirrm %%DATADIR%%/etc
 %%DATADIR%%/filter/apachecache.pl
 %%DATADIR%%/filter/bzip2.pl
 %%DATADIR%%/filter/compress.pl
@@ -88,8 +87,8 @@
 %%DATADIR%%/filter/man.pl
 %%DATADIR%%/filter/mhonarc.pl
 %%DATADIR%%/filter/mp3.pl
-%%DATADIR%%/filter/msword.pl
 %%DATADIR%%/filter/msofficexml.pl
+%%DATADIR%%/filter/msword.pl
 %%DATADIR%%/filter/ooo.pl
 %%DATADIR%%/filter/pdf.pl
 %%DATADIR%%/filter/pipermail.pl
@@ -104,7 +103,6 @@
 %%DATADIR%%/filter/tex.pl
 %%DATADIR%%/filter/visio.pl
 %%DATADIR%%/filter/zip.pl
-@dirrm %%DATADIR%%/filter
 %%DATADIR%%/pl/codeconv.pl
 %%DATADIR%%/pl/conf.pl
 %%DATADIR%%/pl/document.pl
@@ -119,7 +117,6 @@
 %%DATADIR%%/pl/util.pl
 %%DATADIR%%/pl/var.pl
 %%DATADIR%%/pl/wakati.pl
-@dirrm %%DATADIR%%/pl
 %%DATADIR%%/template/NMZ.body
 %%DATADIR%%/template/NMZ.body.es
 %%DATADIR%%/template/NMZ.body.fr
@@ -154,10 +151,18 @@
 %%DATADIR%%/template/NMZ.tips.fr
 %%DATADIR%%/template/NMZ.tips.ja
 %%DATADIR%%/template/NMZ.tips.pl
-@dirrm %%DATADIR%%/template
-@dirrm %%DATADIR%%
-@dirrmtry share/locale/ja_JP.SJIS/LC_MESSAGES
-@dirrmtry share/locale/ja_JP.SJIS
 @dirrmtry var/namazu/index
 @dirrmtry var/namazu
 @dirrmtry var
+@dirrmtry share/locale/ja_JP.SJIS/LC_MESSAGES
+@dirrmtry share/locale/ja_JP.SJIS
+@dirrm %%DATADIR%%/template
+@dirrm %%DATADIR%%/pl
+@dirrm %%DATADIR%%/filter
+@dirrm %%DATADIR%%/etc
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/namazu
+@dirrm etc/namazu