prefer terminfo/termcap before curses

3 files changed, 96 insertions, 31 deletions

diff --git a/news/trn/Makefile b/news/trn/Makefile
index bbb14f1cde5..9d185b7d291 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2013/05/31 12:41:45 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/10/15 16:06:18 christos Exp $
 
 DISTNAME=		trn-4.0-test76
 PKGNAME=		trn-4.76
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		news
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=trn/}
 
diff --git a/news/trn/distinfo b/news/trn/distinfo
index 41c878cecc4..288882a0264 100644
--- a/news/trn/distinfo
+++ b/news/trn/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2013/02/09 18:30:14 christos Exp $
+$NetBSD: distinfo,v 1.12 2013/10/15 16:06:18 christos Exp $
 
 SHA1 (trn-4.0-test76.tar.gz) = 4741d506d4c2d62a8dbaa5d4fd62cce656abcf3b
 RMD160 (trn-4.0-test76.tar.gz) = f60478f8808b9c0d46a22ac924821cf2edd1fe87
 Size (trn-4.0-test76.tar.gz) = 565528 bytes
 SHA1 (patch-aa) = 17d95f62b3c0ffa33ad329068f97838b676d584a
 SHA1 (patch-ab) = 4cb84cc7d941f188d3e31216b7c4180624319db4
-SHA1 (patch-ac) = 37b359d68682eb267beb50ab4b74d87f0cd3114f
+SHA1 (patch-ac) = 4d14b95b77fa91c205df201c5ea3aeb9606f9e50
 SHA1 (patch-ad) = f6d102af2b6e3095ea765f622085464193d94835
 SHA1 (patch-ae) = 6cc777ff94540345a433e88ab355fe18a23d60d1
diff --git a/news/trn/patches/patch-ac b/news/trn/patches/patch-ac
index 847f0e7648f..e5e4345206a 100644
--- a/news/trn/patches/patch-ac
+++ b/news/trn/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
+$NetBSD: patch-ac,v 1.8 2013/10/15 16:06:18 christos Exp $
 
 --- Configure.orig	2001-02-22 14:17:39.000000000 -0500
-+++ Configure	2013-02-09 13:06:33.000000000 -0500
++++ Configure	2013-10-15 12:04:56.000000000 -0400
 @@ -1507,7 +1507,7 @@
  myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
  # tr '[A-Z]' '[a-z]' would not work in EBCDIC
@@ -30,14 +30,17 @@ $NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
  	esac
  	;;
  esac
-@@ -4882,6 +4885,25 @@
- esac
+@@ -4856,9 +4859,47 @@
+ 
+ : where do we get termlib routines from
+ echo " "
+-xxx=`./loc libcurses$_a x $libpth`
++xxx=`./loc libtermlib$_a x $libpth`
  case "$xxx" in
