Update security/ipv6-toolkit to version 1.4.1

Changes since previous version:

	SI6 Networks' IPv6 Toolkit v1.4.1

	   * frag6: Fixed bug that prevented Ethernet header from being filled
	     A bug in the code caused Ethernet frames to go on te wire without any of
	     their header fields completed.

	   * All: Use of library to avoid code replication
	     An "libipv6" library was created, such that common functions do not need
	     to be replicated for each tool. ni6, ns6, rs6, and tcp6 now employ such
	     library.

pkgsrc changes:

	* address6 and its man page are no longer installed

	* extend the Makefile changes to include the correct linkage for rs6 and tcp6
	  i.e. include the libipv6 object mentioned above

4 files changed, 30 insertions, 16 deletions

diff --git a/security/ipv6-toolkit/Makefile b/security/ipv6-toolkit/Makefile
index 66c57d90085..b86f2785b28 100644
--- a/security/ipv6-toolkit/Makefile
+++ b/security/ipv6-toolkit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/08/31 19:14:47 agc Exp $
+# $NetBSD: Makefile,v 1.9 2013/09/09 06:42:44 agc Exp $
 
-DISTNAME=	ipv6toolkit-v1.4
+DISTNAME=	ipv6toolkit-v1.4.1
 PKGNAME=	${DISTNAME:C/-v/-/}
-PKGREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://www.si6networks.com/tools/ipv6toolkit/
 
@@ -11,12 +10,10 @@ HOMEPAGE=	http://www.si6networks.com/tools/ipv6toolkit
 COMMENT=	IPv6 security assessment and troubleshooting tool
 LICENSE=	gnu-gpl-v3
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
-
 AUTO_MKDIRS=	yes
 
-BINS=		address6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
-MAN1=		address6.1 flow6.1 frag6.1 icmp6.1 jumbo6.1 na6.1 ni6.1 ns6.1
+BINS=		flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
+MAN1=		flow6.1 frag6.1 icmp6.1 jumbo6.1 na6.1 ni6.1 ns6.1
 MAN1+=		ra6.1 rd6.1 rs6.1 scan6.1 tcp6.1
 MAN5=		ipv6toolkit.conf.5
 
diff --git a/security/ipv6-toolkit/PLIST b/security/ipv6-toolkit/PLIST
index 1ca315cd48d..e1077e3dc93 100644
--- a/security/ipv6-toolkit/PLIST
+++ b/security/ipv6-toolkit/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/04/18 04:23:17 agc Exp $
-bin/address6
+@comment $NetBSD: PLIST,v 1.3 2013/09/09 06:42:44 agc Exp $
 bin/flow6
 bin/frag6
 bin/icmp6
@@ -12,7 +11,6 @@ bin/rd6
 bin/rs6
 bin/scan6
 bin/tcp6
-man/man1/address6.1
 man/man1/flow6.1
 man/man1/frag6.1
 man/man1/icmp6.1
diff --git a/security/ipv6-toolkit/distinfo b/security/ipv6-toolkit/distinfo
index 442f37109c6..2eac66ddd17 100644
--- a/security/ipv6-toolkit/distinfo
+++ b/security/ipv6-toolkit/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2013/08/31 19:14:47 agc Exp $
+$NetBSD: distinfo,v 1.9 2013/09/09 06:42:44 agc Exp $
 
-SHA1 (ipv6toolkit-1.4/ipv6toolkit-v1.4.tar.gz) = 08648022a9b026ab5adcf1de173d26e56e202d62
-RMD160 (ipv6toolkit-1.4/ipv6toolkit-v1.4.tar.gz) = 9e47985f6ed4b47a8269432fb46fca32baddd501
-Size (ipv6toolkit-1.4/ipv6toolkit-v1.4.tar.gz) = 481666 bytes
-SHA1 (patch-Makefile) = 217b9e8cf7b8478773bbc7ee8971d1fccfde2909
+SHA1 (ipv6toolkit-v1.4.1.tar.gz) = 09a90562c7cfe5849b11479daadc5416b03effc6
+RMD160 (ipv6toolkit-v1.4.1.tar.gz) = 43ff67290223a79e5cd58a5dd5801dc52f0ae245
+Size (ipv6toolkit-v1.4.1.tar.gz) = 469374 bytes
+SHA1 (patch-Makefile) = f8471f18a7fb1604357a9a4e55808e1c1f9c8f94
 SHA1 (patch-aa) = 594fb41b77258cae0d3ba81a78144c312728faa8
diff --git a/security/ipv6-toolkit/patches/patch-Makefile b/security/ipv6-toolkit/patches/patch-Makefile
index ea862ea05e3..ed59f5edbfc 100644
--- a/security/ipv6-toolkit/patches/patch-Makefile
+++ b/security/ipv6-toolkit/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.2 2013/08/24 16:12:24 agc Exp $
+$NetBSD: patch-Makefile,v 1.3 2013/09/09 06:42:45 agc Exp $
 
 Take ${CC} from environment
 
@@ -13,3 +13,22 @@ Take ${CC} from environment
  CFLAGS+= -Wall
  LDFLAGS+= -lpcap -lm
  
+@@ -78,14 +78,14 @@
+ rd6: $(SRCPATH)/rd6.c $(SRCPATH)/rd6.h $(SRCPATH)/ipv6toolkit.h
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -o rd6 $(SRCPATH)/rd6.c $(LDFLAGS)
+ 
+-rs6: $(SRCPATH)/rs6.c $(SRCPATH)/rs6.h $(SRCPATH)/ipv6toolkit.h
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -o rs6 $(SRCPATH)/rs6.c $(LDFLAGS)
++rs6: $(SRCPATH)/rs6.c $(SRCPATH)/rs6.h $(LIBS) $(SRCPATH)/ipv6toolkit.h
++	$(CC) $(CPPFLAGS) $(CFLAGS) -o rs6 $(SRCPATH)/rs6.c $(LIBS) $(LDFLAGS)
+ 
+ scan6: $(SRCPATH)/scan6.c $(SRCPATH)/scan6.h $(SRCPATH)/ipv6toolkit.h
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -o scan6 $(SRCPATH)/scan6.c $(LDFLAGS)
+ 
+-tcp6: $(SRCPATH)/tcp6.c $(SRCPATH)/tcp6.h $(SRCPATH)/ipv6toolkit.h
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -o tcp6 $(SRCPATH)/tcp6.c $(LDFLAGS)
++tcp6: $(SRCPATH)/tcp6.c $(SRCPATH)/tcp6.h $(LIBS) $(SRCPATH)/ipv6toolkit.h
++	$(CC) $(CPPFLAGS) $(CFLAGS) -o tcp6 $(SRCPATH)/tcp6.c $(LIBS) $(LDFLAGS)
+ 
+ libipv6.o: $(SRCPATH)/libipv6.c $(SRCPATH)/libipv6.h
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o libipv6.o $(SRCPATH)/libipv6.c