Update to version 1.2.2.

Notable changes are:

- Added "closeidle true/false" to the tty server's config file
  option list to tell the server that it should close the terminal
  device when there are no clients connected to the service.

- If tits is invoked as "stdio2pty", it will allocate a pseudo-tty
  device and connect its stdin/stdout to the master side. It will
  fork(2) and exec(2) a program specified on the command line.
  This program will have *its* stdin/stdout connected to the
  slave side of the pty. One application for this is to execute
  pppd(8) from inetd.conf.

- Add a "masterpty" client, which makes it possible associate
  a pseudo-tty device with a service. For example, you can now
  use tip(1) to connect to the slave pty, which will cause the
  master side to be connected to the server.

- Adapt to NetBSD's more stringent <ctype> parameter checks.

- Gcc4 fixes, from Martin Husemann.

Ok'd by agc@

7 files changed, 14 insertions, 82 deletions

diff --git a/sysutils/tits/Makefile b/sysutils/tits/Makefile
index 0501f617ba8..f493fd0acc3 100644
--- a/sysutils/tits/Makefile
+++ b/sysutils/tits/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/06/25 09:49:51 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2006/09/19 19:42:48 scw Exp $
 #
 
-DISTNAME=       tits-1.1.1
-PKGREVISION=	1
+DISTNAME=       tits-1.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=   http://www.mctavish.co.uk/tits/
 
@@ -11,10 +10,7 @@ COMMENT=	Server which provides telnet(1) access to one or more tty ports
 
 BINDIR=		${PREFIX}/sbin
 MANDIR=		${PREFIX}/man
-MAKE_ENV+=	BINDIR=${BINDIR:Q} MANDIR=${MANDIR:Q}
-MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP}
-MAKE_ENV+=	MANOWN=${MANOWN} MANGRP=${MANGRP}
-RCD_SCRIPTS=	tits
+MAKE_ENV+=	BINDIR=${BINDIR} MANDIR=${MANDIR}
 
 MANCOMPRESSED_IF_MANZ=	yes
 
@@ -24,9 +20,6 @@ post-patch:
 	   -e 's|/usr/local|${PREFIX}|g'			\
 	   ${WRKSRC}/tits.8.in > ${WRKSRC}/tits.8
 
-pre-install:
-	${INSTALL_MAN_DIR} ${MANDIR}/cat8
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/tits.conf ${PREFIX}/share/examples/
 
diff --git a/sysutils/tits/distinfo b/sysutils/tits/distinfo
index ca9f3965c50..257330df4de 100644
--- a/sysutils/tits/distinfo
+++ b/sysutils/tits/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/09/09 23:13:12 martin Exp $
+$NetBSD: distinfo,v 1.8 2006/09/19 19:42:48 scw Exp $
 
-SHA1 (tits-1.1.1.tar.gz) = 7a8242a5700296d24d74ed155a79673a6b2255a5
-RMD160 (tits-1.1.1.tar.gz) = 5fe3503d630cc9bf2b1c9829071727050765df3d
-Size (tits-1.1.1.tar.gz) = 21411 bytes
-SHA1 (patch-aa) = cb97029249e318d30b859ad4479ae6cb0c0ffcf2
-SHA1 (patch-ab) = 028c622b79518cdfe62ee8a3144593e6830e1952
-SHA1 (patch-ac) = 9df6cac6d64978182d4ef6631b4a220126e9d930
-SHA1 (patch-ad) = 66dea133c934da864bbc22ff7eb610c34d55a67f
-SHA1 (patch-ae) = 439b5b608bb20cf0dde9e03f536f4196420e916e
+SHA1 (tits-1.2.2.tar.gz) = 18c80cc4d814af1b60d8b75e9777bcb7f8b8a8b8
+RMD160 (tits-1.2.2.tar.gz) = 1628dcf16cd5cf9f559a353024c69aef6a396856
+Size (tits-1.2.2.tar.gz) = 25384 bytes
+SHA1 (patch-aa) = 3aac576267df3564c44fb837e55ac3c776ce8dab
diff --git a/sysutils/tits/patches/patch-aa b/sysutils/tits/patches/patch-aa
index e487c828712..8a5246b709f 100644
--- a/sysutils/tits/patches/patch-aa
+++ b/sysutils/tits/patches/patch-aa
@@ -1,14 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2002/06/04 08:38:21 seb Exp $
-
---- Makefile.orig	Tue Feb 20 21:27:21 2001
-+++ Makefile
-@@ -37,7 +37,8 @@
- SRCS=	main.c buffer.c client.c context.c listener.c telnet.c tty.c
- SRCS+=	dispatcher.c setup.c config.c server.c logger.c
+--- Makefile.orig	2006-03-19 11:32:58.000000000 +0000
++++ Makefile	2006-09-19 14:10:20.000000000 +0100
+@@ -37,7 +37,7 @@
+ SRCS=	main.c buffer.c client.c context.c listener.c masterpty.c telnet.c
+ SRCS+=	tty.c dispatcher.c setup.c config.c server.c logger.c stdio2pty.c
  
 -CPPFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
