diff options
author | Johan van Selst <johans@FreeBSD.org> | 2010-09-04 08:54:28 +0000 |
---|---|---|
committer | Johan van Selst <johans@FreeBSD.org> | 2010-09-04 08:54:28 +0000 |
commit | f9d4d4f72494fc5054c7d00f5ef791c82eab6a86 (patch) | |
tree | 19d7f9e29d6d31fb0fb57a5000bbbadd9be52b70 /news/trn4 | |
parent | - Upgrade to 0.07. (diff) |
- Update to trn 4.0.b77
- Remove 2 local patches that have been included upstream
- Add a non-interactive configuration mode
Notes
Notes:
svn path=/head/; revision=260532
Diffstat (limited to 'news/trn4')
-rw-r--r-- | news/trn4/Makefile | 12 | ||||
-rw-r--r-- | news/trn4/distinfo | 6 | ||||
-rw-r--r-- | news/trn4/files/patch-datasrc.c | 16 | ||||
-rw-r--r-- | news/trn4/files/patch-rt-page.c | 17 | ||||
-rw-r--r-- | news/trn4/scripts/preconf | 43 |
5 files changed, 38 insertions, 56 deletions
diff --git a/news/trn4/Makefile b/news/trn4/Makefile index 682301406459..0e65b4473b21 100644 --- a/news/trn4/Makefile +++ b/news/trn4/Makefile @@ -6,17 +6,15 @@ # PORTNAME= trn -PORTVERSION= 4.0.b76 -PORTREVISION= 1 +PORTVERSION= 4.0.b77 CATEGORIES= news -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}4/4.0%20test76 -DISTNAME= trn-4.0-test76 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}4 +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-test/} MAINTAINER= johans@FreeBSD.org COMMENT= Version 4.0 of the threaded readnews newsreader NO_LATEST_LINK= yes -IS_INTERACTIVE= yes MAN1= trn.1 Pnews.1 Rnmail.1 .include <bsd.port.pre.mk> @@ -26,6 +24,10 @@ pre-configure: @${SED} -e "s:__CC__:$(CC):" -e "s:__CFLAGS__:$(CFLAGS):" \ -e "s:/PREFIX:$(PREFIX):" ${SCRIPTDIR}/preconf > \ ${WRKDIR}/preconf.new +.ifdef BATCH + @echo 3 | sh ${WRKDIR}/preconf.new ${PORTSDIR} ${.CURDIR} ${WRKSRC} +.else @sh ${WRKDIR}/preconf.new ${PORTSDIR} ${.CURDIR} ${WRKSRC} +.endif .include <bsd.port.post.mk> diff --git a/news/trn4/distinfo b/news/trn4/distinfo index a6260cd58ed6..67060a67a101 100644 --- a/news/trn4/distinfo +++ b/news/trn4/distinfo @@ -1,3 +1,3 @@ -MD5 (trn-4.0-test76.tar.gz) = 4dad2f34ed8b22a8985f9054386dfe0f -SHA256 (trn-4.0-test76.tar.gz) = 41f3257d86544fe33c1535a6026497d1604c01b66ec639b4d00ebd41774c5344 -SIZE (trn-4.0-test76.tar.gz) = 565528 +MD5 (trn-4.0-test77.tar.gz) = e0680ae4e6062747f88ba982326ac4c0 +SHA256 (trn-4.0-test77.tar.gz) = 9ab0430244903ad86ed74fcc2fdc39dc043d23968888e071313050a967b8a6ff +SIZE (trn-4.0-test77.tar.gz) = 564694 diff --git a/news/trn4/files/patch-datasrc.c b/news/trn4/files/patch-datasrc.c deleted file mode 100644 index 732e11f6cdac..000000000000 --- a/news/trn4/files/patch-datasrc.c +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- datasrc.c.orig -+++ datasrc.c -@@ -12,9 +12,9 @@ - #include "nntpclient.h" - #include "term.h" - #include "env.h" --#include "opt.h" - #include "util.h" - #include "util2.h" -+#include "opt.h" - #include "intrp.h" - #include "init.h" - #include "rcstuff.h" diff --git a/news/trn4/files/patch-rt-page.c b/news/trn4/files/patch-rt-page.c deleted file mode 100644 index b633369966a5..000000000000 --- a/news/trn4/files/patch-rt-page.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- rt-page.c.orig -+++ rt-page.c -@@ -14,10 +14,10 @@ - #include "datasrc.h" - #include "nntp.h" - #include "trn.h" --#include "opt.h" - #include "env.h" - #include "util.h" - #include "util2.h" -+#include "opt.h" - #include "only.h" - #include "addng.h" - #include "rcln.h" diff --git a/news/trn4/scripts/preconf b/news/trn4/scripts/preconf index 442a4b9ab77d..8da7d9d0ab96 100644 --- a/news/trn4/scripts/preconf +++ b/news/trn4/scripts/preconf @@ -15,15 +15,14 @@ echo "It assumes a few things." echo "1. You are accessing news via NNTP, and you set the NNTPSERVER" echo " environment variable to the name of your news server" echo "2. You have access to the threads databases (either xover or xthread)" -echo "3. You have a inews program, otherwise you cannot post." -echo " The inews program can be obtained from the inn port." echo "" echo "" -echo "You now have two possible choices:" +echo "You now have three possible choices:" echo "" -echo " 1) use my configuration as default, run Configure on top of it." -echo " 2) run Configure from scratch." +echo " 1) use my configuration as default, run Configure on top of it (recommended)." +echo " 2) run Configure from scratch, using trn defaults." +echo " 3) use my defaults and don't do any manual configuration (non-interactive)." echo "" echo "Due to a check done iside the Trn Configure script, I cannot run" echo "it automagically. If you want to pick up the default configura-" @@ -40,8 +39,12 @@ if [ ! ${foo} ] ; then foo=1 fi -if [ ${foo} -eq 1 ] ; then - ConfigArgs='-f config.sh' +if [ ${foo} -eq 1 -o ${foo} -eq 3 ] ; then + if [ ${foo} -eq 1 ] ; then + ConfigArgs='-f config.sh' + else + ConfigArgs='-der -f config.sh' + fi #DON'T ALTER INDENTATION cat > ${WrkSrc}/config.sh << 'EOF' # @@ -69,7 +72,7 @@ basename='/usr/bin/basename' bash='' bin='/PREFIX/bin' binexp='/PREFIX/bin' -byacc='' +byacc='/usr/bin/byacc' c='' cat='/bin/cat' cc='__CC__' @@ -104,7 +107,7 @@ d_getpwent='define' d_gettimeod='define' d_getwd='define' d_gnulibc='undef' -d_havetlib='undef' +d_havetlib='define' d_ignoreorg='undef' d_inews='define' d_internet='define' @@ -152,12 +155,13 @@ echo='/bin/echo' ed='/bin/ed' egrep='/usr/bin/egrep' eunicefix=':' +exe_ext='' expr='/bin/expr' extrainews='' filexp='/PREFIX/lib/trn/filexp' find='' firstmakefile='' -gccversion='2.7.2.1' +gccversion='4.2.1' glibpth='/shlib /usr/shlib /lib/pa1.1 /usr/lib/large /lib /usr/lib /usr/lib/386 /lib/386 /lib/large /usr/lib/small /lib/small /usr/ccs/lib /usr/ucblib /usr/local/lib' grep='/usr/bin/grep' groupdesc='' @@ -194,11 +198,13 @@ ispell_prg='' jobslib='' ksh='' ldflags='' -less='' -libc='/usr/lib/libc.so.3.1' +less='/usr/bin/less' +lib_ext='.a' +libc='/usr/lib/libc.a' libndir='' libpth='/usr/lib /PREFIX/lib' libs=' ' +libswanted='malloc resolv socket net hdb bbn str nls nsl intl x ucb' lint='' lns='/bin/ln -s' locdist='none' @@ -228,10 +234,12 @@ newsadmin='news' newslib='/tmp' newslibexp='/tmp' newsspool='none' +nm='/usr/bin/nm' nm_opt='' nm_so_opt='' nroff='/usr/bin/nroff' -optimize='none' +obj_ext='.o' +optimize=' ' orgdist='none' orgname='/etc/organization' osname='freebsd' @@ -240,6 +248,7 @@ overviewdir='remote' overviewfmt='none' package='trn' pager='/usr/bin/more' +path_sep=':' perl='/usr/bin/perl' perlpath='/usr/bin/perl' pg='pg' @@ -278,7 +287,8 @@ strn='define' subscriptions='' sysman='/usr/share/man/man1' tail='/usr/bin/tail' -termlib='-ltermlib' +tee='' +termlib='-lcursus' test='/bin/test' threaddir='remote' tk='undef' @@ -287,6 +297,7 @@ tklibs='' tr='/usr/bin/tr' trn_init='FALSE' trn_select='TRUE' +trnl='\n' uname='/usr/bin/uname' uniq='/usr/bin/uniq' useinews='/PREFIX/bin/inews' @@ -299,7 +310,9 @@ void='' vspell='' who='/usr/bin/who' xlibpth='/usr/lib/386 /lib/386' -PATCHLEVEL="4.0-test64 (30 April 1998)" +yacc='/usr/bin/byacc' +yaccflags='' +PATCHLEVEL="4.0-test77 (Sep 1, 2010)" CONFIG=true EOF |