mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

Properly detect devel/ncurses if installed and use it. Previously if

Browse Source 
devel/ncurses was installed, even though the dependency was registered,
base ncurses would still be linked.

PR:		219260
Submitted by:	knu@
This commit is contained in:
Cy Schubert 2017-05-14 04:39:16 +00:00
parent 17509a431f
commit fdd05e256a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=440861
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/screen/Makefile
View File

@ -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 <bsd.port.options.mk>
GNU_CONFIGURE= yes
CFLAGS+= -I${NCURSESINC}
LDFLAGS+= -L${NCURSESLIB}
.if ${PORT_OPTIONS:MMAN}
MAKE_ARGS+= WITH_MAN=1
PLIST_SUB+= MAN=""

42
sysutils/screen/files/patch-configure
View File

@ -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
@ -56,11 +73,14 @@
- conftest$ac_exeext conftest.$ac_ext
-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 <utmpx.h>
#define utmp utmpx
@ -112,7 +132,7 @@
#else
#include <utmp.h>
#endif
@@ -5484,6 +5438,10 @@
@@ -5485,6 +5419,10 @@
#if defined(SVR4) && !defined(DGUX)
#include <utmpx.h>
#define utmp utmpx