Update ja-less to ja-less-358.

It based on less-358 and iso254 patch.

5 files changed, 88 insertions, 82 deletions

diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index b8c1bfb2fdc..5c63efb00f6 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -1,19 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:25:21 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/07/29 14:10:06 taca Exp $
 # FreeBSD Id: Makefile,v 1.13 1998/07/17 20:36:13 steve Exp
 #
 
-DISTNAME=	less-332
-PKGNAME=	ja-less-332
+DISTNAME=	less-358
+PKGNAME=	ja-${DISTNAME}
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GNU:=less/}
 
-PATCH_SITES=	ftp://hiroshima.isdn.uiuc.edu/less/
-PATCHFILES=	less-332-iso242.patch.gz \
-		less-332-iso242-243.patch.gz \
-		less-332-iso243-244.patch.gz \
-		less-332-iso244-245.patch.gz \
-		less-332-iso245-247.patch.gz \
-		less-332-iso247-248.patch.gz
+PATCH_SITES=	http://www.io.com/~kazushi/less/
+PATCHFILES=	less-358-iso254.patch.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	komine@cc.meisei-u.ac.jp
diff --git a/japanese/less/distinfo b/japanese/less/distinfo
index fb03c332b35..383ae69e07c 100644
--- a/japanese/less/distinfo
+++ b/japanese/less/distinfo
@@ -1,19 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:34 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/29 14:10:06 taca Exp $
 
-SHA1 (less-332.tar.gz) = 1ecfd1bc6352680f89a44564dbae14ca78f2a15a
-Size (less-332.tar.gz) = 204926 bytes
-SHA1 (less-332-iso242.patch.gz) = 9ec31dae7723bc341527e7bd36be77e872223120
-Size (less-332-iso242.patch.gz) = 61306 bytes
-SHA1 (less-332-iso242-243.patch.gz) = 8805d1dbda2773ba31101f18fc5c4fe32b97dbf6
-Size (less-332-iso242-243.patch.gz) = 10128 bytes
-SHA1 (less-332-iso243-244.patch.gz) = 2299b54df9d3d88b7c52f7af886ae62c6fef1e49
-Size (less-332-iso243-244.patch.gz) = 3212 bytes
-SHA1 (less-332-iso244-245.patch.gz) = ab2228c251585a6f14c8ba5e1957e47c3c22d816
-Size (less-332-iso244-245.patch.gz) = 490 bytes
-SHA1 (less-332-iso245-247.patch.gz) = e7980192c473ef67050615a6f4299c8ca7408906
-Size (less-332-iso245-247.patch.gz) = 4597 bytes
-SHA1 (less-332-iso247-248.patch.gz) = b22966ce8c6b8e4c44dfb138a871686ba1d0f2ab
-Size (less-332-iso247-248.patch.gz) = 3806 bytes
-SHA1 (patch-aa) = 8d5cbe4f41b301ec7c0e6c84950a02c748494450
-SHA1 (patch-ab) = 39b03bb2c3f0b8e72682811f2ace0ab1bc8c0743
-SHA1 (patch-ac) = 88c0183fbb5737fd2b23eb39d6aa355a0fff267c
+SHA1 (less-358.tar.gz) = 1893ce820ef76686004c45364c559d1bd713ee73
+Size (less-358.tar.gz) = 231140 bytes
+SHA1 (less-358-iso254.patch.gz) = cb2df9fb8e66484d5e1544ae902fa87b1745fe70
+Size (less-358-iso254.patch.gz) = 71182 bytes
+SHA1 (patch-aa) = db51345c5db24ea57b24c250c092a8f28bd5e732
+SHA1 (patch-ab) = 6b30f10502e66680b2cee28dd3f7e822a58dd080
+SHA1 (patch-ac) = dc7fa429614fd0450128b6bbdb721e11e1b7bfc8
diff --git a/japanese/less/patches/patch-aa b/japanese/less/patches/patch-aa
index 209849a8cd9..07123fe8a06 100644
--- a/japanese/less/patches/patch-aa
+++ b/japanese/less/patches/patch-aa
@@ -1,14 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/10/28 18:12:10 garbled Exp $
---- Makefile.in.org	Tue Sep  1 10:27:10 1998
-+++ Makefile.in	Tue Sep  1 10:27:22 1998
+$NetBSD: patch-aa,v 1.2 2001/07/29 14:10:06 taca Exp $
+
+--- Makefile.in.orig	Sun Jul 29 14:07:48 2001
++++ Makefile.in
 @@ -22,11 +22,11 @@
  
  # Where the installed binary goes.
- bindir = ${exec_prefix}/bin
+ bindir = @bindir@
 -binprefix = 
 +binprefix = j
  
- mandir = ${prefix}/man/man${manext}
+ mandir = @mandir@
  manext = 1
 -manprefix = 
 +manprefix = j
diff --git a/japanese/less/patches/patch-ab b/japanese/less/patches/patch-ab
index 5a0dc1a9798..e1ed47ee202 100644
--- a/japanese/less/patches/patch-ab
+++ b/japanese/less/patches/patch-ab
@@ -1,30 +1,32 @@
-$NetBSD: patch-ab,v 1.1 2000/04/11 07:44:10 sakamoto Exp $
+$NetBSD: patch-ab,v 1.2 2001/07/29 14:10:07 taca Exp $
 
---- configure.in.orig	Tue Apr 11 15:20:54 2000
-+++ configure.in	Tue Apr 11 15:25:23 2000
-@@ -15,5 +15,4 @@
+--- configure.in.orig	Sun Jul 29 14:07:49 2001
++++ configure.in
+@@ -17,7 +17,6 @@
  
  dnl Checks for libraries.
+ AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no])
 -AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
  AC_CHECK_LIB(curses, initscr, [have_curses=yes], [have_curses=no])
  AC_CHECK_LIB(termcap, tgetent, [have_termcap=yes], [have_termcap=no])
-@@ -31,14 +30,9 @@
- AC_MSG_CHECKING(for working terminal libraries)
- TERMLIBS=
--if test $have_ncurses = yes; then
--  TERMLIBS="$TERMLIBS -lncurses"
--  dnl Don't use -ltermcap with -lncurses (Linux doesn't like it).
--else
--  if test $have_curses = yes; then
--    TERMLIBS="$TERMLIBS -lcurses"
+ AC_CHECK_LIB(termlib, tgetent, [have_termlib=yes], [have_termlib=no])
+@@ -44,19 +43,6 @@
+ if test "x$TERMLIBS" = x; then
+   if test $have_xcurses = yes; then
+     TERMLIBS="-lxcurses"
+-    SAVE_LIBS=$LIBS
+-    LIBS="$LIBS $TERMLIBS"
+-    AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
+-      [termok=yes], [termok=no])
+-    LIBS=$SAVE_LIBS
+-    if test $termok = no; then TERMLIBS=""; fi
 -  fi
--  if test $have_termcap = yes; then
--    TERMLIBS="$TERMLIBS -ltermcap"
--  fi
-+if test $have_curses = yes; then
-+  TERMLIBS="$TERMLIBS -lcurses"
-+fi
-+if test $have_termcap = yes; then
-+  TERMLIBS="$TERMLIBS -ltermcap"
- fi
- 
+-fi
+-
+-dnl -- Try ncurses.
+-if test "x$TERMLIBS" = x; then
+-  if test $have_ncurses = yes; then
+-    TERMLIBS="-lncurses"
+     SAVE_LIBS=$LIBS
+     LIBS="$LIBS $TERMLIBS"
+     AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
diff --git a/japanese/less/patches/patch-ac b/japanese/less/patches/patch-ac
index 58f0946072e..7b06143cc77 100644
--- a/japanese/less/patches/patch-ac
+++ b/japanese/less/patches/patch-ac
@@ -1,12 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2000/04/11 07:44:10 sakamoto Exp $
+$NetBSD: patch-ac,v 1.2 2001/07/29 14:10:07 taca Exp $
 
---- configure.orig	Tue Apr 11 15:20:55 2000
-+++ configure	Tue Apr 11 15:25:04 2000
-@@ -920,45 +920,4 @@
- 
+--- configure.orig	Sun Jul 29 14:07:49 2001
++++ configure
+@@ -973,47 +973,6 @@
+ have_xcurses=no
+ fi
  
 -echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
--echo "configure:924: checking for initscr in -lncurses" >&5
+-echo "configure:978: checking for initscr in -lncurses" >&5
 -ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
@@ -14,7 +15,7 @@ $NetBSD: patch-ac,v 1.1 2000/04/11 07:44:10 sakamoto Exp $
 -  ac_save_LIBS="$LIBS"
 -LIBS="-lncurses  $LIBS"
 -cat > conftest.$ac_ext <<EOF
--#line 932 "configure"
+-#line 986 "configure"
 -#include "confdefs.h"
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -/* We use char because int might match the return type of a gcc2
@@ -25,7 +26,7 @@ $NetBSD: patch-ac,v 1.1 2000/04/11 07:44:10 sakamoto Exp $
 -initscr()
 -; return 0; }
 -EOF
--if { (eval echo configure:943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-if { (eval echo configure:997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 -  rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
 -else
@@ -47,23 +48,40 @@ $NetBSD: patch-ac,v 1.1 2000/04/11 07:44:10 sakamoto Exp $
 -fi
 -
  echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
- echo "configure:965: checking for initscr in -lcurses" >&5
-@@ -1230,13 +1189,9 @@
- echo "configure:1231: checking for working terminal libraries" >&5
- TERMLIBS=
--if test $have_ncurses = yes; then
--  TERMLIBS="$TERMLIBS -lncurses"
--  else
--  if test $have_curses = yes; then
--    TERMLIBS="$TERMLIBS -lcurses"
--  fi
--  if test $have_termcap = yes; then
--    TERMLIBS="$TERMLIBS -ltermcap"
+ echo "configure:1019: checking for initscr in -lcurses" >&5
+ ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
+@@ -1298,34 +1257,6 @@
+     LIBS="$LIBS $TERMLIBS"
+     cat > conftest.$ac_ext <<EOF
+ #line 1301 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
+-; return 0; }
+-EOF
+-if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-  rm -rf conftest*
+-  termok=yes
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  termok=no
+-fi
+-rm -f conftest*
+-    LIBS=$SAVE_LIBS
+-    if test $termok = no; then TERMLIBS=""; fi
 -  fi
-+if test $have_curses = yes; then
-+  TERMLIBS="$TERMLIBS -lcurses"
-+fi
-+if test $have_termcap = yes; then
-+  TERMLIBS="$TERMLIBS -ltermcap"
- fi
+-fi
+-
+-if test "x$TERMLIBS" = x; then
+-  if test $have_ncurses = yes; then
+-    TERMLIBS="-lncurses"
+-    SAVE_LIBS=$LIBS
+-    LIBS="$LIBS $TERMLIBS"
+-    cat > conftest.$ac_ext <<EOF
+-#line 1329 "configure"
+ #include "confdefs.h"
  
+ int main() {