Update namazu2 package 2.0.12nb2.

- honor PKGLOCALEDIR in PLIST (thanks pkglint(1))
- incorporate some filter processing from namazu's stable branch.

	filter/pdf.pl:Adapted to xpdf 2.02
	filter/mhonarc.pl: Add codeconv::toeuc() after uncommentize().

5 files changed, 101 insertions, 8 deletions

diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index d4b4e08a8cf..4b0288fef3f 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/29 04:54:09 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/25 14:12:12 taca Exp $
 # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
 
 DISTNAME=	namazu-2.0.12
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	japanese textproc www
 MASTER_SITES=	ftp://ftp.namazu.org/namazu/stable/ \
 		http://www.namazu.org/stable/
diff --git a/textproc/namazu2/PLIST b/textproc/namazu2/PLIST
index de24c96f514..ce5da0a026a 100644
--- a/textproc/namazu2/PLIST
+++ b/textproc/namazu2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/04 12:52:24 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/25 14:12:13 taca Exp $
 bin/adnmz
 bin/bnamazu
 bin/gcnmz
@@ -43,10 +43,10 @@ lib/libnmz.so.6.0
 libexec/cgi-bin/namazu.cgi
 man/man1/mknmz.1
 man/man1/namazu.1
-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
+${PKGLOCALEDIR}/es/LC_MESSAGES/namazu.mo
+${PKGLOCALEDIR}/fr/LC_MESSAGES/namazu.mo
+${PKGLOCALEDIR}/ja/LC_MESSAGES/namazu.mo
+${PKGLOCALEDIR}/ja_JP.SJIS/LC_MESSAGES/namazu.mo
 share/namazu/doc/en/manual.html
 share/namazu/doc/en/nmz.html
 share/namazu/doc/en/tips.html
diff --git a/textproc/namazu2/distinfo b/textproc/namazu2/distinfo
index 318ed8018a7..75501e7115b 100644
--- a/textproc/namazu2/distinfo
+++ b/textproc/namazu2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/12/01 14:23:06 taca Exp $
+$NetBSD: distinfo,v 1.4 2003/05/25 14:12:13 taca Exp $
 
 SHA1 (namazu-2.0.12.tar.gz) = ef9ad4bb38150c1857b036e8302de9fdb7049309
 Size (namazu-2.0.12.tar.gz) = 870307 bytes
@@ -8,3 +8,5 @@ SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f
 SHA1 (patch-ab) = c5baa6b5555c4fee0215980ca8df3880fa93390f
 SHA1 (patch-al) = f05436ec713ae1bcb01dd7b1a9a7a598018e9dd7
 SHA1 (patch-an) = 495e9806283eff04cd3900f3066556899bd55513
+SHA1 (patch-ap) = c6cec7dbefd0d13eb046efd392b94ed7b8fdf246
+SHA1 (patch-aq) = cfd62db68b16fed547a11e92e2b6a453366703c1
diff --git a/textproc/namazu2/patches/patch-ap b/textproc/namazu2/patches/patch-ap
new file mode 100644
index 00000000000..df01518ccba
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ap
@@ -0,0 +1,32 @@
+$NetBSD: patch-ap,v 1.1 2003/05/25 14:12:13 taca Exp $
+
+--- filter/mhonarc.pl.orig	2002-08-06 14:00:56.000000000 +0900
++++ filter/mhonarc.pl
+@@ -156,14 +156,25 @@ sub load_mhonarc_fields {
+ 
+     if ($mha_head =~ /<!--X-Subject: ([^-]+) -->/) {
+ 	my $subject = uncommentize($1);
++	if (util::islang("ja")) {
++	    codeconv::toeuc(\$subject);
++	}
+ 	1  while ($subject =~ s/\A\s*(re|sv|fwd|fw)[\[\]\d]*[:>-]+\s*//i);
+ 	$subject =~ s/\A\s*\[[^\]]+\]\s*//;
+ 	$fields->{'subject'} = $subject;
+     }
+     if ($mha_head =~ /<!--X-From-R13: ([^-]+) -->/) {
+-	$fields->{'from'} = mrot13(uncommentize($1));
++	my $from = mrot13(uncommentize($1));
++	if (util::islang("ja")) {
++	    codeconv::toeuc(\$from);
++	}
++	$fields->{'from'} = $from;
+     } elsif ($mha_head =~ /<!--X-From: ([^-]+) -->/) {
+-	$fields->{'from'} = uncommentize($1);
++	my $from = uncommentize($1);
++	if (util::islang("ja")) {
++	    codeconv::toeuc(\$from);
++	}
++	$fields->{'from'} = $from;
+     }
+     if ($mha_head =~ /<!--X-Message-Id: ([^-]+) -->/) {
+ 	$fields->{'message-id'} = '&lt;' . uncommentize($1). '&gt;';
diff --git a/textproc/namazu2/patches/patch-aq b/textproc/namazu2/patches/patch-aq
new file mode 100644
index 00000000000..d3e429e12ec
--- /dev/null
+++ b/textproc/namazu2/patches/patch-aq
@@ -0,0 +1,59 @@
+$NetBSD: patch-aq,v 1.1 2003/05/25 14:12:13 taca Exp $
+
+--- filter/pdf.pl.orig	2002-07-30 15:03:08.000000000 +0900
++++ filter/pdf.pl
+@@ -31,7 +31,9 @@ require 'gfilter.pl';
+ my $pdfconvpath = undef;
+ my $pdfinfopath = undef;
+ my $pdfconvver = 0;
++my $pdfinfover = 0;
+ my $pdfconvarg = '';
++my $pdfinfoarg = '';
+ 
+ sub mediatype() {
+     return ('application/pdf');
+@@ -52,6 +54,19 @@ sub status() {
+ 		$pdfconvarg = '-eucjp';
+ 	    }
+ 	}
++	if (defined $pdfinfopath) {
++	    my $ret = `$pdfinfopath 2>&1`;
++	    if ($ret =~ /^pdfinfo\s+version\s+([0-9]+\.[0-9]+)/) {
++		$pdfinfover = $1;
++	    }
++	    if (util::islang("ja")) {
++		if ($pdfinfover >= 2.02) {
++		    $pdfinfoarg = '-enc EUC-JP';
++		} else {
++		    $pdfinfoarg = '';
++		}
++	    }
++	}
+ 	return 'yes';
+     }
+     return 'no';
+@@ -116,7 +131,7 @@ sub filter ($$$$$) {
+ #	system("$pdfinfopath $tmpfile > $tmpfile3");
+ 	open(SAVEOUT, ">&STDOUT");
+ 	open(STDOUT, ">$tmpfile3");
+-	system("$pdfinfopath $tmpfile");
++	system("$pdfinfopath $pdfinfoarg $tmpfile");
+ 	open(STDOUT, ">&SAVEOUT");
+ 	my $fh = util::efopen("< $tmpfile3");
+ 	my $cont2 = util::readfile($fh);
+@@ -124,9 +139,15 @@ sub filter ($$$$$) {
+ 	unlink($tmpfile3);
+ 	if ($cont2 =~ /Title: (.*)/) { # or /Subject: (.*)/
+ 	    $fields->{'title'} = $1;
++	    if ($fields->{'title'} =~ /<unicode>/) {
++   	        $fields->{'title'} = undef;
++	    }
+ 	}
+ 	if ($cont2 =~ /Author: (.*)/) {
+ 	    $fields->{'author'} = $1;
++	    if ($fields->{'author'} =~ /<unicode>/) {
++   	        $fields->{'author'} = undef;
++	    }
+ 	}
+     }
+