PR/47550: Rhialto: new patches for news/trn

6 files changed, 43 insertions, 33 deletions

diff --git a/news/trn/distinfo b/news/trn/distinfo
index c3c8ea5e43d..41c878cecc4 100644
--- a/news/trn/distinfo
+++ b/news/trn/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2008/11/12 18:53:52 chuck Exp $
+$NetBSD: distinfo,v 1.11 2013/02/09 18:30:14 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) = fe2d378d3600938025846998f222d1f239549045
-SHA1 (patch-ab) = 683c2ac9d34ca0d6220752218646cbf9e359f23d
-SHA1 (patch-ac) = 96dd4bd4ca73baf552c4d8172f7ad6d6a600bd7f
-SHA1 (patch-ad) = 78c18d634cb0861754e1d555a0e514299136ecbc
-SHA1 (patch-ae) = 979c560ef89c4eaca2216fd78a1ac2e8085759f6
+SHA1 (patch-aa) = 17d95f62b3c0ffa33ad329068f97838b676d584a
+SHA1 (patch-ab) = 4cb84cc7d941f188d3e31216b7c4180624319db4
+SHA1 (patch-ac) = 37b359d68682eb267beb50ab4b74d87f0cd3114f
+SHA1 (patch-ad) = f6d102af2b6e3095ea765f622085464193d94835
+SHA1 (patch-ae) = 6cc777ff94540345a433e88ab355fe18a23d60d1
diff --git a/news/trn/patches/patch-aa b/news/trn/patches/patch-aa
index 003813e46da..84789fcd73b 100644
--- a/news/trn/patches/patch-aa
+++ b/news/trn/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2006/11/01 17:12:21 christos Exp $
+$NetBSD: patch-aa,v 1.5 2013/02/09 18:30:14 christos Exp $
 
---- datasrc.c.orig	2001-01-16 16:12:50.000000000 -0500
-+++ datasrc.c	2006-10-31 20:10:50.000000000 -0500
+--- datasrc.c.orig	2001-01-16 21:12:50.000000000 +0000
++++ datasrc.c
 @@ -12,8 +12,8 @@
  #include "nntpclient.h"
  #include "term.h"
diff --git a/news/trn/patches/patch-ab b/news/trn/patches/patch-ab
index 0c92f3a03ab..747cdfb9112 100644
--- a/news/trn/patches/patch-ab
+++ b/news/trn/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2006/11/01 17:12:21 christos Exp $
+$NetBSD: patch-ab,v 1.4 2013/02/09 18:30:14 christos Exp $
 
---- rt-page.c.orig	2000-05-25 01:04:40.000000000 -0400
-+++ rt-page.c	2006-10-31 20:11:24.000000000 -0500
+--- rt-page.c.orig	2000-05-25 05:04:40.000000000 +0000
++++ rt-page.c
 @@ -14,9 +14,9 @@
  #include "datasrc.h"
  #include "nntp.h"
diff --git a/news/trn/patches/patch-ac b/news/trn/patches/patch-ac
index 3af1bde8bc4..847f0e7648f 100644
--- a/news/trn/patches/patch-ac
+++ b/news/trn/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
+$NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
 
 --- Configure.orig	2001-02-22 14:17:39.000000000 -0500