-+
 +CPPFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${PKG_SYSCONFDIR}/tits.conf\"
+ CPPFLAGS+= -DTITS_DEFAULT_LINKDIR=\"/var/run\"
  LDADD+=	-lwrap
  PREFIX?= /usr/local
- BINDIR?= ${PREFIX}/sbin
diff --git a/sysutils/tits/patches/patch-ab b/sysutils/tits/patches/patch-ab
deleted file mode 100644
index 40f3e4c2fea..00000000000
--- a/sysutils/tits/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/12/14 00:30:22 kleink Exp $
-
---- listener.c.orig	2003-04-13 11:14:36.000000000 +0200
-+++ listener.c	2004-12-14 01:26:50.000000000 +0100
-@@ -221,7 +221,8 @@
- 
- #ifdef LIBWRAP
- 	if (lc->lc_args.la_use_wrappers) {
--		request_init(&req, RQ_DAEMON, isdigit(lc->lc_args.la_port[0]) ?
-+		request_init(&req, RQ_DAEMON,
-+			isdigit((unsigned char)lc->lc_args.la_port[0]) ?
- 			pname : lc->lc_args.la_port, RQ_FILE, fd, NULL);
- 		fromhost(&req);
- 		if (hosts_access(&req) == 0) {
diff --git a/sysutils/tits/patches/patch-ac b/sysutils/tits/patches/patch-ac
deleted file mode 100644
index d1f7abc3ed8..00000000000
--- a/sysutils/tits/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/12/14 00:30:22 kleink Exp $
-
---- config.c.orig	2001-02-18 22:00:41.000000000 +0100
-+++ config.c	2004-12-14 01:28:03.000000000 +0100
-@@ -477,7 +477,8 @@
- 	}
- 
- 	do {
--		if ((is_hex && !isxdigit(*p)) || (!is_hex && !isdigit(*p)))
-+		if ((is_hex && !isxdigit((unsigned char)*p)) ||
-+		    (!is_hex && !isdigit((unsigned char)*p)))
- 			return (config_err(cs, "Invalid integer: %s", arg));
- 	} while (*(++p) != '\0');
- 
diff --git a/sysutils/tits/patches/patch-ad b/sysutils/tits/patches/patch-ad
deleted file mode 100644
index 07ba0e06006..00000000000
--- a/sysutils/tits/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/09/09 23:13:12 martin Exp $
-
---- main.c.orig	2002-11-25 12:00:17.000000000 +0100
-+++ main.c	2005-09-10 01:08:07.000000000 +0200
-@@ -57,7 +57,7 @@ int
- main(int argc, char **argv)
- {
- 	const char *estr;
--	const char *conf_file;
-+	const char *conf_file = NULL;
- 
- 	if ((pname = strrchr(argv[0], '/')) == NULL)
- 		pname = argv[0];
diff --git a/sysutils/tits/patches/patch-ae b/sysutils/tits/patches/patch-ae
deleted file mode 100644
index f99f736af24..00000000000
--- a/sysutils/tits/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/09/09 23:13:12 martin Exp $
-
---- dispatcher.c.orig	2001-03-14 20:33:10.000000000 +0100
-+++ dispatcher.c	2005-09-10 01:10:33.000000000 +0200
-@@ -240,7 +240,7 @@ dispatcher_mainloop(void)
- 	nfds_t pfds;
- 	int nfds, errcnt = 0;
- 	int timeout;
--	time_t delta;
-+	time_t delta = 0;
- 
- 	while (!TAILQ_EMPTY(&contexts)) {
- 		for (pfds = 0, ctx = TAILQ_FIRST(&contexts); ctx != NULL;