- x)
-+	xxx=`./loc libcurses$_a x $libpth`
+ /*)
 +	case "$xxx" in
 +	/usr/lib*|/lib*)
-+		termlib='-lcurses'
++		termlib='-ltermlib'
 +		d_havetlib="$define"
 +		echo "Termlib library found." >&4
 +		;;
@@ -53,25 +56,17 @@ $NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
 +esac
 +case "$xxx" in
 +x)
- 	xxx=`./loc libtermlib$_a x $libpth`
- 	case "$xxx" in
- 	/usr/lib*|/lib*)
-@@ -4939,6 +4961,26 @@
- esac
- case "$xxx" in
- x)
-+	xxx=`./loc libcurses.$so'*' x $libpth`
++	xxx=`./loc libtermcap.$so'*' x $libpth`
 +	case "$xxx" in
 +	/usr/lib*|/lib*)
-+		termlib='-lcurses'
++		termlib='-ltermcap'
 +		d_havetlib="$define"
-+		echo "Terminfo library found." >&4
++		echo "Termcap library found." >&4
 +		;;
 +	/*)
-+		xxx=`dirname "$xxx"`
 +		termlib="$xxx"
 +		d_havetlib="$define"
-+		echo "Terminfo library found." >&4
++		echo "Termcap library found." >&4
 +		;;
 +	*)
 +		xxx=x
@@ -80,10 +75,80 @@ $NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
 +esac
 +case "$xxx" in
 +x)
- 	xxx=`./loc libtermlib.$so'*' x $libpth`
++	xxx=`./loc libcurses$_a x $libpth`
+ 	ar t $xxx >grimble
+ 	if $contains tputs$_o grimble >/dev/null 2>&1; then
+ 		termlib='-lcurses'
+@@ -4882,10 +4923,10 @@
+ esac
+ case "$xxx" in
+ x)
+-	xxx=`./loc libtermlib$_a x $libpth`
++	xxx=`./loc libcurses$_a x $libpth`
  	case "$xxx" in
  	/usr/lib*|/lib*)
-@@ -6223,14 +6265,14 @@
+-		termlib='-ltermlib'
++		termlib='-lcurses'
+ 		d_havetlib="$define"
+ 		echo "Termlib library found." >&4
+ 		;;
+@@ -4901,17 +4942,17 @@
+ esac
+ case "$xxx" in
+ x)
+-	xxx=`./loc libtermcap$_a x $libpth`
++	xxx=`./loc libcurses.$so'*' x $libpth`
+ 	case "$xxx" in
+ 	/usr/lib*|/lib*)
+-		termlib='-ltermcap'
++		termlib='-lcurses'
+ 		d_havetlib="$define"
+-		echo "Termcap library found." >&4
++		echo "Terminfo library found." >&4
+ 		;;
+ 	/*)
+ 		termlib="$xxx"
+ 		d_havetlib="$define"
+-		echo "Termcap library found." >&4
++		echo "Terminfo library found." >&4
+ 		;;
+ 	*)
+ 		xxx=x
+@@ -4928,6 +4969,7 @@
+ 		echo "Terminfo library found." >&4
+ 		;;
+ 	/*)
++		xxx=`dirname "$xxx"`
+ 		termlib="$xxx"
+ 		d_havetlib="$define"
+ 		echo "Terminfo library found." >&4
+@@ -4958,25 +5000,6 @@
+ esac
+ case "$xxx" in
+ x)
+-	xxx=`./loc libtermcap.$so'*' x $libpth`
+-	case "$xxx" in
+-	/usr/lib*|/lib*)
+-		termlib='-ltermcap'
+-		d_havetlib="$define"
+-		echo "Termcap library found." >&4
+-		;;
+-	/*)
+-		termlib="$xxx"
+-		d_havetlib="$define"
+-		echo "Termcap library found." >&4
+-		;;
+-	*)
+-		xxx=x
+-	esac
+-	;;
+-esac
+-case "$xxx" in
+-x)
+ 	dflt=y
+ rp="Your system appears to NOT have termlib-style routines. Is this true?"
+ 	. ./myread
+@@ -6223,14 +6246,14 @@
  acttimes='$acttimes'
  aphostcmd='$aphostcmd'
  archobjs='$archobjs'
@@ -101,7 +166,7 @@ $NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
  cc='$cc'
  ccflags='$ccflags'
  cf_by='$cf_by'
-@@ -6240,7 +6282,7 @@
+@@ -6240,7 +6263,7 @@
  comm='$comm'
  contains='$contains'
  contdist='$contdist'
@@ -110,7 +175,7 @@ $NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
  cpp='$cpp'
  cppflags='$cppflags'
  cpplast='$cpplast'
-@@ -6305,21 +6347,21 @@
+@@ -6305,21 +6328,21 @@
  d_xthread='$d_xthread'
  date='$date'
  defeditor='$defeditor'
@@ -137,7 +202,7 @@ $NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
  groupdesc='$groupdesc'
  hint='$hint'
  hostbits='$hostbits'
-@@ -6376,10 +6418,10 @@
+@@ -6376,10 +6399,10 @@
  mimecap='$mimecap'
  mips='$mips'
  mips_type='$mips_type'
@@ -150,7 +215,7 @@ $NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
  myactive='$myactive'
  myuname='$myuname'
  n='$n'
-@@ -6417,11 +6459,11 @@
+@@ -6417,11 +6440,11 @@
  prefshell='$prefshell'
  privlib='$privlib'
  privlibexp='$privlibexp'
@@ -164,7 +229,7 @@ $NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
  sendmail='$sendmail'
  servername='$servername'
  sharpbang='$sharpbang'
-@@ -6442,7 +6484,7 @@
+@@ -6442,7 +6465,7 @@
  strn='$strn'
  subscriptions='$subscriptions'
  sysman='$sysman'
@@ -173,7 +238,7 @@ $NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
  tee='$tee'
  termlib='$termlib'
  test='$test'
-@@ -6450,7 +6492,7 @@
+@@ -6450,7 +6473,7 @@
  tk='$tk'
  tkinc='$tkinc'
  tklibs='$tklibs'