Sat Feb 9 18:30:15 2013 UTC ()
PR/47550: Rhialto: new patches for news/trn


(christos)
diff -r1.10 -r1.11 pkgsrc/news/trn/distinfo
diff -r1.4 -r1.5 pkgsrc/news/trn/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/news/trn/patches/patch-ab
diff -r1.6 -r1.7 pkgsrc/news/trn/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/news/trn/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/news/trn/patches/patch-ae
cvs diff -r1.10 -r1.11 pkgsrc/news/trn/distinfo (expand / switch to unified diff)

--- pkgsrc/news/trn/distinfo 2008/11/12 18:53:52 1.10
+++ pkgsrc/news/trn/distinfo 2013/02/09 18:30:14 1.11
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.10 2008/11/12 18:53:52 chuck Exp $ 1$NetBSD: distinfo,v 1.11 2013/02/09 18:30:14 christos Exp $
2 2
3SHA1 (trn-4.0-test76.tar.gz) = 4741d506d4c2d62a8dbaa5d4fd62cce656abcf3b 3SHA1 (trn-4.0-test76.tar.gz) = 4741d506d4c2d62a8dbaa5d4fd62cce656abcf3b
4RMD160 (trn-4.0-test76.tar.gz) = f60478f8808b9c0d46a22ac924821cf2edd1fe87 4RMD160 (trn-4.0-test76.tar.gz) = f60478f8808b9c0d46a22ac924821cf2edd1fe87
5Size (trn-4.0-test76.tar.gz) = 565528 bytes 5Size (trn-4.0-test76.tar.gz) = 565528 bytes
6SHA1 (patch-aa) = fe2d378d3600938025846998f222d1f239549045 6SHA1 (patch-aa) = 17d95f62b3c0ffa33ad329068f97838b676d584a
7SHA1 (patch-ab) = 683c2ac9d34ca0d6220752218646cbf9e359f23d 7SHA1 (patch-ab) = 4cb84cc7d941f188d3e31216b7c4180624319db4
8SHA1 (patch-ac) = 96dd4bd4ca73baf552c4d8172f7ad6d6a600bd7f 8SHA1 (patch-ac) = 37b359d68682eb267beb50ab4b74d87f0cd3114f
9SHA1 (patch-ad) = 78c18d634cb0861754e1d555a0e514299136ecbc 9SHA1 (patch-ad) = f6d102af2b6e3095ea765f622085464193d94835
10SHA1 (patch-ae) = 979c560ef89c4eaca2216fd78a1ac2e8085759f6 10SHA1 (patch-ae) = 6cc777ff94540345a433e88ab355fe18a23d60d1
cvs diff -r1.4 -r1.5 pkgsrc/news/trn/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/news/trn/patches/Attic/patch-aa 2006/11/01 17:12:21 1.4
+++ pkgsrc/news/trn/patches/Attic/patch-aa 2013/02/09 18:30:14 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.4 2006/11/01 17:12:21 christos Exp $ 1$NetBSD: patch-aa,v 1.5 2013/02/09 18:30:14 christos Exp $
2 2
3--- datasrc.c.orig 2001-01-16 16:12:50.000000000 -0500 3--- datasrc.c.orig 2001-01-16 21:12:50.000000000 +0000
4+++ datasrc.c 2006-10-31 20:10:50.000000000 -0500 4+++ datasrc.c
5@@ -12,8 +12,8 @@ 5@@ -12,8 +12,8 @@
6 #include "nntpclient.h" 6 #include "nntpclient.h"
7 #include "term.h" 7 #include "term.h"
8 #include "env.h" 8 #include "env.h"
9-#include "opt.h" 9-#include "opt.h"
10 #include "util.h" 10 #include "util.h"
11+#include "opt.h" 11+#include "opt.h"
12 #include "util2.h" 12 #include "util2.h"
13 #include "intrp.h" 13 #include "intrp.h"
14 #include "init.h" 14 #include "init.h"
cvs diff -r1.3 -r1.4 pkgsrc/news/trn/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/news/trn/patches/Attic/patch-ab 2006/11/01 17:12:21 1.3
+++ pkgsrc/news/trn/patches/Attic/patch-ab 2013/02/09 18:30:14 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ab,v 1.3 2006/11/01 17:12:21 christos Exp $ 1$NetBSD: patch-ab,v 1.4 2013/02/09 18:30:14 christos Exp $
2 2
3--- rt-page.c.orig 2000-05-25 01:04:40.000000000 -0400 3--- rt-page.c.orig 2000-05-25 05:04:40.000000000 +0000
4+++ rt-page.c 2006-10-31 20:11:24.000000000 -0500 4+++ rt-page.c
5@@ -14,9 +14,9 @@ 5@@ -14,9 +14,9 @@
6 #include "datasrc.h" 6 #include "datasrc.h"
7 #include "nntp.h" 7 #include "nntp.h"
8 #include "trn.h" 8 #include "trn.h"
9+#include "util.h" 9+#include "util.h"
10 #include "opt.h" 10 #include "opt.h"
11 #include "env.h" 11 #include "env.h"
12-#include "util.h" 12-#include "util.h"
13 #include "util2.h" 13 #include "util2.h"
14 #include "only.h" 14 #include "only.h"
15 #include "addng.h" 15 #include "addng.h"
cvs diff -r1.6 -r1.7 pkgsrc/news/trn/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/news/trn/patches/patch-ac 2006/09/26 20:35:16 1.6
+++ pkgsrc/news/trn/patches/patch-ac 2013/02/09 18:30:14 1.7
@@ -1,174 +1,184 @@ @@ -1,174 +1,184 @@
1$NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $ 1$NetBSD: patch-ac,v 1.7 2013/02/09 18:30:14 christos Exp $
2 2
3--- Configure.orig 2001-02-22 14:17:39.000000000 -0500 3--- Configure.orig 2001-02-22 14:17:39.000000000 -0500
4+++ Configure 2006-09-26 15:17:42.033788587 -0400 4+++ Configure 2013-02-09 13:06:33.000000000 -0500
 5@@ -1507,7 +1507,7 @@
 6 myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
 7 # tr '[A-Z]' '[a-z]' would not work in EBCDIC
 8 # because the A-Z/a-z are not consecutive.
 9-myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
 10+myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e "s/['/]//g" | \
 11 ./tr '[A-Z]' '[a-z]' | tr $trnl ' '`
 12 newmyuname="$myuname"
 13 dflt=n
5@@ -2540,7 +2540,7 @@ 14@@ -2540,7 +2540,7 @@
6 esac 15 esac
7 ;; 16 ;;
8 *) case "$d_inews" in 17 *) case "$d_inews" in
9- '') dflt="$prefix/bin";; 18- '') dflt="$prefix/bin";;
10+ '') dflt=none;; 19+ '') dflt=none;;
11 "$define") 20 "$define")
12 set dflt installinews bin 21 set dflt installinews bin
13 eval $prefixit 22 eval $prefixit
14@@ -4412,6 +4412,9 @@ 23@@ -4412,6 +4412,9 @@
15 nm_so_opt='--dynamic' 24 nm_so_opt='--dynamic'
16 fi 25 fi
17 ;; 26 ;;
18+ *dragonfly*) 27+ *dragonfly*)
19+ nm_so_opt='-D' 28+ nm_so_opt='-D'
20+ ;; 29+ ;;
21 esac 30 esac
22 ;; 31 ;;
23 esac 32 esac
24@@ -4882,6 +4885,25 @@ 33@@ -4882,6 +4885,25 @@
25 esac 34 esac
26 case "$xxx" in 35 case "$xxx" in
27 x) 36 x)
28+ xxx=`./loc libncurses$_a x $libpth` 37+ xxx=`./loc libcurses$_a x $libpth`
29+ case "$xxx" in 38+ case "$xxx" in
30+ /usr/lib*|/lib*) 39+ /usr/lib*|/lib*)
31+ termlib='-lncurses' 40+ termlib='-lcurses'
32+ d_havetlib="$define" 41+ d_havetlib="$define"
33+ echo "Termlib library found." >&4 42+ echo "Termlib library found." >&4
34+ ;; 43+ ;;
35+ /*) 44+ /*)
36+ termlib="$xxx" 45+ termlib="$xxx"
37+ d_havetlib="$define" 46+ d_havetlib="$define"
38+ echo "Termlib library found." >&4 47+ echo "Termlib library found." >&4
39+ ;; 48+ ;;
40+ *) 49+ *)
41+ xxx=x 50+ xxx=x
42+ esac 51+ esac
43+ ;; 52+ ;;
44+esac 53+esac
45+case "$xxx" in 54+case "$xxx" in
46+x) 55+x)
47 xxx=`./loc libtermlib$_a x $libpth` 56 xxx=`./loc libtermlib$_a x $libpth`
48 case "$xxx" in 57 case "$xxx" in
49 /usr/lib*|/lib*) 58 /usr/lib*|/lib*)
50@@ -4939,6 +4961,25 @@ 59@@ -4939,6 +4961,26 @@
51 esac 60 esac
52 case "$xxx" in 61 case "$xxx" in
53 x) 62 x)
54+ xxx=`./loc libncurses.$so'*' x $libpth` 63+ xxx=`./loc libcurses.$so'*' x $libpth`
55+ case "$xxx" in 64+ case "$xxx" in
56+ /usr/lib*|/lib*) 65+ /usr/lib*|/lib*)
57+ termlib='-lncurses' 66+ termlib='-lcurses'
58+ d_havetlib="$define" 67+ d_havetlib="$define"
59+ echo "Terminfo library found." >&4 68+ echo "Terminfo library found." >&4
60+ ;; 69+ ;;
61+ /*) 70+ /*)
 71+ xxx=`dirname "$xxx"`
62+ termlib="$xxx" 72+ termlib="$xxx"
63+ d_havetlib="$define" 73+ d_havetlib="$define"
64+ echo "Terminfo library found." >&4 74+ echo "Terminfo library found." >&4
65+ ;; 75+ ;;
66+ *) 76+ *)
67+ xxx=x 77+ xxx=x
68+ esac 78+ esac
69+ ;; 79+ ;;
70+esac 80+esac
71+case "$xxx" in 81+case "$xxx" in
72+x) 82+x)
73 xxx=`./loc libtermlib.$so'*' x $libpth` 83 xxx=`./loc libtermlib.$so'*' x $libpth`
74 case "$xxx" in 84 case "$xxx" in
75 /usr/lib*|/lib*) 85 /usr/lib*|/lib*)
76@@ -6223,14 +6264,14 @@ 86@@ -6223,14 +6265,14 @@
77 acttimes='$acttimes' 87 acttimes='$acttimes'
78 aphostcmd='$aphostcmd' 88 aphostcmd='$aphostcmd'
79 archobjs='$archobjs' 89 archobjs='$archobjs'
80-awk='$awk' 90-awk='$awk'
81-basename='$basename' 91-basename='$basename'
82+awk='$TOOLS_AWK' 92+awk='$TOOLS_AWK'
83+basename='$TOOLS_BASENAME' 93+basename='$TOOLS_BASENAME'
84 bash='$bash' 94 bash='$bash'
85 bin='$bin' 95 bin='$bin'
86 binexp='$binexp' 96 binexp='$binexp'
87 byacc='$byacc' 97 byacc='$byacc'
88 c='$c' 98 c='$c'
89-cat='$cat' 99-cat='$cat'
90+cat='$TOOLS_CAT' 100+cat='$TOOLS_CAT'
91 cc='$cc' 101 cc='$cc'
92 ccflags='$ccflags' 102 ccflags='$ccflags'
93 cf_by='$cf_by' 103 cf_by='$cf_by'
94@@ -6240,7 +6281,7 @@ 104@@ -6240,7 +6282,7 @@
95 comm='$comm' 105 comm='$comm'
96 contains='$contains' 106 contains='$contains'
97 contdist='$contdist' 107 contdist='$contdist'
98-cp='$cp' 108-cp='$cp'
99+cp='$TOOLS_CP' 109+cp='$TOOLS_CP'
100 cpp='$cpp' 110 cpp='$cpp'
101 cppflags='$cppflags' 111 cppflags='$cppflags'
102 cpplast='$cpplast' 112 cpplast='$cpplast'
103@@ -6305,21 +6346,21 @@ 113@@ -6305,21 +6347,21 @@
104 d_xthread='$d_xthread' 114 d_xthread='$d_xthread'
105 date='$date' 115 date='$date'
106 defeditor='$defeditor' 116 defeditor='$defeditor'
107-diff='$diff' 117-diff='$diff'
108+diff='$TOOLS_DIFF' 118+diff='$TOOLS_DIFF'
109 direntrytype='$direntrytype' 119 direntrytype='$direntrytype'
110-echo='$echo' 120-echo='$echo'
111+echo='$TOOLS_ECHO' 121+echo='$TOOLS_ECHO'
112 ed='$ed' 122 ed='$ed'
113-egrep='$egrep' 123-egrep='$egrep'
114+egrep='$TOOLS_EGREP' 124+egrep='$TOOLS_EGREP'
115 eunicefix='$eunicefix' 125 eunicefix='$eunicefix'
116 exe_ext='$exe_ext' 126 exe_ext='$exe_ext'
117-expr='$expr' 127-expr='$expr'
118+expr='$TOOLS_EXPR' 128+expr='$TOOLS_EXPR'
119 extrainews='$extrainews' 129 extrainews='$extrainews'
120 filexp='$filexp' 130 filexp='$filexp'
121 find='$find' 131 find='$find'
122 firstmakefile='$firstmakefile' 132 firstmakefile='$firstmakefile'
123 gccversion='$gccversion' 133 gccversion='$gccversion'
124 glibpth='$glibpth' 134 glibpth='$glibpth'
125-grep='$grep' 135-grep='$grep'
126+grep='$TOOLS_GREP' 136+grep='$TOOLS_GREP'
127 groupdesc='$groupdesc' 137 groupdesc='$groupdesc'
128 hint='$hint' 138 hint='$hint'
129 hostbits='$hostbits' 139 hostbits='$hostbits'
130@@ -6376,10 +6417,10 @@ 140@@ -6376,10 +6418,10 @@
131 mimecap='$mimecap' 141 mimecap='$mimecap'
132 mips='$mips' 142 mips='$mips'
133 mips_type='$mips_type' 143 mips_type='$mips_type'
134-mkdir='$mkdir' 144-mkdir='$mkdir'
135+mkdir='$TOOLS_MKDIR' 145+mkdir='$TOOLS_MKDIR'
136 more='$more' 146 more='$more'
137 multistatedist='$multistatedist' 147 multistatedist='$multistatedist'
138-mv='$mv' 148-mv='$mv'
139+mv='$TOOLS_MV' 149+mv='$TOOLS_MV'
140 myactive='$myactive' 150 myactive='$myactive'
141 myuname='$myuname' 151 myuname='$myuname'
142 n='$n' 152 n='$n'
143@@ -6417,11 +6458,11 @@ 153@@ -6417,11 +6459,11 @@
144 prefshell='$prefshell' 154 prefshell='$prefshell'
145 privlib='$privlib' 155 privlib='$privlib'
146 privlibexp='$privlibexp' 156 privlibexp='$privlibexp'
147-rm='$rm' 157-rm='$rm'
148+rm='$TOOLS_RM' 158+rm='$TOOLS_RM'
149 rmail='$rmail' 159 rmail='$rmail'
150 rootid='$rootid' 160 rootid='$rootid'
151 runnm='$runnm' 161 runnm='$runnm'
152-sed='$sed' 162-sed='$sed'
153+sed='$TOOLS_SED' 163+sed='$TOOLS_SED'
154 sendmail='$sendmail' 164 sendmail='$sendmail'
155 servername='$servername' 165 servername='$servername'
156 sharpbang='$sharpbang' 166 sharpbang='$sharpbang'
157@@ -6442,7 +6483,7 @@ 167@@ -6442,7 +6484,7 @@
158 strn='$strn' 168 strn='$strn'
159 subscriptions='$subscriptions' 169 subscriptions='$subscriptions'
160 sysman='$sysman' 170 sysman='$sysman'
161-tail='$tail' 171-tail='$tail'
162+tail='$TOOLS_TAIL' 172+tail='$TOOLS_TAIL'
163 tee='$tee' 173 tee='$tee'
164 termlib='$termlib' 174 termlib='$termlib'
165 test='$test' 175 test='$test'
166@@ -6450,7 +6491,7 @@ 176@@ -6450,7 +6492,7 @@
167 tk='$tk' 177 tk='$tk'
168 tkinc='$tkinc' 178 tkinc='$tkinc'
169 tklibs='$tklibs' 179 tklibs='$tklibs'
170-tr='$tr' 180-tr='$tr'
171+tr='$TOOLS_TR' 181+tr='$TOOLS_TR'
172 trn_init='$trn_init' 182 trn_init='$trn_init'
173 trn_select='$trn_select' 183 trn_select='$trn_select'
174 trnl='$trnl' 184 trnl='$trnl'
cvs diff -r1.1 -r1.2 pkgsrc/news/trn/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/news/trn/patches/patch-ad 2000/03/18 19:51:33 1.1
+++ pkgsrc/news/trn/patches/patch-ad 2013/02/09 18:30:14 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ad,v 1.1 2000/03/18 19:51:33 wiz Exp $ 1$NetBSD: patch-ad,v 1.2 2013/02/09 18:30:14 christos Exp $
2 2
3--- Pnews.SH.orig Sun Jan 17 20:01:22 1999 3--- Pnews.SH.orig 2000-10-31 22:43:16.000000000 +0000
4+++ Pnews.SH Sat Mar 18 13:47:13 2000 4+++ Pnews.SH
5@@ -911,7 +911,12 @@ 5@@ -911,7 +911,12 @@ usg)
6 esac 6 esac
7  7
8 case $orgname in 8 case $orgname in
9-/*) orgname=`$cat $orgname` ;; 9-/*) orgname=`$cat $orgname` ;;
10+/*) if $test -r $orgname; then 10+/*) if $test -r $orgname; then
11+ orgname=`$cat $orgname` 11+ orgname=`$cat $orgname`
12+ else 12+ else
13+ orgname="" 13+ orgname=""
14+ fi 14+ fi
15+ ;; 15+ ;;
16 esac 16 esac
17  17
18 $sed -e '/^Reply-To: $/d' > $tmpart <<EOHeader 18 $sed -e '/^Reply-To: $/d' > $tmpart <<EOHeader
cvs diff -r1.1 -r1.2 pkgsrc/news/trn/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/news/trn/patches/patch-ae 2008/11/12 18:53:52 1.1
+++ pkgsrc/news/trn/patches/patch-ae 2013/02/09 18:30:14 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: patch-ae,v 1.1 2008/11/12 18:53:52 chuck Exp $ 1$NetBSD: patch-ae,v 1.2 2013/02/09 18:30:14 christos Exp $
2 2
3--- /dev/null 2008-11-12 13:40:59.000000000 -0500 3--- hints/darwin.sh.orig 2013-01-23 19:09:43.000000000 +0000
4+++ hints/darwin.sh 2008-11-12 13:19:30.000000000 -0500 4+++ hints/darwin.sh
5@@ -0,0 +1,2 @@ 5@@ -0,0 +1,2 @@
6+so='dylib' 6+so='dylib'
7+libs='-lresolv' 7+libs='-lresolv'