Pull up versions 1.2 of Makefile PLIST and distinfo to the netbsd-1-6 pkgsrc

branch.

Requested by Takahiro Kambe.

> Date: Wed,  4 Sep 2002 15:52:29 +0300 (EEST)
> From: Takahiro Kambe <taca@netbsd.org>
>
> Module Name:    pkgsrc
> Committed By:   taca
> Date:           Wed Sep  4 12:52:29 UTC 2002
>
> Modified Files:
>         pkgsrc/textproc/namazu2: Makefile PLIST distinfo
> Removed Files:
>         pkgsrc/textproc/namazu2/patches: patch-af patch-ag patch-ah patch-ai
>             patch-am patch-an patch-ao
>
> Log Message:
> Update namazu package to 2.0.12.
>
> It fixes some Cross Site Scripting security problem.

10 files changed, 26 insertions, 24 deletions

diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index 67d7b901d18..cbccdbe0e1e 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+# $NetBSD: Makefile,v 1.1.1.1.4.1 2002/09/05 09:56:11 agc Exp $
 # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
 
-DISTNAME=	namazu-2.0.10
-PKGREVISION=	2
+DISTNAME=	namazu-2.0.12
 CATEGORIES=	japanese textproc www
 MASTER_SITES=	ftp://ftp.namazu.org/namazu/stable/ \
 		http://www.namazu.org/stable/
 
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	namazu-2.0.12-de.diff
+PATCH_DIST_STRIP= -p1
+
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.namazu.org/index.html.en
 COMMENT=	Full-text search system intended for easy use
diff --git a/textproc/namazu2/PLIST b/textproc/namazu2/PLIST
index a53cb630cc1..273ca326b93 100644
--- a/textproc/namazu2/PLIST
+++ b/textproc/namazu2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.4.1 2002/09/05 09:56:12 agc Exp $
 bin/adnmz
 bin/bnamazu
 bin/gcnmz
@@ -34,8 +34,8 @@ include/namazu/wakati.h
 lib/libnmz.a
 lib/libnmz.la
 lib/libnmz.so
-lib/libnmz.so.5
-lib/libnmz.so.5.0
+lib/libnmz.so.6
+lib/libnmz.so.6.0
 @exec ${MKDIR} %D/libdata/namazu 2>/dev/null|| /usr/bin/true
 @exec ${MKDIR} %D/libdata/namazu/index 2>/dev/null || /usr/bin/true
 @dirrm libdata/namazu/index
@@ -60,8 +60,8 @@ share/namazu/doc/ja/tutorial.html
 share/namazu/doc/namazu.css
 @dirrm share/namazu/doc
 share/namazu/etc/AUTHORS
-share/namazu/etc/CREDITS
 share/namazu/etc/COPYING
+share/namazu/etc/CREDITS
 share/namazu/etc/ChangeLog
 share/namazu/etc/ChangeLog.1
 share/namazu/etc/HACKING
@@ -116,18 +116,22 @@ share/namazu/template/NMZ.body.es
 share/namazu/template/NMZ.body.fr
 share/namazu/template/NMZ.body.ja
 share/namazu/template/NMZ.foot
+share/namazu/template/NMZ.foot.de
 share/namazu/template/NMZ.foot.es
 share/namazu/template/NMZ.foot.fr
 share/namazu/template/NMZ.foot.ja
 share/namazu/template/NMZ.head
+share/namazu/template/NMZ.head.de
 share/namazu/template/NMZ.head.es
 share/namazu/template/NMZ.head.fr
 share/namazu/template/NMZ.head.ja
 share/namazu/template/NMZ.result.normal
+share/namazu/template/NMZ.result.normal.de
 share/namazu/template/NMZ.result.normal.es
 share/namazu/template/NMZ.result.normal.fr
 share/namazu/template/NMZ.result.normal.ja
 share/namazu/template/NMZ.result.short
+share/namazu/template/NMZ.result.short.de
 share/namazu/template/NMZ.result.short.es
 share/namazu/template/NMZ.result.short.fr
 share/namazu/template/NMZ.result.short.ja
diff --git a/textproc/namazu2/distinfo b/textproc/namazu2/distinfo
index a31e16ffef9..34cfd7e1e1e 100644
--- a/textproc/namazu2/distinfo
+++ b/textproc/namazu2/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+$NetBSD: distinfo,v 1.1.1.1.4.1 2002/09/05 09:56:12 agc Exp $
 
