Update xterm to 197.

Mainly bug fixes.  See http://dickey.his.com/xterm/xterm.log.html
for the complete changelog.

7 files changed, 5 insertions, 104 deletions

diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 24c3e28b85d..0f8f92c9255 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/12/16 16:25:09 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/21 17:24:48 minskim Exp $
 
-DISTNAME=	xterm-196
+DISTNAME=	xterm-197
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/
 EXTRACT_SUFX=	.tgz
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index bf097b9b6f5..41cf4ddfcfe 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,9 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/12/16 16:25:09 minskim Exp $
+$NetBSD: distinfo,v 1.9 2004/12/21 17:24:48 minskim Exp $
 
-SHA1 (xterm-196.tgz) = 7e1493d2578cb8d1d6038108e48aad44f40e2a61
-Size (xterm-196.tgz) = 678177 bytes
-SHA1 (patch-aa) = f4f624ba6fc9a3f7ac1641a093131f638ea52451
-SHA1 (patch-ab) = 34a4c95c2d90f38639cee856f202bcc86228e71b
-SHA1 (patch-ac) = d215ee65851b4b7b33211fad9b6d821d701a1fa8
-SHA1 (patch-ad) = fff3bc2b92d64eb242e025af5e47e7c8cac3b6f8
-SHA1 (patch-ae) = 343cac024bc66b9d64260815477d643c64c0d2a2
+SHA1 (xterm-197.tgz) = 32f2184c7e29fadd3c3e259184073bbe1d3bc637
+Size (xterm-197.tgz) = 690331 bytes
diff --git a/x11/xterm/patches/patch-aa b/x11/xterm/patches/patch-aa
deleted file mode 100644
index 8a7467f1d61..00000000000
--- a/x11/xterm/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/10/21 07:39:43 minskim Exp $
-
---- configure.in.orig	Sun Aug 15 16:07:59 2004
-+++ configure.in
-@@ -76,11 +76,13 @@ AC_CHECK_FUNCS( \
- 	bcopy \
- 	gethostname \
- 	getlogin \
-+	initgroups \
- 	memmove \
- 	strerror \
- 	strftime \
- 	tcgetattr \
- 	waitpid \
-+	setpgrp \
- 	)
- CF_FUNC_MEMMOVE
- CF_FUNC_TGETENT
diff --git a/x11/xterm/patches/patch-ab b/x11/xterm/patches/patch-ab
deleted file mode 100644
index 316c460a85d..00000000000
--- a/x11/xterm/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/10/21 07:39:43 minskim Exp $
-
---- xtermcfg.hin.orig	Tue May 25 20:19:55 2004
-+++ xtermcfg.hin
-@@ -43,6 +43,7 @@ OR IN CONNECTION WITH THE USE OR PERFORM
- #undef DFT_TERMTYPE		/* AC_ARG_WITH(default-term-type) */
- #undef HAVE_GETHOSTNAME		/* AC_CHECK_FUNCS(gethostname) */
- #undef HAVE_GETLOGIN		/* AC_CHECK_FUNCS(getlogin) */
-+#undef HAVE_INITGROUPS		/* AC_CHECK_FUNCS(initgroups) */
- #undef HAVE_LANGINFO_CODESET	/* AM_LANGINFO_CODESET */
- #undef HAVE_LASTLOG_H		/* CF_LASTLOG */
- #undef HAVE_LIB_NEXTAW		/* CF_X_ATHENA(--with-neXtaw) */
-@@ -51,6 +52,7 @@ OR IN CONNECTION WITH THE USE OR PERFORM
- #undef HAVE_LIB_XAWPLUS		/* CF_X_ATHENA(--with-XawPlus) */
- #undef HAVE_NCURSES_TERM_H	/* AC_CHECK_HEADERS(ncurses/term.h) */
- #undef HAVE_PATHS_H		/* CF_LASTLOG */
-+#undef HAVE_SETPGRP		/* AC_CHECK_FUNCS(setpgrp) */
- #undef HAVE_STDLIB_H		/* AC_CHECK_HEADERS(stdlib.h) */
- #undef HAVE_STRERROR		/* AC_CHECK_FUNCS(strerror) */
- #undef HAVE_STRFTIME		/* AC_CHECK_FUNCS(strftime) */
diff --git a/x11/xterm/patches/patch-ac b/x11/xterm/patches/patch-ac
deleted file mode 100644
index fd3d51fb1f2..00000000000
--- a/x11/xterm/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/10/21 07:39:43 minskim Exp $
-
---- configure.orig	Sun Aug 15 15:35:57 2004
-+++ configure
-@@ -1487,11 +1487,13 @@ for ac_func in \
- 	bcopy \
- 	gethostname \
- 	getlogin \
-+	initgroups \
- 	memmove \
- 	strerror \
- 	strftime \
- 	tcgetattr \
- 	waitpid \
-+	setpgrp \
- 	
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
diff --git a/x11/xterm/patches/patch-ad b/x11/xterm/patches/patch-ad
deleted file mode 100644
index 24ce0bd80c2..00000000000
--- a/x11/xterm/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/10/21 07:39:43 minskim Exp $
-
---- main.c.orig	Sun Aug 15 16:07:59 2004
-+++ main.c
-@@ -283,6 +283,10 @@ ttyslot()
- 
- #else
- 
-+#ifndef HAVE_SETPGRP
-+#define setpgrp setpgid
-+#endif
-+
- #ifndef linux
- #ifndef VMS
- #ifndef USE_POSIX_TERMIOS
-@@ -295,7 +299,9 @@ ttyslot()
- #else
- #include <sys/resource.h>
- #endif
-+#ifdef HAVE_INITGROUPS
- #define HAS_BSD_GROUPS
-+#endif
- #endif /* !VMS */
- #endif /* !linux */
- 
diff --git a/x11/xterm/patches/patch-ae b/x11/xterm/patches/patch-ae
deleted file mode 100644
index f2298b1d04e..00000000000
--- a/x11/xterm/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/10/21 07:51:14 minskim Exp $
-
---- xterm_io.h.orig	Thu Sep  9 21:14:20 2004
-+++ xterm_io.h
-@@ -58,7 +58,7 @@
- #define USE_SYSV_TERMIO
- #endif
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX)
- #ifndef USE_POSIX_TERMIOS
- #define USE_POSIX_TERMIOS
- #endif