Fix multiline strings.

3 files changed, 39 insertions, 10 deletions

diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 22dc035aa57..10bfcad3100 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/21 22:26:53 kim Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/28 06:33:26 kim Exp $
 #
 
 DISTNAME=		tcptraceroute-1.4
@@ -7,7 +7,7 @@ MASTER_SITES=		http://michael.toren.net/code/tcptraceroute/
 
 MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://michael.toren.net/code/tcptraceroute/
-COMMENT=		A traceroute implementation using TCP packets
+COMMENT=		Traceroute implementation using TCP packets
 
 USE_BUILDLINK2=		YES
 
diff --git a/net/tcptraceroute/distinfo b/net/tcptraceroute/distinfo
index 6f953cf083b..8781cd67499 100644
--- a/net/tcptraceroute/distinfo
+++ b/net/tcptraceroute/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/21 22:26:53 kim Exp $
+$NetBSD: distinfo,v 1.2 2003/12/28 06:33:26 kim Exp $
 
 SHA1 (tcptraceroute-1.4.tar.gz) = 1dbd9a0a10b11695b0204bea460463a9dd921338
 Size (tcptraceroute-1.4.tar.gz) = 31918 bytes
 SHA1 (patch-aa) = 26899ae5898dcdbaa8b12a178ff6c2b362a675c9
-SHA1 (patch-ab) = d7c9a98cd31e374dbe8e39c6303da38bc0f749df
+SHA1 (patch-ab) = 0f6d5a568414163db201374ee6e81df064d4cf62
diff --git a/net/tcptraceroute/patches/patch-ab b/net/tcptraceroute/patches/patch-ab
index 9779126ca83..efef1cc5862 100644
--- a/net/tcptraceroute/patches/patch-ab
+++ b/net/tcptraceroute/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/07/21 22:26:53 kim Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/28 06:33:26 kim Exp $
 
---- tcptraceroute.c.orig	Tue Jul 30 17:51:27 2002
-+++ tcptraceroute.c	Mon Jul 21 18:14:11 2003
+--- tcptraceroute.c.orig	2002-07-30 17:51:27.000000000 -0400
++++ tcptraceroute.c	2003-12-28 00:58:09.000000000 -0500
 @@ -209,7 +209,7 @@
  #define AF_LINK AF_INET /* BSD defines some AF_INET network interfaces as AF_LINK */
  #endif
@@ -11,6 +11,21 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/07/21 22:26:53 kim Exp $
  #define HASSALEN /* Awful, awful hack to make subinterfaces work on BSD. */
  #endif
  
+@@ -391,10 +391,10 @@
+ void usage(void)
+ {
+ 	printf("\n%s\n%s\n", VERSION, BANNER);
+-    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]
+-       [-l <packet length>] [-q <number of queries>] [-t <tos>]
+-       [-m <max ttl>] [-pP] <source port>] [-s <source address>]
+-       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
++    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]\n"
++"       [-l <packet length>] [-q <number of queries>] [-t <tos>]\n"
++"       [-m <max ttl>] [-pP] <source port>] [-s <source address>]\n"
++"       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
+ }
+ 
+ void about(void)
 @@ -724,8 +724,7 @@
  		}
  #endif
@@ -21,18 +36,32 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/07/21 22:26:53 kim Exp $
  		{
  			debug("Ignoring non-AF_INET address on interface %s\n",
  				sprintable(ifr.ifr_name));
-@@ -1783,8 +1782,13 @@
+@@ -1182,9 +1181,9 @@
+ 	if (! (pcap = pcap_open_live(device, offset + SNAPLEN, 0, 10, errbuf)))
+ 		fatal("pcap_open_live failed: %s", errbuf);
+ 
+-	safe_snprintf(filter, TEXTSIZE, "
+-		(tcp and src host %s and src port %d and dst host %s)
+-		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
++	safe_snprintf(filter, TEXTSIZE,
++		"(tcp and src host %s and src port %d and dst host %s)"
++		" or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
+ 			iptos(dst_ip), dst_prt, iptos(src_ip), iptos(src_ip));
+ 
+ 	if (o_nofilter)
+@@ -1783,9 +1782,14 @@
  	o_dontfrag = 0;
  	o_timeout = 3;
  	o_nofilter = 0;
 -	o_noselect = 0;
  	o_nogetinterfaces = 0;
-+
+ 
 +#if defined(__NetBSD__)
 +	o_noselect = 1;
 +#else
 +	o_noselect = 0;
 +#endif
- 
++
  #if defined (__SVR4) && defined (__sun)
  	o_trackport = 1; /* --track-port should be the default for Solaris */
+ #else