From 13f52e382544d627b5e343cf8675ef685ec26e99 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Fri, 8 Dec 2000 15:18:39 +0000
Subject: [PATCH] - Update to #149. - Use 4755 installation mode; 4711 is
 excessively paranoid and breaks   SUDO package building. - Unkludge
 USE_POSIX_TERMIOS define.

---
 x11/xterm/Makefile                  |  7 +++----
 x11/xterm/files/md5                 |  6 +++---
 x11/xterm/patches/patch-sinstall_sh | 12 ++++++++++++
 x11/xterm/patches/patch-xterm_io_h  | 12 ++++++++++++
 4 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 x11/xterm/patches/patch-sinstall_sh
 create mode 100644 x11/xterm/patches/patch-xterm_io_h

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index d57e5342d7e..ad3a40a01b1 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2000/11/18 13:29:32 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2000/12/08 15:18:39 naddy Exp $
 
-DISTNAME=	xterm-148
+DISTNAME=	xterm-149
 CATEGORIES=	x11
-NEED_VERSION=	1.340
+NEED_VERSION=	1.341
 
 HOMEPAGE=	http://dickey.his.com/xterm/xterm.html
 
@@ -22,7 +22,6 @@ EXTRACT_SUFX=	.tgz
 USE_X11=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--enable-wide-chars
-CFLAGS+=		-DUSE_POSIX_TERMIOS=1
 
 .if ${FLAVOR:L:Mcol256}
 CONFIGURE_ARGS+=	--enable-256-color
diff --git a/x11/xterm/files/md5 b/x11/xterm/files/md5
index 407a27739bb..0a8e7f3767d 100644
--- a/x11/xterm/files/md5
+++ b/x11/xterm/files/md5
@@ -1,3 +1,3 @@
-MD5 (xterm-148.tgz) = b0654a306386e5ff4e54ec8cad46aacf
-RMD160 (xterm-148.tgz) = 52d86d595dcddd6d956c3a8afab0ae0be83d6cfa
-SHA1 (xterm-148.tgz) = 0a71044797e0d4e31a87ff24f3d3e2d1855eef14
+MD5 (xterm-149.tgz) = 19eb1132702c2beb640b319611d0d3ae
+RMD160 (xterm-149.tgz) = 86a6a35c6510453f86a942243eccea86a95da138
+SHA1 (xterm-149.tgz) = 4a5fb41edcf19d157c41432012dac29588b9a1b3
diff --git a/x11/xterm/patches/patch-sinstall_sh b/x11/xterm/patches/patch-sinstall_sh
new file mode 100644
index 00000000000..fb7519ca808
--- /dev/null
+++ b/x11/xterm/patches/patch-sinstall_sh
@@ -0,0 +1,12 @@
+$OpenBSD: patch-sinstall_sh,v 1.1 2000/12/08 15:18:40 naddy Exp $
+--- sinstall.sh.orig	Fri Dec  8 15:53:29 2000
++++ sinstall.sh	Fri Dec  8 15:54:03 2000
+@@ -63,7 +63,7 @@ if test -f "$REF_PROG" ; then
+ 	$trace "... see if mode \"$cf_mode\" has s-bit set"
+ 	case ".$cf_mode" in #(vi
+ 	.???s*) #(vi
+-		PROG_MODE=4711
++		PROG_MODE=4755
+ 		PROG_GRP=
+ 		;;
+ 	.??????s*)
diff --git a/x11/xterm/patches/patch-xterm_io_h b/x11/xterm/patches/patch-xterm_io_h
new file mode 100644
index 00000000000..80434b4b6fc
--- /dev/null
+++ b/x11/xterm/patches/patch-xterm_io_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-xterm_io_h,v 1.1 2000/12/08 15:18:40 naddy Exp $
+--- xterm_io.h.orig	Fri Dec  8 13:37:59 2000
++++ xterm_io.h	Fri Dec  8 13:38:59 2000
+@@ -63,7 +63,7 @@
+ #define USE_SYSV_TERMIO
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define USE_POSIX_TERMIOS
+ #endif
+