-SHA1 (namazu-2.0.10.tar.gz) = 43a7f32ff0d86b4e65dfa9fa6c1ad90a0636a8a8
-Size (namazu-2.0.10.tar.gz) = 833838 bytes
+SHA1 (namazu-2.0.12.tar.gz) = ef9ad4bb38150c1857b036e8302de9fdb7049309
+Size (namazu-2.0.12.tar.gz) = 870307 bytes
+SHA1 (namazu-2.0.12-de.diff) = b0a1c825454bd45cc4d9c6baa7efa09e9d8fd547
+Size (namazu-2.0.12-de.diff) = 6801 bytes
 SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f
 SHA1 (patch-ab) = c5baa6b5555c4fee0215980ca8df3880fa93390f
-SHA1 (patch-af) = a5a4c913980e163813f06749445c980eb4644737
-SHA1 (patch-ag) = 626af603170bca527cedc4d27e07e1c07259a701
-SHA1 (patch-ah) = e38d7efb8e1e8a6e80e96fe84f9c180ec8a7fbb4
-SHA1 (patch-ai) = 49d685ddd93207f984813e05a21da60fe1862bef
 SHA1 (patch-al) = f05436ec713ae1bcb01dd7b1a9a7a598018e9dd7
-SHA1 (patch-am) = abce3739aa99e9ee19bf4b56f961c33cc33004be
-SHA1 (patch-an) = fa073b9baef46cd31348d048816f8592a8b35f20
-SHA1 (patch-ao) = 16070a6b7f9b50e2e14d3256d6bab44c9ea52aca
diff --git a/textproc/namazu2/patches/patch-af b/textproc/namazu2/patches/patch-af
index ce6dd07f3e9..5f17ec38bfc 100644
--- a/textproc/namazu2/patches/patch-af
+++ b/textproc/namazu2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+$NetBSD: patch-af,v 1.1.1.1.4.1 2002/09/05 09:56:13 agc Exp $
 
 --- lib/getopt.c.orig	Mon Oct 11 13:25:11 1999
 +++ lib/getopt.c
diff --git a/textproc/namazu2/patches/patch-ag b/textproc/namazu2/patches/patch-ag
index 60bedf47bf7..74694e534a0 100644
--- a/textproc/namazu2/patches/patch-ag
+++ b/textproc/namazu2/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+$NetBSD: patch-ag,v 1.1.1.1.4.1 2002/09/05 09:56:13 agc Exp $
 
 --- nmz/regex.c.orig	Sat Sep  1 18:40:52 2001
 +++ nmz/regex.c
diff --git a/textproc/namazu2/patches/patch-ah b/textproc/namazu2/patches/patch-ah
index fc7dd6efb43..1b080038396 100644
--- a/textproc/namazu2/patches/patch-ah
+++ b/textproc/namazu2/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+$NetBSD: patch-ah,v 1.1.1.1.4.1 2002/09/05 09:56:14 agc Exp $
 
 --- nmz/util.c.orig	Sun Sep  2 16:13:37 2001
 +++ nmz/util.c
diff --git a/textproc/namazu2/patches/patch-ai b/textproc/namazu2/patches/patch-ai
index f02c7aa182e..2c6d5d364ec 100644
--- a/textproc/namazu2/patches/patch-ai
+++ b/textproc/namazu2/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+$NetBSD: patch-ai,v 1.1.1.1.4.1 2002/09/05 09:56:14 agc Exp $
 
 --- nmz/util.h.orig	Mon Jul  9 16:30:37 2001
 +++ nmz/util.h
diff --git a/textproc/namazu2/patches/patch-am b/textproc/namazu2/patches/patch-am
index 3dc65d4463c..a3d06c6362b 100644
--- a/textproc/namazu2/patches/patch-am
+++ b/textproc/namazu2/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+$NetBSD: patch-am,v 1.1.1.1.4.1 2002/09/05 09:56:14 agc Exp $
 
 --- filter/excel.pl.orig	Fri Dec 15 14:37:41 2000
 +++ filter/excel.pl
diff --git a/textproc/namazu2/patches/patch-an b/textproc/namazu2/patches/patch-an
index 582e0e65386..484ab386a44 100644
--- a/textproc/namazu2/patches/patch-an
+++ b/textproc/namazu2/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+$NetBSD: patch-an,v 1.1.1.1.4.1 2002/09/05 09:56:15 agc Exp $
 
 --- filter/msword.pl.orig	Fri Jul 13 10:14:26 2001
 +++ filter/msword.pl
diff --git a/textproc/namazu2/patches/patch-ao b/textproc/namazu2/patches/patch-ao
index 8679af32687..d66abbd9946 100644
--- a/textproc/namazu2/patches/patch-ao
+++ b/textproc/namazu2/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+$NetBSD: patch-ao,v 1.1.1.1.4.1 2002/09/05 09:56:15 agc Exp $
 
 --- filter/powerpoint.pl.orig	Tue Dec 26 13:59:01 2000
 +++ filter/powerpoint.pl