-+++ Configure	2006-09-26 15:17:42.033788587 -0400
++++ Configure	2013-02-09 13:06:33.000000000 -0500
+@@ -1507,7 +1507,7 @@
+ myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
+ # tr '[A-Z]' '[a-z]' would not work in EBCDIC
+ # because the A-Z/a-z are not consecutive.
+-myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
++myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e "s/['/]//g" | \
+ 	./tr '[A-Z]' '[a-z]' | tr $trnl ' '`
+ newmyuname="$myuname"
+ dflt=n
 @@ -2540,7 +2540,7 @@
      esac
      ;;
@@ -25,10 +34,10 @@ $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
  esac
  case "$xxx" in
  x)
-+	xxx=`./loc libncurses$_a x $libpth`
++	xxx=`./loc libcurses$_a x $libpth`
 +	case "$xxx" in
 +	/usr/lib*|/lib*)
-+		termlib='-lncurses'
++		termlib='-lcurses'
 +		d_havetlib="$define"
 +		echo "Termlib library found." >&4
 +		;;
@@ -47,18 +56,19 @@ $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
  	xxx=`./loc libtermlib$_a x $libpth`
  	case "$xxx" in
  	/usr/lib*|/lib*)
-@@ -4939,6 +4961,25 @@
+@@ -4939,6 +4961,26 @@
  esac
  case "$xxx" in
  x)
-+	xxx=`./loc libncurses.$so'*' x $libpth`
++	xxx=`./loc libcurses.$so'*' x $libpth`
 +	case "$xxx" in
 +	/usr/lib*|/lib*)
-+		termlib='-lncurses'
++		termlib='-lcurses'
 +		d_havetlib="$define"
 +		echo "Terminfo library found." >&4
 +		;;
 +	/*)
++		xxx=`dirname "$xxx"`
 +		termlib="$xxx"
 +		d_havetlib="$define"
 +		echo "Terminfo library found." >&4
@@ -73,7 +83,7 @@ $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
  	xxx=`./loc libtermlib.$so'*' x $libpth`
  	case "$xxx" in
  	/usr/lib*|/lib*)
-@@ -6223,14 +6264,14 @@
+@@ -6223,14 +6265,14 @@
  acttimes='$acttimes'
  aphostcmd='$aphostcmd'
  archobjs='$archobjs'
@@ -91,7 +101,7 @@ $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
  cc='$cc'
  ccflags='$ccflags'
  cf_by='$cf_by'
-@@ -6240,7 +6281,7 @@
+@@ -6240,7 +6282,7 @@
  comm='$comm'
  contains='$contains'
  contdist='$contdist'
@@ -100,7 +110,7 @@ $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
  cpp='$cpp'
  cppflags='$cppflags'
  cpplast='$cpplast'
-@@ -6305,21 +6346,21 @@
+@@ -6305,21 +6347,21 @@
  d_xthread='$d_xthread'
  date='$date'
  defeditor='$defeditor'
@@ -127,7 +137,7 @@ $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
  groupdesc='$groupdesc'
  hint='$hint'
  hostbits='$hostbits'
-@@ -6376,10 +6417,10 @@
+@@ -6376,10 +6418,10 @@
  mimecap='$mimecap'
  mips='$mips'
  mips_type='$mips_type'
@@ -140,7 +150,7 @@ $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
  myactive='$myactive'
  myuname='$myuname'
  n='$n'
-@@ -6417,11 +6458,11 @@
+@@ -6417,11 +6459,11 @@
  prefshell='$prefshell'
  privlib='$privlib'
  privlibexp='$privlibexp'
@@ -154,7 +164,7 @@ $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
  sendmail='$sendmail'
  servername='$servername'
  sharpbang='$sharpbang'
-@@ -6442,7 +6483,7 @@
+@@ -6442,7 +6484,7 @@
  strn='$strn'
  subscriptions='$subscriptions'
  sysman='$sysman'
@@ -163,7 +173,7 @@ $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
  tee='$tee'
  termlib='$termlib'
  test='$test'
-@@ -6450,7 +6491,7 @@
+@@ -6450,7 +6492,7 @@
  tk='$tk'
  tkinc='$tkinc'
  tklibs='$tklibs'
diff --git a/news/trn/patches/patch-ad b/news/trn/patches/patch-ad
index 0ed9c7b145b..401ac8b8e7e 100644
--- a/news/trn/patches/patch-ad
+++ b/news/trn/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2000/03/18 19:51:33 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2013/02/09 18:30:14 christos Exp $
 
---- Pnews.SH.orig	Sun Jan 17 20:01:22 1999
-+++ Pnews.SH	Sat Mar 18 13:47:13 2000
-@@ -911,7 +911,12 @@
+--- Pnews.SH.orig	2000-10-31 22:43:16.000000000 +0000
++++ Pnews.SH
+@@ -911,7 +911,12 @@ usg)
  esac
  
  case $orgname in
diff --git a/news/trn/patches/patch-ae b/news/trn/patches/patch-ae
index bc4c810ae7d..88c398add17 100644
--- a/news/trn/patches/patch-ae
+++ b/news/trn/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2008/11/12 18:53:52 chuck Exp $
+$NetBSD: patch-ae,v 1.2 2013/02/09 18:30:14 christos Exp $
 
---- /dev/null	2008-11-12 13:40:59.000000000 -0500
-+++ hints/darwin.sh	2008-11-12 13:19:30.000000000 -0500
+--- hints/darwin.sh.orig	2013-01-23 19:09:43.000000000 +0000
++++ hints/darwin.sh
 @@ -0,0 +1,2 @@
 +so='dylib'
 +libs='-lresolv'