summaryrefslogtreecommitdiff
path: root/misc/screen/files/patch-ad
diff options
context:
space:
mode:
Diffstat (limited to 'misc/screen/files/patch-ad')
-rw-r--r--misc/screen/files/patch-ad40
1 files changed, 27 insertions, 13 deletions
diff --git a/misc/screen/files/patch-ad b/misc/screen/files/patch-ad
index 4c2627ecabbe..d9981af2f6f1 100644
--- a/misc/screen/files/patch-ad
+++ b/misc/screen/files/patch-ad
@@ -1,14 +1,14 @@
---- configure.orig Wed Jun 14 18:04:30 2000
-+++ configure Mon Dec 11 05:52:29 2000
-@@ -2070,29 +2070,6 @@
+--- configure.orig Thu May 17 21:05:43 2001
++++ configure Mon Jun 25 08:48:53 2001
+@@ -2158,29 +2158,6 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
olibs="$LIBS"
-LIBS="-lcurses $olibs"
-echo "checking libcurses" 1>&6
--echo "configure:2076: checking libcurses" >&5
+-echo "configure:2164: checking libcurses" >&5
-cat > conftest.$ac_ext <<EOF
--#line 2078 "configure"
+-#line 2166 "configure"
-#include "confdefs.h"
-
-int main() {
@@ -21,7 +21,7 @@
-
-; return 0; }
-EOF
--if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- :
-else
- echo "configure: failed program was:" >&5
@@ -29,8 +29,8 @@
- rm -rf conftest*
LIBS="-ltermcap $olibs"
echo "checking libtermcap" 1>&6
- echo "configure:2099: checking libtermcap" >&5
-@@ -2153,8 +2130,6 @@
+ echo "configure:2187: checking libtermcap" >&5
+@@ -2241,8 +2218,6 @@
rm -f conftest*
fi
rm -f conftest*
@@ -39,7 +39,7 @@
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-@@ -2165,7 +2140,7 @@
+@@ -2253,7 +2228,7 @@
main()
{
@@ -47,13 +47,27 @@
+ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1);
}
EOF
- if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-@@ -2270,7 +2245,7 @@
- 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'`
+ if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+@@ -2354,18 +2329,15 @@
+ 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 <<EOF
-#define PTYRANGE0 "$p0"
+#define PTYRANGE0 "pqrsPQRS"
EOF
cat >> confdefs.h <<EOF
+-#define PTYRANGE1 "$p1"
++#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
+ EOF
+-
+-fi
+
+ echo "checking default tty permissions/group" 1>&6
+ echo "configure:2372: checking default tty permissions/group" >&5