Update to 2.0.6.

Add databases to CATEGORIES.

Remove not really needed dependencies on wv and xl.

3 files changed, 27 insertions, 16 deletions

diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile
index 7ca4edfc8741..9eea05363115 100644
--- a/japanese/namazu2/Makefile
+++ b/japanese/namazu2/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	namazu2
-PORTVERSION=	2.0.5
-CATEGORIES=	japanese textproc
+PORTNAME=	namazu
+PORTVERSION=	2.0.6
+CATEGORIES=	japanese textproc databases
 MASTER_SITES=	http://www.namazu.org/stable/
-DISTNAME=	namazu-${PORTVERSION}
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	knu@FreeBSD.org
 
@@ -19,8 +19,9 @@ BUILD_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic \
 		${DEPEND_WAKATI}
 RUN_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic \
 		${PM_BASE}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf \
-		${DEPEND_WAKATI} \
-		${DEPEND_MSOFFICE}
+		${DEPEND_WAKATI}
+#		xlHtml:${PORTSDIR}/textproc/xlhtml \
+#		wvHtml:${PORTSDIR}/textproc/wv
 
 PM_BASE=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
@@ -36,13 +37,7 @@ DEPEND_WAKATI=	${PM_BASE}/${PERL_ARCH}/Text/ChaSen.pm:${PORTSDIR}/japanese/p5-Te
 DEPEND_WAKATI=	${PM_BASE}/${PERL_ARCH}/Text/Kakasi.pm:${PORTSDIR}/japanese/p5-Text-Kakasi
 .endif
 
-.if !defined(WITHOUT_MSOFFICE)
-DEPEND_MSOFFICE=	xlHtml:${PORTSDIR}/textproc/xlhtml \
-			wvHtml:${PORTSDIR}/textproc/wv
-.endif
-
 post-install:
-	${LN} -sf ${PREFIX}/lib/libnmz.so.4 ${PREFIX}/lib/libnmz.so
 .if defined(NOPORTDOCS)
 	${RM} -rf ${PREFIX}/share/namazu/doc
 .endif
diff --git a/japanese/namazu2/distinfo b/japanese/namazu2/distinfo
index f2dece8472b1..21a8cf2048f7 100644
--- a/japanese/namazu2/distinfo
+++ b/japanese/namazu2/distinfo
@@ -1 +1 @@
-MD5 (namazu-2.0.5.tar.gz) = 32b3b80718f038c410045875893b47ae
+MD5 (namazu-2.0.6.tar.gz) = 346fd4a6113e0f7818bd19b3b33fe78c
diff --git a/japanese/namazu2/pkg-plist b/japanese/namazu2/pkg-plist
index 4d4144282030..7aedf7e04f28 100644
--- a/japanese/namazu2/pkg-plist
+++ b/japanese/namazu2/pkg-plist
@@ -1,11 +1,14 @@
+bin/adnmz
 bin/bnamazu
 bin/gcnmz
 bin/kwnmz
+bin/lnnmz
 bin/mailutime
 bin/mknmz
 bin/namazu
 bin/nmz-config
 bin/nmzgrep
+bin/nmzmerge
 bin/rfnmz
 bin/vfnmz
 etc/namazu/mknmzrc-sample
@@ -30,7 +33,7 @@ include/namazu/wakati.h
 lib/libnmz.a
 lib/libnmz.la
 lib/libnmz.so
-lib/libnmz.so.4
+lib/libnmz.so.5
 libexec/namazu.cgi
 share/locale/es/LC_MESSAGES/namazu.mo
 share/locale/fr/LC_MESSAGES/namazu.mo
@@ -48,20 +51,31 @@ share/locale/ja_JP.SJIS/LC_MESSAGES/namazu.mo
 %%PORTDOCS%%@dirrm share/namazu/doc/ja
 %%PORTDOCS%%share/namazu/doc/namazu.css
 %%PORTDOCS%%@dirrm share/namazu/doc
+share/namazu/etc/AUTHORS
+share/namazu/etc/COPYING
 share/namazu/etc/CREDITS
+share/namazu/etc/ChangeLog
 share/namazu/etc/ChangeLog.1
+share/namazu/etc/HACKING
+share/namazu/etc/HACKING-ja
+share/namazu/etc/INSTALL
 share/namazu/etc/INSTALL-ja
+share/namazu/etc/NEWS
+share/namazu/etc/README
 share/namazu/etc/README-es
 share/namazu/etc/README-ja
+share/namazu/etc/THANKS
+share/namazu/etc/TODO
 share/namazu/etc/namazu.png
-share/namazu/etc/namazu.spec
-share/namazu/etc/namazu.spec.in
 @dirrm share/namazu/etc
 share/namazu/filter/bzip2.pl
 share/namazu/filter/compress.pl
+share/namazu/filter/deb.pl
+share/namazu/filter/dvi.pl
 share/namazu/filter/excel.pl
 share/namazu/filter/gfilter.pl
 share/namazu/filter/gzip.pl
+share/namazu/filter/hdml.pl
 share/namazu/filter/hnf.pl
 share/namazu/filter/html.pl
 share/namazu/filter/mailnews.pl
@@ -69,8 +83,10 @@ share/namazu/filter/man.pl
 share/namazu/filter/mhonarc.pl
 share/namazu/filter/msword.pl
 share/namazu/filter/pdf.pl
+share/namazu/filter/postscript.pl
 share/namazu/filter/powerpoint.pl
 share/namazu/filter/rfc.pl
+share/namazu/filter/rpm.pl
 share/namazu/filter/taro.pl
 share/namazu/filter/tex.pl
 @dirrm share/namazu/filter