From owner-svn-ports-all@freebsd.org Wed Jul 6 09:00:09 2016 Return-Path: Delivered-To: svn-ports-all@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 0EA39B218FA; Wed, 6 Jul 2016 09:00:09 +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 B3B911F50; Wed, 6 Jul 2016 09:00:08 +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 u66907gt023755; Wed, 6 Jul 2016 09:00:07 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u66907ek023751; Wed, 6 Jul 2016 09:00:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201607060900.u66907ek023751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 6 Jul 2016 09:00:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418126 - in head/net/ccxstream: . 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-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2016 09:00:09 -0000 Author: amdmi3 Date: Wed Jul 6 09:00:07 2016 New Revision: 418126 URL: https://svnweb.freebsd.org/changeset/ports/418126 Log: - Switch to options helpers - Regenerate patches with `make makepatch` Modified: head/net/ccxstream/Makefile head/net/ccxstream/files/patch-ccxclientconn.c head/net/ccxstream/files/patch-ccxstream.c Modified: head/net/ccxstream/Makefile ============================================================================== --- head/net/ccxstream/Makefile Wed Jul 6 08:47:11 2016 (r418125) +++ head/net/ccxstream/Makefile Wed Jul 6 09:00:07 2016 (r418126) @@ -30,6 +30,8 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ccxstream ${STAGEDIR}${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/ccxtest ${STAGEDIR}${PREFIX}/bin + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} Modified: head/net/ccxstream/files/patch-ccxclientconn.c ============================================================================== --- head/net/ccxstream/files/patch-ccxclientconn.c Wed Jul 6 08:47:11 2016 (r418125) +++ head/net/ccxstream/files/patch-ccxclientconn.c Wed Jul 6 09:00:07 2016 (r418126) @@ -1,6 +1,6 @@ ---- ccxclientconn.c.orig Mon Mar 17 11:29:15 2003 -+++ ccxclientconn.c Tue May 15 14:58:52 2007 -@@ -51,6 +51,11 @@ +--- ccxclientconn.c.orig 2003-03-17 14:29:15 UTC ++++ ccxclientconn.c +@@ -51,6 +51,11 @@ static void cc_xstream_client_socket_set i = 1; setsockopt(sock, IPPROTO_TCP,TCP_NODELAY, &i, sizeof (i)); #endif /* TCP_NODELAY */ Modified: head/net/ccxstream/files/patch-ccxstream.c ============================================================================== --- head/net/ccxstream/files/patch-ccxstream.c Wed Jul 6 08:47:11 2016 (r418125) +++ head/net/ccxstream/files/patch-ccxstream.c Wed Jul 6 09:00:07 2016 (r418126) @@ -1,6 +1,6 @@ ---- ccxstream.c.orig Mon Mar 17 11:29:15 2003 -+++ ccxstream.c Tue May 15 15:02:31 2007 -@@ -1004,7 +1004,7 @@ +--- ccxstream.c.orig 2003-03-17 14:29:15 UTC ++++ ccxstream.c +@@ -1004,7 +1004,7 @@ int cc_xstream_handle_packet(CcXstreamCo for (fh = 0; fh < CC_XSTREAM_MAX_OPEN_FILES; fh++) if (conn->open_file_handle[fh] == handle) break; @@ -9,7 +9,7 @@ { cc_xstream_send_error(conn, id, CC_XSTREAM_XBMSP_ERROR_INVALID_HANDLE, "Invalid file handle."); return 1; -@@ -1016,10 +1016,19 @@ +@@ -1016,10 +1016,19 @@ int cc_xstream_handle_packet(CcXstreamCo } hlp = cc_xmalloc(rlen); sz = fread(hlp, 1, rlen, conn->f[fh]); @@ -29,7 +29,7 @@ cc_xfree(hlp); return 1; } -@@ -1661,6 +1670,16 @@ +@@ -1661,6 +1670,16 @@ int main(int argc, char **argv) setsockopt(prog->s, SOL_SOCKET, SO_REUSEPORT, (char *)&c, sizeof (c)); #endif /* SO_REUSEPORT */ @@ -46,7 +46,7 @@ memset(&sa, 0, sizeof (sa)); sa.sin_family = AF_INET; sa.sin_addr = la; -@@ -1693,6 +1712,10 @@ +@@ -1693,6 +1712,10 @@ int main(int argc, char **argv) c = 1; setsockopt(prog->bs, SOL_SOCKET, SO_BROADCAST, (char *)&c, sizeof (c)); #endif /* SO_BROADCAST */