3 files changed, 13 insertions, 60 deletions
diff --git a/sysutils/tits/patches/patch-aa b/sysutils/tits/patches/patch-aa
index 2e213592edc..a3ae1c55d50 100644
--- a/sysutils/tits/patches/patch-aa
+++ b/sysutils/tits/patches/patch-aa
@@ -1,15 +1,21 @@
-$NetBSD: patch-aa,v 1.5 2011/01/10 12:17:43 obache Exp $
+$NetBSD: patch-aa,v 1.6 2015/04/26 14:38:10 mef Exp $
 
 * for the case of ${PKG_SYSCONFDIR} != ${LOCALBASE}/etc
 
---- 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
+--- Makefile.orig	2011-01-15 21:47:19.000000000 +0900
++++ Makefile	2015-04-26 23:15:46.000000000 +0900
+@@ -39,12 +39,12 @@ SRCS+=	tty.c dispatcher.c setup.c config
+ SRCS+=	rtelnet.c
  
+ .if !defined(SMALLPROG)
 -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
+ .else
+ CPPFLAGS+= -DTITS_DEFAULT_CONFIG_FILE=\"/etc/tits.conf\"
+ .endif
+-CPPFLAGS+= -DTITS_DEFAULT_LINKDIR=\"/var/run\"
++CPPFLAGS+= -DTITS_DEFAULT_LINKDIR=\"${VARBASE}/run\"
  PREFIX?= /usr/local
+ BINDIR?= ${PREFIX}/sbin
+ 
diff --git a/sysutils/tits/patches/patch-af b/sysutils/tits/patches/patch-af
deleted file mode 100644
index bbdf25ab9d1..00000000000
--- a/sysutils/tits/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/01/10 12:47:03 obache Exp $
-
-* ignore WALLSIG if not exists.
-
---- stdio2pty.c.orig	2004-09-12 19:20:28.000000000 +0000
-+++ stdio2pty.c
-@@ -18,6 +18,10 @@
- 
- #define	MAX_BUFF_LEN	32768
- 
-+#ifndef WALLSIG
-+#define WALLSIG 0
-+#endif
-+
- static int all_done, exit_status, child_pid;
- 
- static struct buffer_ctx *stdout_buff;
diff --git a/sysutils/tits/patches/patch-ag b/sysutils/tits/patches/patch-ag
deleted file mode 100644
index d2bb612f854..00000000000
--- a/sysutils/tits/patches/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/01/10 12:47:03 obache Exp $
-
-* only for TIOCGFLAGS avalilable.
-
---- tty.c.orig	2006-03-19 11:32:48.000000000 +0000
-+++ tty.c
-@@ -32,6 +32,7 @@
- #include <sys/types.h>
- #include <sys/filio.h>
- #include <sys/ioctl.h>
-+#include <sys/stat.h>
- 
- #include <assert.h>
- #include <ctype.h>
-@@ -318,7 +319,9 @@ tty_open_device(struct client_ctx *cc)
- {
- 	struct tty_ctx *tc = cc->cc_data;
- 	struct termios tent;
-+#ifdef TIOCGFLAGS
- 	int flags;
-+#endif
- 	int fd, fd2;
- 
- 	if (tc->tc_open)
-@@ -369,7 +372,11 @@ tty_open_device(struct client_ctx *cc)
- 	 * If this is *not* a pseudo tty, ensure DTR is asserted.
- 	 * Note: This relies on TIOCGFLAGS returning ENOTTY for pty(4)'s.
- 	 */
-+#ifdef TIOCGFLAGS
- 	if (ioctl(fd, TIOCGFLAGS, &flags) == 0 && errno == ENOTTY &&
-+#else
-+	if (
-+#endif
- 	    ioctl(fd, TIOCSDTR, 0) < 0) {
- 		syslog(LOG_ALERT, "tty_open_device(): assert DTR failed (%d)",
- 		    errno);