From owner-svn-ports-all@freebsd.org Sun May 14 04:39:17 2017 Return-Path: Delivered-To: svn-ports-all@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 B040AD6C3FE; Sun, 14 May 2017 04:39:17 +0000 (UTC) (envelope-from cy@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 801E6973; Sun, 14 May 2017 04:39:17 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4E4dGhd027797; Sun, 14 May 2017 04:39:16 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4E4dGkR027795; Sun, 14 May 2017 04:39:16 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201705140439.v4E4dGkR027795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sun, 14 May 2017 04:39:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r440861 - in head/sysutils/screen: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 May 2017 04:39:17 -0000 Author: cy Date: Sun May 14 04:39:16 2017 New Revision: 440861 URL: https://svnweb.freebsd.org/changeset/ports/440861 Log: Properly detect devel/ncurses if installed and use it. Previously if devel/ncurses was installed, even though the dependency was registered, base ncurses would still be linked. PR: 219260 Submitted by: knu@ Modified: head/sysutils/screen/Makefile head/sysutils/screen/files/patch-configure Modified: head/sysutils/screen/Makefile ============================================================================== --- head/sysutils/screen/Makefile Sat May 13 23:50:49 2017 (r440860) +++ head/sysutils/screen/Makefile Sun May 14 04:39:16 2017 (r440861) @@ -3,7 +3,7 @@ PORTNAME= screen PORTVERSION= 4.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \ ftp://ftp.gnu.org/gnu/screen/ \ @@ -42,6 +42,9 @@ CPE_VENDOR= gnu .include GNU_CONFIGURE= yes +CFLAGS+= -I${NCURSESINC} +LDFLAGS+= -L${NCURSESLIB} + .if ${PORT_OPTIONS:MMAN} MAKE_ARGS+= WITH_MAN=1 PLIST_SUB+= MAN="" Modified: head/sysutils/screen/files/patch-configure ============================================================================== --- head/sysutils/screen/files/patch-configure Sat May 13 23:50:49 2017 (r440860) +++ head/sysutils/screen/files/patch-configure Sun May 14 04:39:16 2017 (r440861) @@ -1,6 +1,6 @@ --- configure.orig 2014-04-26 03:58:46.000000000 -0700 -+++ configure 2014-04-29 19:47:03.900706999 -0700 -@@ -4857,46 +4857,6 @@ ++++ configure 2017-05-13 09:29:58.991277000 -0700 +@@ -4858,63 +4858,6 @@ else olibs="$LIBS" @@ -44,10 +44,27 @@ -if ac_fn_c_try_link "$LINENO"; then : - -else - LIBS="-ltermlib $olibs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermlib..." >&5 - $as_echo "$as_me: checking libtermlib..." >&6;} -@@ -5001,12 +4961,6 @@ +- LIBS="-ltermlib $olibs" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermlib..." >&5 +-$as_echo "$as_me: checking libtermlib..." >&6;} +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +-tgetent((char *)0, (char *)0); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- +-else + LIBS="-lncursesw $olibs" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking libncursesw..." >&5 + $as_echo "$as_me: checking libncursesw..." >&6;} +@@ -4999,15 +4942,6 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -57,10 +74,13 @@ -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -@@ -5019,7 +4973,8 @@ +@@ -5020,7 +4954,8 @@ main() { @@ -70,7 +90,7 @@ } _ACEOF if ac_fn_c_try_run "$LINENO"; then : -@@ -5066,7 +5021,7 @@ +@@ -5067,7 +5002,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys..." >&5 $as_echo "$as_me: checking for SVR4 ptys..." >&6;} sysvr4ptys= @@ -79,7 +99,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -5177,19 +5132,16 @@ +@@ -5178,19 +5113,16 @@ fi rm -f conftest* @@ -103,7 +123,7 @@ # Check whether --with-pty-mode was given. if test "${with_pty_mode+set}" = set; then : -@@ -5416,6 +5368,8 @@ +@@ -5417,6 +5349,8 @@ #if defined(SVR4) && !defined(DGUX) #include #define utmp utmpx @@ -112,7 +132,7 @@ #else #include #endif -@@ -5484,6 +5438,10 @@ +@@ -5485,6 +5419,10 @@ #if defined(SVR4) && !defined(DGUX) #include #define utmp utmpx