Upgrade to 2.0.16.

Security:	Fixes directory travarsal problem (especially serious in Windows environment)

5 files changed, 23 insertions, 23 deletions

diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 869f263fb6ae..4d4a44059432 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	namazu
-PORTVERSION=	2.0.14
+PORTVERSION=	2.0.16
 CATEGORIES+=	databases www textproc
 MASTER_SITES=	http://www.namazu.org/stable/
 PKGNAMESUFFIX=	2
diff --git a/databases/namazu2/distinfo b/databases/namazu2/distinfo
index 94ee657c9ddf..615c84acdc7e 100644
--- a/databases/namazu2/distinfo
+++ b/databases/namazu2/distinfo
@@ -1,3 +1,3 @@
-MD5 (namazu-2.0.14.tar.gz) = 17d7253ec58241a95c0b80d469be63b2
-SHA256 (namazu-2.0.14.tar.gz) = 7753f6a76a2a4ef2a8817384ab39ae380c3a2a26db17ae67241085b73618cb89
-SIZE (namazu-2.0.14.tar.gz) = 1032273
+MD5 (namazu-2.0.16.tar.gz) = 8a66627a321cc1b1e39e42fff2736fd9
+SHA256 (namazu-2.0.16.tar.gz) = a4b028d8e183b16ad856991587841fe9672621b168b5f89464e161f5ba842752
+SIZE (namazu-2.0.16.tar.gz) = 1185299
diff --git a/databases/namazu2/files/patch-nmz::Makefile.in b/databases/namazu2/files/patch-nmz::Makefile.in
deleted file mode 100644
index 826ba2e52aeb..000000000000
--- a/databases/namazu2/files/patch-nmz::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- nmz/Makefile.in.orig	Wed Apr 14 03:09:04 2004
-+++ nmz/Makefile.in	Wed Apr 21 21:19:46 2004
-@@ -174,7 +174,7 @@
- 
- 
- libnmz_la_DEPENDENCIES = @NMZ_LIBOBJS@
--libnmz_la_LIBADD = @NMZ_LIBOBJS@
-+libnmz_la_LIBADD = @NMZ_LIBOBJS@ @LTLIBINTL@
- libnmz_la_LDFLAGS = -version-info $(LTVERSION)
- subdir = nmz
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/databases/namazu2/files/patch-pl::conf.pl.in b/databases/namazu2/files/patch-pl::conf.pl.in
index ba8df87e1b62..6026d4c1b8e3 100644
--- a/databases/namazu2/files/patch-pl::conf.pl.in
+++ b/databases/namazu2/files/patch-pl::conf.pl.in
@@ -1,27 +1,29 @@
---- pl/conf.pl.in.orig	Thu Aug 23 17:19:52 2001
-+++ pl/conf.pl.in	Sat Oct 13 05:34:48 2001
-@@ -173,17 +173,17 @@
+--- pl/conf.pl.in.orig	Fri Nov 25 15:04:26 2005
++++ pl/conf.pl.in	Mon Mar 13 22:16:41 2006
+@@ -197,19 +197,19 @@
  #
- # Network Kanji Filter nkf v1.62 or later
+ # Network Kanji Filter nkf v1.71 or later
  #
 -$NKF = "@NKF@"; 
 +$NKF = "module_nkf"; 
  
  #
- # KAKASI
+ # KAKASI 2.x or later
+ # Text::Kakasi 1.05 or later
  #
 -$KAKASI = "@DO_KAKASI@";
 +$KAKASI = "module_kakasi";
  
  #
- # ChaSen 1.51 or later (simple wakatigaki)
+ # ChaSen 2.02 or later (simple wakatigaki)
+ # Text::ChaSen 1.03
  #
 -$CHASEN = "@DO_CHASEN@";
 +$CHASEN = "module_chasen";
  
  #
- # ChaSen 1.51 or later (with noun words extraction)
-@@ -193,7 +193,8 @@
+ # ChaSen 2.02 or later (with noun words extraction)
+@@ -224,7 +224,8 @@
  #
  # Default Japanese processer: KAKASI or ChaSen.
  #
diff --git a/databases/namazu2/pkg-plist b/databases/namazu2/pkg-plist
index 70a24bb1b79a..4745c3b837ae 100644
--- a/databases/namazu2/pkg-plist
+++ b/databases/namazu2/pkg-plist
@@ -7,6 +7,8 @@ bin/mailutime
 bin/mknmz
 bin/namazu
 bin/nmz-config
+bin/nmzcat
+bin/nmzegrep
 bin/nmzgrep
 bin/nmzmerge
 bin/rfnmz
@@ -75,10 +77,12 @@ share/namazu/filter/compress.pl
 share/namazu/filter/deb.pl
 share/namazu/filter/dvi.pl
 share/namazu/filter/excel.pl
+share/namazu/filter/gnumeric.pl
 share/namazu/filter/gzip.pl
 share/namazu/filter/hdml.pl
 share/namazu/filter/hnf.pl
 share/namazu/filter/html.pl
+share/namazu/filter/koffice.pl
 share/namazu/filter/macbinary.pl
 share/namazu/filter/mailnews.pl
 share/namazu/filter/man.pl
@@ -87,6 +91,7 @@ share/namazu/filter/mp3.pl
 share/namazu/filter/msword.pl
 share/namazu/filter/ooo.pl
 share/namazu/filter/pdf.pl
+share/namazu/filter/pipermail.pl
 share/namazu/filter/postscript.pl
 share/namazu/filter/powerpoint.pl
 share/namazu/filter/rfc.pl
@@ -96,14 +101,18 @@ share/namazu/filter/taro.pl
 share/namazu/filter/taro56.pl
 share/namazu/filter/taro7_10.pl
 share/namazu/filter/tex.pl
+share/namazu/filter/zip.pl
 @dirrm share/namazu/filter
 share/namazu/pl/codeconv.pl
 share/namazu/pl/conf.pl
+share/namazu/pl/document.pl
+share/namazu/pl/filter.pl
 share/namazu/pl/gettext.pl
 share/namazu/pl/gfilter.pl
 share/namazu/pl/htmlsplit.pl
 share/namazu/pl/nmzidx.pl
 share/namazu/pl/seed.pl
+share/namazu/pl/time.pl
 share/namazu/pl/usage.pl
 share/namazu/pl/util.pl
 share/namazu/pl/var.pl