Add hunk: don't assume bare split writes @_, because new perl doesn't.

Rename patchfile for new convention, and add comments.

3 files changed, 16 insertions, 7 deletions

diff --git a/graphics/xplot-devel/Makefile b/graphics/xplot-devel/Makefile
index 2c43e5e67cd..25f5bbb11f5 100644
--- a/graphics/xplot-devel/Makefile
+++ b/graphics/xplot-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2010/01/29 23:54:31 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2011/03/28 19:36:30 gdt Exp $
 
 DISTNAME=	xplot-0.90.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://acert.ir.bbn.com/downloads/acert-geospatial/
 HOMEPAGE=	http://www.xplot.org/
diff --git a/graphics/xplot-devel/distinfo b/graphics/xplot-devel/distinfo
index 796768a2317..d3b38110efd 100644
--- a/graphics/xplot-devel/distinfo
+++ b/graphics/xplot-devel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/10/16 18:20:29 gdt Exp $
+$NetBSD: distinfo,v 1.4 2011/03/28 19:36:30 gdt Exp $
 
 SHA1 (xplot-0.90.8.tar.gz) = d87a382b01c7a48787d2c6fa2d16e0961de9d81c
 RMD160 (xplot-0.90.8.tar.gz) = ac8877ad7fa1c80afa0281236b3a4992482109c2
 Size (xplot-0.90.8.tar.gz) = 243259 bytes
 SHA1 (patch-aa) = 48a475a550a2ea9d2bc50f2782d598830802817e
-SHA1 (patch-ab) = f7eaac7296a830584b2cf02324086101579cc3d5
 SHA1 (patch-ad) = fd19823030badf91734fde92b45fcaecc06cf0f8
+SHA1 (patch-tcpdump2xplot.pl) = 9e50ee6591d4fe68ae8839025aa8fd5d22d29503
diff --git a/graphics/xplot-devel/patches/patch-ab b/graphics/xplot-devel/patches/patch-tcpdump2xplot.pl
index 80622a6039b..4c1c4a5e13b 100644
--- a/graphics/xplot-devel/patches/patch-ab
+++ b/graphics/xplot-devel/patches/patch-tcpdump2xplot.pl
@@ -1,6 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2006/10/14 09:20:14 bad Exp $
+$NetBSD: patch-tcpdump2xplot.pl,v 1.1 2011/03/28 19:36:30 gdt Exp $
 
---- tcpdump2xplot.pl.orig	2006-07-27 21:55:59.000000000 +0200
+# This patch contains minor changes to parsing tcpdump to adapt to
+# tcpdump's output changes.  These changes should be merged upstream.
+# Upstream has no bug tracker but $MAINTAINER is an upstream maintainer.
+# Specifically:
+#   omit tos information - we don't use it and it confuses the parser
+#   bare split breaks in modern perl - assgin to @_ explicitly
+#   remove "IP" as second field
+#   allow multiple spaces when splitting sack.
+
+--- tcpdump2xplot.pl.orig	2006-07-27 19:55:59.000000000 +0000
 +++ tcpdump2xplot.pl
 @@ -229,12 +229,16 @@ for ($lineNo = 1; <$Tcpdump>; $lineNo++)
      local(%opts);
@@ -15,7 +24,7 @@ $NetBSD: patch-ab,v 1.1 2006/10/14 09:20:14 bad Exp $
 -    if ($_[1] == "IP") {
 -	splice @_,1,1;
 -    }
-+    split(/ +/);
++    @_ = split(/ +/);
 +    # Sometime after version 3.7.1 tcpdump started to print 'IP'
 +    # as the second field in the output. Get rid of it again.
 +    # also remove additional fields printed in verbose mode