PATCH_SITE changed.

Remove unintentional dependency on ncurses.

4 files changed, 113 insertions, 12 deletions

diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 80c669059ce..e28ec37dfb7 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.3 1999/04/14 21:39:03 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/04/11 07:44:08 sakamoto Exp $
 # FreeBSD Id: Makefile,v 1.13 1998/07/17 20:36:13 steve Exp
 #
 
-DISTNAME=       less-332
-PKGNAME=        ja-less-332
-CATEGORIES=     japanese
-MASTER_SITES=   ${MASTER_SITE_GNU:=less/}
+DISTNAME=	less-332
+PKGNAME=	ja-less-332
+CATEGORIES=	japanese
+MASTER_SITES=	${MASTER_SITE_GNU:=less/}
 
-PATCH_SITES=    ftp://ftp.big.or.jp/pub/usr2/jam/less/
-PATCHFILES=     less-332-iso242.patch.gz \
+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_DIST_STRIP=   -p1
+PATCH_DIST_STRIP= -p1
 
-MAINTAINER=     komine@cc.meisei-u.ac.jp
-HOMEPAGE=       http://www.io.com/~kazushi/less/
+MAINTAINER=	komine@cc.meisei-u.ac.jp
+HOMEPAGE=	http://www.io.com/~kazushi/less/
 
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/japanese/less/files/patch-sum b/japanese/less/files/patch-sum
index 6ef61adf658..3758747a9cf 100644
--- a/japanese/less/files/patch-sum
+++ b/japanese/less/files/patch-sum
@@ -1,3 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:18 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/04/11 07:44:10 sakamoto Exp $
 
 MD5 (patch-aa) = 7f56417924cdd7e831b4d5b0f1358dbd
+MD5 (patch-ab) = 8031b9ebbad02404d80118582d1643a9
+MD5 (patch-ac) = c9f39aa012887cf10ec631d31c1c2aef
diff --git a/japanese/less/patches/patch-ab b/japanese/less/patches/patch-ab
new file mode 100644
index 00000000000..5a0dc1a9798
--- /dev/null
+++ b/japanese/less/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2000/04/11 07:44:10 sakamoto Exp $
+
+--- configure.in.orig	Tue Apr 11 15:20:54 2000
++++ configure.in	Tue Apr 11 15:25:23 2000
+@@ -15,5 +15,4 @@
+ 
+ dnl Checks for libraries.
+-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"
+-  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
+ 
diff --git a/japanese/less/patches/patch-ac b/japanese/less/patches/patch-ac
new file mode 100644
index 00000000000..58f0946072e
--- /dev/null
+++ b/japanese/less/patches/patch-ac
@@ -0,0 +1,69 @@
+$NetBSD: patch-ac,v 1.1 2000/04/11 07:44:10 sakamoto Exp $
+
+--- configure.orig	Tue Apr 11 15:20:55 2000
++++ configure	Tue Apr 11 15:25:04 2000
+@@ -920,45 +920,4 @@
+ 
+ 
+-echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
+-echo "configure:924: 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
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lncurses  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 932 "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
+-    builtin and then its argument prototype would still apply.  */
+-char initscr();
+-
+-int main() {
+-initscr()
+-; return 0; }
+-EOF
+-if { (eval echo configure:943: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  have_ncurses=yes
+-else
+-  echo "$ac_t""no" 1>&6
+-have_ncurses=no
+-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"
+-  fi
++if test $have_curses = yes; then
++  TERMLIBS="$TERMLIBS -lcurses"
++fi
++if test $have_termcap = yes; then
++  TERMLIBS="$TERMLIBS -ltermcap"
+ fi
+