mirror of
https://git.freebsd.org/ports.git
synced 2025-06-09 06:40:33 -04:00
fdd05e256a
devel/ncurses was installed, even though the dependency was registered, base ncurses would still be linked. PR: 219260 Submitted by: knu@
145 lines
3.4 KiB
Text
145 lines
3.4 KiB
Text
--- configure.orig 2014-04-26 03:58:46.000000000 -0700
|
|
+++ configure 2017-05-13 09:29:58.991277000 -0700
|
|
@@ -4858,63 +4858,6 @@
|
|
|
|
else
|
|
olibs="$LIBS"
|
|
-LIBS="-lcurses $olibs"
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libcurses..." >&5
|
|
-$as_echo "$as_me: checking libcurses..." >&6;}
|
|
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
-
|
|
-int
|
|
-main ()
|
|
-{
|
|
-
|
|
-#ifdef __hpux
|
|
-__sorry_hpux_libcurses_is_totally_broken_in_10_10();
|
|
-#else
|
|
-tgetent((char *)0, (char *)0);
|
|
-#endif
|
|
-
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"; then :
|
|
-
|
|
-else
|
|
- LIBS="-ltermcap $olibs"
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermcap..." >&5
|
|
-$as_echo "$as_me: checking libtermcap..." >&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="-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
|
|
-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
|
|
-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
|
|
@@ -5020,7 +4954,8 @@
|
|
|
|
main()
|
|
{
|
|
- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
|
|
+ char *tgoto(const char *, int, int);
|
|
+ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1);
|
|
}
|
|
_ACEOF
|
|
if ac_fn_c_try_run "$LINENO"; then :
|
|
@@ -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=
|
|
-if test -c /dev/ptmx ; then
|
|
+if test -c /nonexistent ; then
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -5178,19 +5113,16 @@
|
|
fi
|
|
rm -f conftest*
|
|
|
|
-if test "$ptys" != "$pdir/pty??" ; then
|
|
-p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
|
|
-p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
|
|
+# XXX: hardcoded, since port must be devfs and various setups independent
|
|
+
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define PTYRANGE0 "$p0"
|
|
+#define PTYRANGE0 "pqrsPQRSlmnoLMNO"
|
|
_ACEOF
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
-#define PTYRANGE1 "$p1"
|
|
+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
|
|
_ACEOF
|
|
|
|
-fi
|
|
-
|
|
|
|
# Check whether --with-pty-mode was given.
|
|
if test "${with_pty_mode+set}" = set; then :
|
|
@@ -5417,6 +5349,8 @@
|
|
#if defined(SVR4) && !defined(DGUX)
|
|
#include <utmpx.h>
|
|
#define utmp utmpx
|
|
+#define pututline pututxline
|
|
+#define getutent getutxent
|
|
#else
|
|
#include <utmp.h>
|
|
#endif
|
|
@@ -5485,6 +5419,10 @@
|
|
#if defined(SVR4) && !defined(DGUX)
|
|
#include <utmpx.h>
|
|
#define utmp utmpx
|
|
+#define pututline pututxline
|
|
+#define getutent getutxent
|
|
+#define pututline pututxline
|
|
+#define getutent getutxent
|
|
#else
|
|
#include <utmp.h>
|
|
#endif
|