From owner-svn-ports-head@freebsd.org  Sun Dec 27 11:53:01 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6AEEA533E7;
 Sun, 27 Dec 2015 11:53:01 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7B21012B3;
 Sun, 27 Dec 2015 11:53:01 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBRBr0tK028136;
 Sun, 27 Dec 2015 11:53:00 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBRBr03i028134;
 Sun, 27 Dec 2015 11:53:00 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201512271153.tBRBr03i028134@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sun, 27 Dec 2015 11:53:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r404561 - in head/misc/dtach: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Dec 2015 11:53:01 -0000

Author: amdmi3
Date: Sun Dec 27 11:53:00 2015
New Revision: 404561
URL: https://svnweb.freebsd.org/changeset/ports/404561

Log:
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Modified:
  head/misc/dtach/Makefile
  head/misc/dtach/files/patch-master.c

Modified: head/misc/dtach/Makefile
==============================================================================
--- head/misc/dtach/Makefile	Sun Dec 27 11:50:47 2015	(r404560)
+++ head/misc/dtach/Makefile	Sun Dec 27 11:53:00 2015	(r404561)
@@ -24,7 +24,9 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dtach ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/dtach.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/misc/dtach/files/patch-master.c
==============================================================================
--- head/misc/dtach/files/patch-master.c	Sun Dec 27 11:50:47 2015	(r404560)
+++ head/misc/dtach/files/patch-master.c	Sun Dec 27 11:53:00 2015	(r404561)
@@ -1,6 +1,6 @@
---- master.c.orig	2008-01-30 21:59:54.000000000 -0800
-+++ master.c	2010-01-12 10:30:56.000000000 -0800
-@@ -53,6 +53,8 @@
+--- master.c.orig	2008-01-31 05:59:54 UTC
++++ master.c
+@@ -53,6 +53,8 @@ struct client
  static struct client *clients;
  /* The pseudo-terminal created for the child process. */
  static struct pty the_pty;
@@ -9,7 +9,7 @@
  
  #ifndef HAVE_FORKPTY
  pid_t forkpty(int *amaster, char *name, struct termios *termp,
-@@ -66,6 +68,19 @@
+@@ -66,6 +68,19 @@ unlink_socket(void)
  	unlink(sockname);
  }
  
@@ -29,7 +29,7 @@
  /* Signal */
  static RETSIGTYPE 
  die(int sig)
-@@ -206,7 +221,8 @@
+@@ -206,7 +221,8 @@ create_socket(char *name)
  		return -1;
  	}
  	/* chmod it to prevent any suprises */
@@ -39,7 +39,7 @@
  	{
  		close(s);
  		return -1;
-@@ -454,6 +470,8 @@
+@@ -454,6 +470,8 @@ master_process(int s, char **argv, int w
  	/* Loop forever. */
  	while (1)
  	{
@@ -48,7 +48,7 @@
  		/* Re-initialize the file descriptor set for select. */
  		FD_ZERO(&readfds);
  		FD_SET(s, &readfds);
-@@ -480,8 +498,14 @@
+@@ -480,8 +498,14 @@ master_process(int s, char **argv, int w
  			FD_SET(p->fd, &readfds);
  			if (p->fd > highest_fd)
  				highest_fd = p->fd;