From 04b1a81c7221f8e6a9d6300d2e62f009be6cdc31 Mon Sep 17 00:00:00 2001 From: taca Date: Thu, 2 Mar 2006 16:02:37 +0000 Subject: Update namazu2 pacakge to 2.0.15. Overview of Changes in Namazu 2.0.15 - Jan. 29, 2006 * The mistake of the document concerning ISO-8859-* is corrected. * RedHat software namazu.spec was taken in. The unnecessary patch was deleted. * Include File::MMagic 1.25. * Support MeCab. * Add -b and --use-mecab options for mknmz. * Add --norc option for mknmz and namazu. * Add --decode-base64 option for mknmz. * Add new filters (Gnumeric, Koffice, Mainman/Pipermail, Zip, Visio). * Add new directives for mknmzrc (MECAB, DENY_DDN). To skip when filename is DDN. * Add sorting function by date of field. * Added new files (nmzcat, nmzegrep). * Adapt new filter programs (wvWare 1.0.3, xlhtml 0.5.1, xpdf 3.01). * For Windows of filter (msword.pl, excel.pl, powerpoint.pl, postscript.pl, etc...). * Ole control filter renewal. * ';' can have been used for the delimiter of QUERY_STRING. * Add the Perl version test program (pltests). * Fix some bugs. --- textproc/namazu2/Makefile | 12 +++++------- textproc/namazu2/PLIST | 11 ++++++++++- textproc/namazu2/distinfo | 17 ++++------------- textproc/namazu2/patches/patch-ac | 12 ------------ textproc/namazu2/patches/patch-ad | 13 ------------- textproc/namazu2/patches/patch-ae | 14 -------------- textproc/namazu2/patches/patch-af | 13 ------------- textproc/namazu2/patches/patch-ag | 32 -------------------------------- textproc/namazu2/patches/patch-ah | 24 ------------------------ textproc/namazu2/patches/patch-ai | 13 ------------- textproc/namazu2/patches/patch-aj | 13 ------------- textproc/namazu2/patches/patch-ak | 15 --------------- 12 files changed, 19 insertions(+), 170 deletions(-) delete mode 100644 textproc/namazu2/patches/patch-ac delete mode 100644 textproc/namazu2/patches/patch-ad delete mode 100644 textproc/namazu2/patches/patch-ae delete mode 100644 textproc/namazu2/patches/patch-af delete mode 100644 textproc/namazu2/patches/patch-ag delete mode 100644 textproc/namazu2/patches/patch-ah delete mode 100644 textproc/namazu2/patches/patch-ai delete mode 100644 textproc/namazu2/patches/patch-aj delete mode 100644 textproc/namazu2/patches/patch-ak diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile index e445c9f0b62..26308383235 100644 --- a/textproc/namazu2/Makefile +++ b/textproc/namazu2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2006/02/05 23:11:04 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2006/03/02 16:02:37 taca Exp $ -DISTNAME= namazu-2.0.14 -PKGREVISION= 4 +DISTNAME= namazu-2.0.15 CATEGORIES= japanese textproc www MASTER_SITES= http://www.namazu.org/stable/ @@ -19,15 +18,14 @@ CONFLICTS+= namazu-[0-9]* USE_PKGLOCALEDIR= yes USE_TOOLS+= perl:run GNU_CONFIGURE= yes -USE_LANGUAGE= c +USE_LANGUAGES= c USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= libtool TEST_TARGET= check +LTCONFIG_OVERRIDE+= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --localstatedir=${DATADIR:Q} \ --libexecdir=${PREFIX}/libexec/cgi-bin \ - --sysconfdir=${PKG_SYSCONFBASE:Q} \ - --with-chasen + --sysconfdir=${PKG_SYSCONFBASE:Q} DATADIR= ${PREFIX}/libdata EXAMPLESDIR= ${PREFIX}/share/examples/namazu diff --git a/textproc/namazu2/PLIST b/textproc/namazu2/PLIST index afd6d6d53af..cbb02c6a0b8 100644 --- a/textproc/namazu2/PLIST +++ b/textproc/namazu2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2005/07/12 16:03:56 taca Exp $ +@comment $NetBSD: PLIST,v 1.11 2006/03/02 16:02:37 taca Exp $ bin/adnmz bin/bnamazu bin/gcnmz @@ -8,6 +8,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 diff --git a/textproc/namazu2/distinfo b/textproc/namazu2/distinfo index ba24947b6f6..e1bb9bfcaba 100644 --- a/textproc/namazu2/distinfo +++ b/textproc/namazu2/distinfo @@ -1,15 +1,6 @@ -$NetBSD: distinfo,v 1.7 2005/02/24 14:48:44 agc Exp $ +$NetBSD: distinfo,v 1.8 2006/03/02 16:02:37 taca Exp $ -SHA1 (namazu-2.0.14.tar.gz) = 6515d1a1ed5156ea569aed0b95eb5212b2c24dc3 -RMD160 (namazu-2.0.14.tar.gz) = 0b5ca8b029b2f8aab159f8f5498cc04cb01bca26 -Size (namazu-2.0.14.tar.gz) = 1032273 bytes +SHA1 (namazu-2.0.15.tar.gz) = eb40272aa49398dbcbc611f40cb7319d68b6dc06 +RMD160 (namazu-2.0.15.tar.gz) = b3161a9d9b25229d153247e9288de2433867316a +Size (namazu-2.0.15.tar.gz) = 1184406 bytes SHA1 (patch-ab) = 5052026e67ffb0a235c8a4ba996cb4438bf7b622 -SHA1 (patch-ac) = fcb47a8433f2784f2420835a11a06d8421a25c18 -SHA1 (patch-ad) = 3707beb6136f50512cf3ab4535e978aa198d112e -SHA1 (patch-ae) = bcd438ddcf06e6356fd04955724b539426018c41 -SHA1 (patch-af) = b9c722b372935cbca017f706c7c7a6372fbfbc69 -SHA1 (patch-ag) = 6de0499048e452a3109106d06e4bd1fdfd537ca7 -SHA1 (patch-ah) = fce8c1489d09225f9c1a402efed55f33956799a7 -SHA1 (patch-ai) = 54c60dbfda316e5777d1234dc32b739f368e3f25 -SHA1 (patch-aj) = 55076b0fbf4eb7a7b67d6214a63b9bcdb02bf2a1 -SHA1 (patch-ak) = 1d2edc78e144f9d0fe127dedc8fa3262a4f0683d diff --git a/textproc/namazu2/patches/patch-ac b/textproc/namazu2/patches/patch-ac deleted file mode 100644 index efdc060bda9..00000000000 --- a/textproc/namazu2/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/12/15 13:09:58 taca Exp $ - ---- scripts/Makefile.in.orig 2004-12-14 23:34:55.000000000 +0900 -+++ scripts/Makefile.in -@@ -166,6 +166,7 @@ bnamazu: $(top_builddir)/config.status b - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - gtnmz: $(top_builddir)/config.status gtnmz.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -+ chmod +x $@ - mailutime: $(top_builddir)/config.status mailutime.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - nmzgrep: $(top_builddir)/config.status nmzgrep.in diff --git a/textproc/namazu2/patches/patch-ad b/textproc/namazu2/patches/patch-ad deleted file mode 100644 index 5d2ac876989..00000000000 --- a/textproc/namazu2/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2004/12/15 13:09:58 taca Exp $ - ---- nmz/field.c.orig 2004-03-21 00:25:09.000000000 +0900 -+++ nmz/field.c -@@ -122,7 +122,7 @@ nmz_isfield(const char *key) - } - key++; - } -- if (isalpha(*(key - 1)) && *key == ':' ) { -+ if (isalpha((unsigned char)*(key - 1)) && *key == ':' ) { - return 1; - } - return 0; diff --git a/textproc/namazu2/patches/patch-ae b/textproc/namazu2/patches/patch-ae deleted file mode 100644 index 1bd49859678..00000000000 --- a/textproc/namazu2/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2004/12/15 13:09:58 taca Exp $ - ---- nmz/idxname.c.orig 2004-03-21 00:25:10.000000000 +0900 -+++ nmz/idxname.c -@@ -153,7 +153,8 @@ nmz_complete_idxnames(void) - int i; - - for (i = 0; i < indices.num; i++) { -- if (*indices.names[i] == '+' && isalnum(*(indices.names[i] + 1))) { -+ if (*indices.names[i] == '+' && -+ isalnum((unsigned char)*(indices.names[i] + 1))) { - char *tmp; - tmp = malloc(strlen(defaultidx) - + 1 + strlen(indices.names[i]) + 1); diff --git a/textproc/namazu2/patches/patch-af b/textproc/namazu2/patches/patch-af deleted file mode 100644 index 9bcdd7d250c..00000000000 --- a/textproc/namazu2/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.3 2004/12/15 13:09:58 taca Exp $ - ---- nmz/search.c.orig 2004-04-05 00:26:48.000000000 +0900 -+++ nmz/search.c -@@ -564,7 +564,7 @@ do_regex_preprocessing(char *expr) - exprp = expr; - /* Escape meta characters */ - while (*exprp) { -- if (!isalnum(*exprp) && !nmz_iseuc(*exprp)) { -+ if (!isalnum((unsigned char)*exprp) && !nmz_iseuc(*exprp)) { - *bufp = '\\'; - bufp++; - } diff --git a/textproc/namazu2/patches/patch-ag b/textproc/namazu2/patches/patch-ag deleted file mode 100644 index 62ec4b9b63c..00000000000 --- a/textproc/namazu2/patches/patch-ag +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2004/12/15 13:09:58 taca Exp $ - ---- nmz/util.c.orig 2004-03-21 00:25:10.000000000 +0900 -+++ nmz/util.c -@@ -63,7 +63,7 @@ - */ - - static void reverse_byte_order (void*, int, int); --static char decode_uri_sub(char c1, char c2); -+static int decode_uri_sub(int c1, int c2); - - /* - * Reverse byte order. It's type independent. -@@ -85,14 +85,14 @@ reverse_byte_order (void *p, int n, int - } - } - --static char --decode_uri_sub(char c1, char c2) -+static int -+decode_uri_sub(int c1, int c2) - { -- char c; -+ int c; - - c = ((c1 >= 'A' ? (toupper(c1) - 'A') + 10 : (c1 - '0'))) * 16; - c += ( c2 >= 'A' ? (toupper(c2) - 'A') + 10 : (c2 - '0')); -- return c; -+ return c & 0xff; - } - - /* diff --git a/textproc/namazu2/patches/patch-ah b/textproc/namazu2/patches/patch-ah deleted file mode 100644 index 6ca3e2832e7..00000000000 --- a/textproc/namazu2/patches/patch-ah +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2004/12/15 13:09:58 taca Exp $ - ---- nmz/wakati.c.orig 2004-03-21 00:25:10.000000000 +0900 -+++ nmz/wakati.c -@@ -81,8 +81,7 @@ iskatakana(const char *chr) - uchar *c; - c = (uchar *)chr; - -- if ((*c == 0xa5) && -- (*(c + 1) >= 0xa0) && (*(c + 1) <= 0xff)) -+ if ((*c == 0xa5) && (*(c + 1) >= 0xa0)) - { - return 1; - } else if ((*c == 0xa1) && (*(c + 1) == 0xbc)) { /* choon */ -@@ -100,8 +99,7 @@ ishiragana(const char *chr) - uchar *c; - c = (uchar *)chr; - -- if ((*c == 0xa4) && -- (*(c + 1) >= 0xa0) && (*(c + 1) <= 0xff)) -+ if ((*c == 0xa4) && (*(c + 1) >= 0xa0)) - { - return 1; - } else if ((*c == 0xa1) && (*(c + 1) == 0xbc)) { /* choon */ diff --git a/textproc/namazu2/patches/patch-ai b/textproc/namazu2/patches/patch-ai deleted file mode 100644 index 354b5a7eb8a..00000000000 --- a/textproc/namazu2/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2004/12/15 13:09:58 taca Exp $ - ---- src/form.c.orig 2004-12-08 16:35:06.000000000 +0900 -+++ src/form.c -@@ -96,7 +96,7 @@ cmp_element(const char *s1, const char * - } - s2++; - } -- if (toupper(*s1) != toupper(*s2)) { -+ if (toupper((unsigned char)*s1) != toupper((unsigned char)*s2)) { - break; - } - } diff --git a/textproc/namazu2/patches/patch-aj b/textproc/namazu2/patches/patch-aj deleted file mode 100644 index 166e759e5e4..00000000000 --- a/textproc/namazu2/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2004/12/15 13:09:58 taca Exp $ - ---- src/output.c.orig 2004-03-21 00:02:51.000000000 +0900 -+++ src/output.c -@@ -490,7 +490,7 @@ print_query(const char * qs, int w) - if (strncmp(qs, "whence=", strlen("whence=")) == 0) { - foo = 1; - printf("whence=%d", w); -- for (qs += strlen("whence="); isdigit(*qs); qs++); -+ for (qs += strlen("whence="); isdigit((unsigned char)*qs); qs++); - } else { - /* '"' is converted to entities """ */ - putc_entitize(*qs); diff --git a/textproc/namazu2/patches/patch-ak b/textproc/namazu2/patches/patch-ak deleted file mode 100644 index 486019ef52f..00000000000 --- a/textproc/namazu2/patches/patch-ak +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2004/12/15 13:09:58 taca Exp $ - ---- src/result.c.orig 2004-03-21 00:02:51.000000000 +0900 -+++ src/result.c -@@ -315,8 +315,8 @@ emphasize(char *str) - static int - is_wordboundary(char *p) - { -- if (isalpha(*p) && isalpha(*(p + 1))) return 0; -- if (isdigit(*p) && isdigit(*(p + 1))) return 0; -+ if (isalpha((unsigned char)*p) && isalpha((unsigned char)*(p + 1))) return 0; -+ if (isdigit((unsigned char)*p) && isdigit((unsigned char)*(p + 1))) return 0; - return 1; - } - -- cgit v1.2.3