diff options
| author | taca <taca@pkgsrc.org> | 2002-01-04 08:57:06 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2002-01-04 08:57:06 +0000 |
| commit | f81af931caeb2f3182c788de70157346964aad0d (patch) | |
| tree | 2471152b250e4f232e3647c652cdf179317105b2 /japanese | |
| parent | bcca73ea51f4b9a33ee70b0dd9ab1a4baac9ad5f (diff) | |
| download | pkgsrc-f81af931caeb2f3182c788de70157346964aad0d.tar.gz | |
Fix bugs for handling newer xlHtml packages. Perl "or" operator is less
priority, noted by Kaz SHiMZ <kshimz@sfc.co.jp> on namazu-devel-ja@namazu.org
mailing list.
Make namazu2 package to 2.0.10nb1.
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/namazu2/Makefile | 3 | ||||
| -rw-r--r-- | japanese/namazu2/distinfo | 6 | ||||
| -rw-r--r-- | japanese/namazu2/patches/patch-am | 4 | ||||
| -rw-r--r-- | japanese/namazu2/patches/patch-ao | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile index f1e44f17154..f6b322d0a74 100644 --- a/japanese/namazu2/Makefile +++ b/japanese/namazu2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2001/12/28 10:32:50 taca Exp $ +# $NetBSD: Makefile,v 1.12 2002/01/04 08:57:06 taca Exp $ # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp DISTNAME= namazu-2.0.10 +PKGREVISION= 1 CATEGORIES= japanese textproc www MASTER_SITES= ftp://ftp.namazu.org/namazu/stable/ \ http://www.namazu.org/stable/ diff --git a/japanese/namazu2/distinfo b/japanese/namazu2/distinfo index 5581d7974ff..c8c6957b134 100644 --- a/japanese/namazu2/distinfo +++ b/japanese/namazu2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2001/12/28 10:32:50 taca Exp $ +$NetBSD: distinfo,v 1.9 2002/01/04 08:57:06 taca Exp $ SHA1 (namazu-2.0.10.tar.gz) = 43a7f32ff0d86b4e65dfa9fa6c1ad90a0636a8a8 Size (namazu-2.0.10.tar.gz) = 833838 bytes @@ -9,6 +9,6 @@ SHA1 (patch-ag) = 626af603170bca527cedc4d27e07e1c07259a701 SHA1 (patch-ah) = e38d7efb8e1e8a6e80e96fe84f9c180ec8a7fbb4 SHA1 (patch-ai) = 49d685ddd93207f984813e05a21da60fe1862bef SHA1 (patch-al) = f05436ec713ae1bcb01dd7b1a9a7a598018e9dd7 -SHA1 (patch-am) = 9759805f7440a1183f58539eda43c55fc0cc26fa +SHA1 (patch-am) = 5ab505e529e3a4b1e541b650b9be7b971a134ad2 SHA1 (patch-an) = fa073b9baef46cd31348d048816f8592a8b35f20 -SHA1 (patch-ao) = f3ff4fc586b019b8b1e2932704203245761e8d3c +SHA1 (patch-ao) = 272db69924c205eff4b7b6189ce7095771cf11fb diff --git a/japanese/namazu2/patches/patch-am b/japanese/namazu2/patches/patch-am index d397e88a97c..67c191ee792 100644 --- a/japanese/namazu2/patches/patch-am +++ b/japanese/namazu2/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.1 2001/12/28 10:32:50 taca Exp $ +$NetBSD: patch-am,v 1.2 2002/01/04 08:57:07 taca Exp $ --- filter/excel.pl.orig Fri Dec 15 14:37:41 2000 +++ filter/excel.pl @@ -22,7 +22,7 @@ $NetBSD: patch-am,v 1.1 2001/12/28 10:32:50 taca Exp $ sub status() { - $xlconvpath = util::checkcmd('xlHtml'); -+ $xlconvpath = util::checkcmd('xlhtml') or util::checkcmd('xlHtml'); ++ $xlconvpath = (util::checkcmd('xlhtml') or util::checkcmd('xlHtml')); + $convname = basename($xlconvpath); # return 'no' unless defined $xlconvpath; if (defined $xlconvpath) { diff --git a/japanese/namazu2/patches/patch-ao b/japanese/namazu2/patches/patch-ao index 4295dc35646..73e2f0737a0 100644 --- a/japanese/namazu2/patches/patch-ao +++ b/japanese/namazu2/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.1 2001/12/28 10:32:50 taca Exp $ +$NetBSD: patch-ao,v 1.2 2002/01/04 08:57:07 taca Exp $ --- filter/powerpoint.pl.orig Tue Dec 26 13:59:01 2000 +++ filter/powerpoint.pl @@ -22,7 +22,7 @@ $NetBSD: patch-ao,v 1.1 2001/12/28 10:32:50 taca Exp $ sub status() { - $pptconvpath = util::checkcmd('pptHtml'); -+ $pptconvpath = util::checkcmd('ppthtml') or util::checkcmd('pptHtml'); ++ $pptconvpath = (util::checkcmd('ppthtml') or util::checkcmd('pptHtml')); + $pptconvname = basename($pptconvpath); # return 'no' unless defined $pptconvpath if (defined $pptconvpath) { |