Index: Makefile =================================================================== RCS file: /e/celeron/CVSup/main/pkgsrc/textproc/namazu2/Makefile,v retrieving revision 1.11 diff -u -u -r1.11 Makefile --- Makefile 17 Jul 2003 22:54:31 -0000 1.11 +++ Makefile 16 Apr 2004 04:53:09 -0000 @@ -1,8 +1,8 @@ # $NetBSD: Makefile,v 1.11 2003/07/17 22:54:31 grant Exp $ # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp -DISTNAME= namazu-2.0.12 -PKGREVISION= 3 +DISTNAME= namazu-2.0.13 +PKGREVISION= 1 CATEGORIES= japanese textproc www MASTER_SITES= ftp://ftp.namazu.org/namazu/stable/ \ http://www.namazu.org/stable/ @@ -15,7 +15,7 @@ HOMEPAGE= http://www.namazu.org/index.html.en COMMENT= Full-text search system intended for easy use -DEPENDS+= p5-File-MMagic>=1.09:../../misc/p5-File-MMagic +DEPENDS+= p5-File-MMagic>=1.20:../../misc/p5-File-MMagic DEPENDS+= p5-Text-Kakasi>=1.04:../../textproc/p5-Text-Kakasi DEPENDS+= p5-nkf>=1.7:../../converters/p5-nkf .if !defined(WITH_CHASEN) || ${WITH_CHASEN} != NO Index: distinfo =================================================================== RCS file: /e/celeron/CVSup/main/pkgsrc/textproc/namazu2/distinfo,v retrieving revision 1.4 diff -u -u -r1.4 distinfo --- distinfo 25 May 2003 14:12:13 -0000 1.4 +++ distinfo 16 Apr 2004 03:33:27 -0000 @@ -5,8 +5,10 @@ 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-ab) = 3aa2987079abd43ae98f9bc53484221aa876a0d9 SHA1 (patch-al) = f05436ec713ae1bcb01dd7b1a9a7a598018e9dd7 SHA1 (patch-an) = 495e9806283eff04cd3900f3066556899bd55513 -SHA1 (patch-ap) = c6cec7dbefd0d13eb046efd392b94ed7b8fdf246 +SHA1 (patch-ap) = b4f221c7d19a5b07292eec1ff2c1b292694a3bb9 SHA1 (patch-aq) = cfd62db68b16fed547a11e92e2b6a453366703c1 +SHA1 (namazu-2.0.13.tar.gz) = b1408d2b4d84533dcf42601c1c6f656b5d67966a +Size (namazu-2.0.13.tar.gz) = 1070251 bytes Index: patches/patch-ab =================================================================== RCS file: /e/celeron/CVSup/main/pkgsrc/textproc/namazu2/patches/patch-ab,v retrieving revision 1.1 diff -u -u -r1.1 patch-ab --- patches/patch-ab 31 May 2002 13:01:41 -0000 1.1 +++ patches/patch-ab 16 Apr 2004 03:36:50 -0000 @@ -1,23 +1,23 @@ -$NetBSD: patch-ab,v 1.1 2002/05/31 13:01:41 seb Exp $ +$NetBSD$ ---- conf/Makefile.in.orig Thu Dec 27 14:06:04 2001 -+++ conf/Makefile.in -@@ -117,10 +117,10 @@ - +--- conf/Makefile.in.orig 2004-04-14 03:09:01.000000000 +0900 ++++ conf/Makefile.in 2004-04-16 12:24:38.000000000 +0900 +@@ -132,10 +132,10 @@ + lispdir = @lispdir@ AUTOMAKE_OPTIONS = 1.4 no-dependencies -confdir = $(sysconfdir)/$(PACKAGE) -conf_DATA = namazurc-sample mknmzrc-sample -+confdir = $(pkgdatadir) ++confdir = $(pkgdatadiar)/$(PACKAGE) +conf_DATA = namazurc.example mknmzrc.example EXTRA_DIST = namazurc-sample -CLEANFILES = mknmzrc-sample +CLEANFILES = namazurc.example mknmzrc.example + subdir = conf mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -244,7 +244,10 @@ - maintainer-clean-generic clean mostlyclean distclean maintainer-clean + CONFIG_HEADER = $(top_builddir)/config.h +@@ -290,7 +290,10 @@ + uninstall-info-am -mknmzrc-sample: ../pl/conf.pl @@ -26,5 +26,5 @@ + +mknmzrc.example: ../pl/conf.pl perl -pe 's/^/\x23 / unless /^(\x23|package|$$)/' ../pl/conf.pl > $@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Index: patches/patch-ap =================================================================== RCS file: /e/celeron/CVSup/main/pkgsrc/textproc/namazu2/patches/patch-ap,v retrieving revision 1.1 diff -u -u -r1.1 patch-ap --- patches/patch-ap 25 May 2003 14:12:13 -0000 1.1 +++ patches/patch-ap 16 Apr 2004 03:36:58 -0000 @@ -1,32 +1,32 @@ -$NetBSD: patch-ap,v 1.1 2003/05/25 14:12:13 taca Exp $ +$NetBSD$ ---- filter/mhonarc.pl.orig 2002-08-06 14:00:56.000000000 +0900 -+++ filter/mhonarc.pl -@@ -156,14 +156,25 @@ sub load_mhonarc_fields { +--- filter/mhonarc.pl.orig 2004-03-21 00:48:31.000000000 +0900 ++++ filter/mhonarc.pl 2004-04-16 12:32:06.000000000 +0900 +@@ -157,18 +157,24 @@ if ($mha_head =~ //) { my $subject = uncommentize($1); +- codeconv::toeuc(\$subject); + 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 =~ //) { -- $fields->{'from'} = mrot13(uncommentize($1)); -+ my $from = mrot13(uncommentize($1)); + my $from = mrot13(uncommentize($1)); +- codeconv::toeuc(\$from); + if (util::islang("ja")) { + codeconv::toeuc(\$from); -+ } -+ $fields->{'from'} = $from; ++ } + $fields->{'from'} = $from; } elsif ($mha_head =~ //) { -- $fields->{'from'} = uncommentize($1); -+ my $from = uncommentize($1); + my $from = uncommentize($1); +- codeconv::toeuc(\$from); + if (util::islang("ja")) { + codeconv::toeuc(\$from); -+ } -+ $fields->{'from'} = $from; ++ } + $fields->{'from'} = $from; } if ($mha_head =~ //) { - $fields->{'message-id'} = '<' . uncommentize($1). '>';