diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2017-05-14 04:39:16 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2017-05-14 04:39:16 +0000 |
| commit | fdd05e256aa9a493f58a39d713b5dd0671faa112 (patch) | |
| tree | 4df016648fcaa8c7f86b565ed8a09ba037589052 /sysutils/screen | |
| parent | 17509a431f18b24f95c5e079f1b267178407b763 (diff) | |
Notes
Diffstat (limited to 'sysutils/screen')
| -rw-r--r-- | sysutils/screen/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/screen/files/patch-configure | 42 |
2 files changed, 35 insertions, 12 deletions
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 01cf4b36e610..4b8fe77f37e1 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -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="" diff --git a/sysutils/screen/files/patch-configure b/sysutils/screen/files/patch-configure index 557f71fe7eb5..309a2d1789dd 100644 --- a/sysutils/screen/files/patch-configure +++ b/sysutils/screen/files/patch-configure @@ -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 <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 |