diff options
| -rw-r--r-- | textproc/namazu2/INSTALL | 16 | ||||
| -rw-r--r-- | textproc/namazu2/Makefile | 11 | ||||
| -rw-r--r-- | textproc/namazu2/PLIST | 23 | ||||
| -rw-r--r-- | textproc/namazu2/distinfo | 14 | ||||
| -rw-r--r-- | textproc/namazu2/patches/patch-ab | 29 | ||||
| -rw-r--r-- | textproc/namazu2/patches/patch-al | 13 | ||||
| -rw-r--r-- | textproc/namazu2/patches/patch-an | 13 | ||||
| -rw-r--r-- | textproc/namazu2/patches/patch-ap | 32 | ||||
| -rw-r--r-- | textproc/namazu2/patches/patch-aq | 59 |
9 files changed, 50 insertions, 160 deletions
diff --git a/textproc/namazu2/INSTALL b/textproc/namazu2/INSTALL index 57accedc0e2..fd63eda4842 100644 --- a/textproc/namazu2/INSTALL +++ b/textproc/namazu2/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.3 2003/08/30 20:23:07 jlam Exp $ +# $NetBSD: INSTALL,v 1.4 2004/05/06 13:40:21 taca Exp $ PKGNAME=$1 STAGE=$2 @@ -26,11 +26,12 @@ POST-INSTALL) "LC_ALL", "LC_MESSAGES" or "LANG" environment to "ja". 5. Because of lack of locale support, you need to set "PERL_BADLANG" - for perl to stop the warning on NetBSD 1.5.X and before. - On NetBSD current (1.6 or later), you don't need to set - "PERL_BADLANG" but "LC_LANG" environment. + for perl to stop the warning. -6. If you want to make index of bellow file type, please install +6. Special notes for perl 5.8.1 users: Please set environment + PERL_HASH_SEED as 0. + +7. If you want to make index of bellow file type, please install appropriate package. Adobe PDF xpdf @@ -46,9 +47,8 @@ POST-INSTALL) For handling non-English language, you might need lv and/or nkf package, too. - DocCat is a commercial product from Dehenken Limited and it dosen't - provided as NetBSD package (yet?). - See http://www.dehenken.co.jp/english/doccat.html in detail. + DocCat is a commercial product from Dehenken Limited. + See http://www.dehenken.co.jp/products/doccat/doccat.html in detail. ============================================================= diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile index f8144e19061..2906c074ed8 100644 --- a/textproc/namazu2/Makefile +++ b/textproc/namazu2/Makefile @@ -1,16 +1,12 @@ -# $NetBSD: Makefile,v 1.12 2004/05/04 23:46:36 snj Exp $ +# $NetBSD: Makefile,v 1.13 2004/05/06 13:40:21 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= 3 +DISTNAME= namazu-2.0.13-1 +PKGNAME= namazu-2.0.13 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= tech-pkg@NetBSD.org HOMEPAGE= http://www.namazu.org/index.html.en COMMENT= Full-text search system intended for easy use @@ -22,6 +18,7 @@ DEPENDS+= p5-nkf>=1.7:../../converters/p5-nkf DEPENDS+= p5-Text-ChaSen>=1.0:../../textproc/p5-Text-ChaSen .endif +WRKSRC= ${WRKDIR}/namazu-2.0.13 CONFIGURE_ARGS+= --localstatedir=${LOCALBASE}/libdata \ --libexecdir=${LOCALBASE}/libexec/cgi-bin .if defined(WITH_CHASEN) && ${WITH_CHASEN} == NO diff --git a/textproc/namazu2/PLIST b/textproc/namazu2/PLIST index 52ea47e724a..3677aea875f 100644 --- a/textproc/namazu2/PLIST +++ b/textproc/namazu2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/05/26 06:32:00 taca Exp $ +@comment $NetBSD: PLIST,v 1.5 2004/05/06 13:40:21 taca 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.6 -lib/libnmz.so.6.0 +lib/libnmz.so.7 +lib/libnmz.so.7.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 @@ -43,10 +43,6 @@ lib/libnmz.so.6.0 libexec/cgi-bin/namazu.cgi man/man1/mknmz.1 man/man1/namazu.1 -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/namazu.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/namazu.mo -${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/namazu.mo -${PKGLOCALEDIR}/locale/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 @@ -76,6 +72,7 @@ share/namazu/etc/THANKS share/namazu/etc/TODO share/namazu/etc/namazu.png @dirrm share/namazu/etc +share/namazu/filter/apachecache.pl share/namazu/filter/bzip2.pl share/namazu/filter/compress.pl share/namazu/filter/deb.pl @@ -85,16 +82,22 @@ share/namazu/filter/gzip.pl share/namazu/filter/hdml.pl share/namazu/filter/hnf.pl share/namazu/filter/html.pl +share/namazu/filter/macbinary.pl share/namazu/filter/mailnews.pl share/namazu/filter/man.pl share/namazu/filter/mhonarc.pl +share/namazu/filter/mp3.pl share/namazu/filter/msword.pl +share/namazu/filter/ooo.pl share/namazu/filter/pdf.pl share/namazu/filter/postscript.pl share/namazu/filter/powerpoint.pl share/namazu/filter/rfc.pl +share/namazu/filter/rtf.pl share/namazu/filter/rpm.pl share/namazu/filter/taro.pl +share/namazu/filter/taro56.pl +share/namazu/filter/taro7_10.pl share/namazu/filter/tex.pl @dirrm share/namazu/filter share/namazu/mknmzrc.example @@ -115,26 +118,32 @@ share/namazu/template/NMZ.body share/namazu/template/NMZ.body.es share/namazu/template/NMZ.body.fr share/namazu/template/NMZ.body.ja +share/namazu/template/NMZ.body.pl +share/namazu/template/NMZ.tips.pl 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.foot.pl 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.head.pl 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.normal.pl 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 +share/namazu/template/NMZ.result.short.pl share/namazu/template/NMZ.tips share/namazu/template/NMZ.tips.es share/namazu/template/NMZ.tips.fr diff --git a/textproc/namazu2/distinfo b/textproc/namazu2/distinfo index 75501e7115b..3ccd6df7ad0 100644 --- a/textproc/namazu2/distinfo +++ b/textproc/namazu2/distinfo @@ -1,12 +1,6 @@ -$NetBSD: distinfo,v 1.4 2003/05/25 14:12:13 taca Exp $ +$NetBSD: distinfo,v 1.5 2004/05/06 13:40:21 taca Exp $ -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 (namazu-2.0.13-1.tar.gz) = 1ec8e20e12293fc008371afee98c3165dbe4017e +Size (namazu-2.0.13-1.tar.gz) = 1046889 bytes SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f -SHA1 (patch-ab) = c5baa6b5555c4fee0215980ca8df3880fa93390f -SHA1 (patch-al) = f05436ec713ae1bcb01dd7b1a9a7a598018e9dd7 -SHA1 (patch-an) = 495e9806283eff04cd3900f3066556899bd55513 -SHA1 (patch-ap) = c6cec7dbefd0d13eb046efd392b94ed7b8fdf246 -SHA1 (patch-aq) = cfd62db68b16fed547a11e92e2b6a453366703c1 +SHA1 (patch-ab) = 0643872e5681ca99373a2059e0b520405c62a807 diff --git a/textproc/namazu2/patches/patch-ab b/textproc/namazu2/patches/patch-ab index 3b0456e5225..2c7250fc20f 100644 --- a/textproc/namazu2/patches/patch-ab +++ b/textproc/namazu2/patches/patch-ab @@ -1,23 +1,30 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $ +$NetBSD: patch-ab,v 1.2 2004/05/06 13:40:21 taca Exp $ ---- conf/Makefile.in.orig Thu Dec 27 14:06:04 2001 +--- conf/Makefile.in.orig 2004-04-14 03:09:01.000000000 +0900 +++ conf/Makefile.in -@@ -117,10 +117,10 @@ - +@@ -25,7 +25,7 @@ bindir = @bindir@ + sbindir = @sbindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ +-sysconfdir = @sysconfdir@ ++sysconfdir = $(datadir) + sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ +@@ -133,9 +133,9 @@ lispdir = @lispdir@ AUTOMAKE_OPTIONS = 1.4 no-dependencies --confdir = $(sysconfdir)/$(PACKAGE) + confdir = $(sysconfdir)/$(PACKAGE) -conf_DATA = namazurc-sample mknmzrc-sample -+confdir = $(pkgdatadir) +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-am: uninstall-confDATA uninsta + uninstall-info-am -mknmzrc-sample: ../pl/conf.pl @@ -26,5 +33,5 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $ + +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. diff --git a/textproc/namazu2/patches/patch-al b/textproc/namazu2/patches/patch-al deleted file mode 100644 index 4784b938afe..00000000000 --- a/textproc/namazu2/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $ - ---- scripts/mknmz.in.orig Sun Nov 25 18:28:58 2001 -+++ scripts/mknmz.in -@@ -176,6 +176,8 @@ - my $processed_num = 0; - my $file_size = util::filesize($cfile); - -+ return ($file_size, $processed_num) unless $file_size; -+ - if ($var::Opt{'htmlsplit'} && $cfile =~ $conf::HTML_SUFFIX) { - my @parts = htmlsplit::split($cfile, "NMZ.partial"); - if (@parts > 1) { diff --git a/textproc/namazu2/patches/patch-an b/textproc/namazu2/patches/patch-an deleted file mode 100644 index 4c405a44474..00000000000 --- a/textproc/namazu2/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.3 2002/12/01 14:23:06 taca Exp $ - ---- filter/msword.pl.orig Mon Aug 26 12:13:31 2002 -+++ filter/msword.pl -@@ -128,7 +128,7 @@ sub filter_wv ($$$$$) { - my $supported = undef; - my $fh_cmd = util::efopen("$wvversionpath $tmpfile |"); - while (<$fh_cmd>) { -- if (/^Version: (word\d+),/i) { -+ if (/^Version: (word\d+)(?:,| )/i) { - $version = $1; - # - # Only word8 format is supported for Japanese. diff --git a/textproc/namazu2/patches/patch-ap b/textproc/namazu2/patches/patch-ap deleted file mode 100644 index df01518ccba..00000000000 --- a/textproc/namazu2/patches/patch-ap +++ /dev/null @@ -1,32 +0,0 @@ -$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'} = '<' . uncommentize($1). '>'; diff --git a/textproc/namazu2/patches/patch-aq b/textproc/namazu2/patches/patch-aq deleted file mode 100644 index d3e429e12ec..00000000000 --- a/textproc/namazu2/patches/patch-aq +++ /dev/null @@ -1,59 +0,0 @@ -$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; -+ } - } - } - |