head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.54
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.52
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.50
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.48
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.46
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.44
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.42
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.40
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.38
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.36
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.34
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.32
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.30
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.28
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.26
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.24
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.22
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.20
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.18
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.16
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.4.0.14
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.4.0.12
	pkgsrc-2005Q1-base:1.4
	pkgsrc-2004Q4:1.4.0.10
	pkgsrc-2004Q4-base:1.4
	pkgsrc-2004Q3:1.4.0.8
	pkgsrc-2004Q3-base:1.4
	pkgsrc-2004Q2:1.4.0.6
	pkgsrc-2004Q2-base:1.4
	pkgsrc-2004Q1:1.4.0.4
	pkgsrc-2004Q1-base:1.4
	pkgsrc-2003Q4:1.4.0.2
	pkgsrc-2003Q4-base:1.4
	buildlink2:1.3.0.2
	buildlink2-base:1.4
	netbsd-1-5-PATCH003:1.3;
locks; strict;
comment	@# @;


1.4
date	2002.05.31.15.35.47;	author seb;	state dead;
branches;
next	1.3;

1.3
date	2002.01.10.17.54.32;	author taca;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2002.01.04.08.57.07;	author taca;	state Exp;
branches;
next	1.1;

1.1
date	2001.12.28.10.32.50;	author taca;	state Exp;
branches;
next	;

1.3.2.1
date	2002.06.23.18.49.26;	author jlam;	state dead;
branches;
next	;


desc
@@


1.4
log
@Remove all package and category files from the japanese category.
This effectively retire the japanese category.
@
text
@$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
@@@@ -26,6 +26,7 @@@@
 
 package excel;
 use strict;
+use File::Basename;
 use File::Copy;
 require 'util.pl';
 require 'gfilter.pl';
@@@@ -33,15 +34,17 @@@@
 
 my $xlconvpath  = undef;
 my $utfconvpath = undef;
+my $convname = undef;
 
 sub mediatype() {
     return ('application/excel');
 }
 
 sub status() {
-    $xlconvpath = util::checkcmd('xlHtml');
+    $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;
 
-    if (util::checkcmd('xlHtml')) {
+    if ($convname =~ /xlhtml/i) {
     $err = filter_xl($orig_cfile, $cont, $weighted_str, $headings, $fields);
     } else {
     $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields);
@


1.3
log
@Better Fix for handling newer xlHtml packages using the same change as
namazu stable source.

Make namazu2 package to 2.0.10nb2.
@
text
@d1 1
a1 1
$NetBSD: patch-am,v 1.2 2002/01/04 08:57:07 taca Exp $
@


1.3.2.1
log
@Merge from pkgsrc-current to buildlink2 branch.
@
text
@d1 1
a1 1
$NetBSD: patch-am,v 1.3 2002/01/10 17:54:32 taca Exp $
@


1.2
log
@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.
@
text
@d1 1
a1 1
$NetBSD: patch-am,v 1.1 2001/12/28 10:32:50 taca Exp $
d13 1
a13 1
@@@@ -33,13 +34,15 @@@@
d25 1
a25 2
+    $xlconvpath = (util::checkcmd('xlhtml') or util::checkcmd('xlHtml'));
+    $convname = basename($xlconvpath);
d28 1
d30 2
@


1.1
log
@Update namazu2 package to 2.0.10.

o Move content of MESSAGE int INSTALL and add note for external
  supporting programs.
o Cope with update wv and xlhtml package.  (Fix has sent to
  namazu-users-ja mailing list.)
o Official change from NEWS file are bellow:

Overview of Changes in Namazu 2.0.10 - Dec 27, 2001

* Fix another cross-site scripting vulnerability.
* Fix possibility of buffer overflow.
@
text
@d1 1
a1 1
$NetBSD$
d25 1
a25 1
+    $xlconvpath = util::checkcmd('xlhtml') or util::checkcmd('xlHtml');
@