From owner-svn-ports-head@freebsd.org  Fri Feb  5 14:50:25 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 799D0A9A5AC;
 Fri,  5 Feb 2016 14:50:25 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 317BB1DD6;
 Fri,  5 Feb 2016 14:50:25 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15EoON9041442;
 Fri, 5 Feb 2016 14:50:24 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15EoOkb041438;
 Fri, 5 Feb 2016 14:50:24 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201602051450.u15EoOkb041438@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Fri, 5 Feb 2016 14:50:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408195 - in head/news/trn4: . files scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2016 14:50:25 -0000

Author: marino
Date: Fri Feb  5 14:50:23 2016
New Revision: 408195
URL: https://svnweb.freebsd.org/changeset/ports/408195

Log:
  news/trn4: document ncurses requirement (USES+=ncurses)
  
  Also link with libncurses instead of libcurses or libtermlib.
  
  approved by:	infrastructure blanket

Added:
  head/news/trn4/files/patch-Configure   (contents, props changed)
Modified:
  head/news/trn4/Makefile
  head/news/trn4/scripts/preconf

Modified: head/news/trn4/Makefile
==============================================================================
--- head/news/trn4/Makefile	Fri Feb  5 14:18:45 2016	(r408194)
+++ head/news/trn4/Makefile	Fri Feb  5 14:50:23 2016	(r408195)
@@ -13,6 +13,8 @@ COMMENT=	Version 4.0 of the threaded rea
 
 CONFLICTS_INSTALL=trn-3.[0-9]* cnews-* s-news-[0-9]*
 
+USES=		ncurses
+
 .include <bsd.port.pre.mk>
 
 post-patch:

Added: head/news/trn4/files/patch-Configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/news/trn4/files/patch-Configure	Fri Feb  5 14:50:23 2016	(r408195)
@@ -0,0 +1,16 @@
+--- Configure.orig	2010-09-02 06:12:26 UTC
++++ Configure
+@@ -4920,10 +4920,10 @@ x)
+ esac
+ case "$xxx" in
+ x)
+-	xxx=`./loc libcurses.$so'*' x $libpth`
++	xxx=`./loc libncurses.$so'*' x $libpth`
+ 	case "$xxx" in
+-	/usr/lib*|/lib*)
+-		termlib='-lcurses'
++	/usr/lib*|/lib*|$prefix/lib*)
++		termlib='-lncurses'
+ 		d_havetlib="$define"
+ 		echo "Terminfo library found." >&4
+ 		;;

Modified: head/news/trn4/scripts/preconf
==============================================================================
--- head/news/trn4/scripts/preconf	Fri Feb  5 14:18:45 2016	(r408194)
+++ head/news/trn4/scripts/preconf	Fri Feb  5 14:50:23 2016	(r408195)
@@ -288,7 +288,7 @@ subscriptions=''
 sysman='/usr/share/man/man1'
 tail='/usr/bin/tail'
 tee=''
-termlib='-lcursus'
+termlib='-lncurses'
 test='/bin/test'
 threaddir='remote'
 tk='undef'