diff options
author | taca <taca> | 2002-01-10 17:54:31 +0000 |
---|---|---|
committer | taca <taca> | 2002-01-10 17:54:31 +0000 |
commit | 4320f271c274a2d99532a725a2f4e7ebb5603d4f (patch) | |
tree | 9cb744bdcf3a12c7efda553eb219dde67e51a6e2 /japanese | |
parent | 0ba425477ce0bb24f195a57cb264c94a9cf300f9 (diff) | |
download | pkgsrc-4320f271c274a2d99532a725a2f4e7ebb5603d4f.tar.gz |
Better Fix for handling newer xlHtml packages using the same change as
namazu stable source.
Make namazu2 package to 2.0.10nb2.
Diffstat (limited to 'japanese')
-rw-r--r-- | japanese/namazu2/Makefile | 4 | ||||
-rw-r--r-- | japanese/namazu2/distinfo | 6 | ||||
-rw-r--r-- | japanese/namazu2/patches/patch-am | 10 | ||||
-rw-r--r-- | japanese/namazu2/patches/patch-ao | 10 |
4 files changed, 17 insertions, 13 deletions
diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile index f6b322d0a74..142c15471cd 100644 --- a/japanese/namazu2/Makefile +++ b/japanese/namazu2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2002/01/04 08:57:06 taca Exp $ +# $NetBSD: Makefile,v 1.13 2002/01/10 17:54:31 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 +PKGREVISION= 2 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 c8c6957b134..456281e8c09 100644 --- a/japanese/namazu2/distinfo +++ b/japanese/namazu2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/01/04 08:57:06 taca Exp $ +$NetBSD: distinfo,v 1.10 2002/01/10 17:54:31 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) = 5ab505e529e3a4b1e541b650b9be7b971a134ad2 +SHA1 (patch-am) = abce3739aa99e9ee19bf4b56f961c33cc33004be SHA1 (patch-an) = fa073b9baef46cd31348d048816f8592a8b35f20 -SHA1 (patch-ao) = 272db69924c205eff4b7b6189ce7095771cf11fb +SHA1 (patch-ao) = 16070a6b7f9b50e2e14d3256d6bab44c9ea52aca diff --git a/japanese/namazu2/patches/patch-am b/japanese/namazu2/patches/patch-am index 67c191ee792..2d3f44d4dbd 100644 --- a/japanese/namazu2/patches/patch-am +++ b/japanese/namazu2/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.2 2002/01/04 08:57:07 taca Exp $ +$NetBSD: patch-am,v 1.3 2002/01/10 17:54:32 taca Exp $ --- filter/excel.pl.orig Fri Dec 15 14:37:41 2000 +++ filter/excel.pl @@ -10,7 +10,7 @@ $NetBSD: patch-am,v 1.2 2002/01/04 08:57:07 taca Exp $ use File::Copy; require 'util.pl'; require 'gfilter.pl'; -@@ -33,13 +34,15 @@ +@@ -33,15 +34,17 @@ my $xlconvpath = undef; my $utfconvpath = undef; @@ -22,11 +22,13 @@ $NetBSD: patch-am,v 1.2 2002/01/04 08:57:07 taca Exp $ sub status() { - $xlconvpath = util::checkcmd('xlHtml'); -+ $xlconvpath = (util::checkcmd('xlhtml') or util::checkcmd('xlHtml')); -+ $convname = basename($xlconvpath); ++ $xlconvpath = util::checkcmd('xlhtml') || util::checkcmd('xlHtml'); # return 'no' unless defined $xlconvpath; if (defined $xlconvpath) { ++ $convname = basename($xlconvpath); if (!util::islang("ja")) { + return 'yes'; + } else { @@ -83,7 +86,7 @@ = @_; my $err = undef; diff --git a/japanese/namazu2/patches/patch-ao b/japanese/namazu2/patches/patch-ao index 73e2f0737a0..d1240a95ac7 100644 --- a/japanese/namazu2/patches/patch-ao +++ b/japanese/namazu2/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.2 2002/01/04 08:57:07 taca Exp $ +$NetBSD: patch-ao,v 1.3 2002/01/10 17:54:32 taca Exp $ --- filter/powerpoint.pl.orig Tue Dec 26 13:59:01 2000 +++ filter/powerpoint.pl @@ -10,7 +10,7 @@ $NetBSD: patch-ao,v 1.2 2002/01/04 08:57:07 taca Exp $ use File::Copy; require 'util.pl'; require 'gfilter.pl'; -@@ -32,13 +33,15 @@ +@@ -32,15 +33,17 @@ my $pptconvpath = undef; my $utfconvpath = undef; @@ -22,11 +22,13 @@ $NetBSD: patch-ao,v 1.2 2002/01/04 08:57:07 taca Exp $ sub status() { - $pptconvpath = util::checkcmd('pptHtml'); -+ $pptconvpath = (util::checkcmd('ppthtml') or util::checkcmd('pptHtml')); -+ $pptconvname = basename($pptconvpath); ++ $pptconvpath = util::checkcmd('ppthtml') || util::checkcmd('pptHtml'); # return 'no' unless defined $pptconvpath if (defined $pptconvpath) { ++ $pptconvname = basename($pptconvpath); if (!util::islang("ja")) { + return 'yes'; + } else { @@ -82,7 +85,7 @@ = @_; my $err = undef; |