Update to 1.3.

9 files changed, 87 insertions, 89 deletions

diff --git a/security/ipv6toolkit/Makefile b/security/ipv6toolkit/Makefile
index ba00e71feb6e..5402501daee0 100644
--- a/security/ipv6toolkit/Makefile
+++ b/security/ipv6toolkit/Makefile
@@ -1,14 +1,9 @@
-# Ports collection makefile for:  ipv6toolkit
-# Date created:			  Mon, July 16, 2012
-# Whom:				  hrs
-#
 # $FreeBSD$
-#
 
 PORTNAME=	ipv6toolkit
-PORTVERSION=	1.2.3
+PORTVERSION=	1.3
 CATEGORIES=	security ipv6
-MASTER_SITES=	http://www.si6networks.com/research/
+MASTER_SITES=	http://www.si6networks.com/tools/ipv6toolkit/
 DISTNAME=	ipv6-toolkit-v${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -16,19 +11,20 @@ COMMENT=	A set of IPv6 security assessment tools
 
 LICENSE=	GPLv3
 
-.if !defined(NOPORTDOCS)
-MAKE_ENV=	WITH_DOCS=
-MAN1=		scan6.1
-.endif
+MAKE_ENV=	DATADIR=${DATADIR}
+MAKE_JOBS_SAFE=	yes
+PORTDOCS=	README.TXT
+MAN1=		flow6.1 frag6.1 icmp6.1 jumbos6.1 na6.1 ni6.1 ns6.1 ra6.1 \
+		rd6.1 rs6.1 scan6.1 tcp6.1
+MAN5=		ipv6toolkit.conf.5
 
-PORTDOCS=	README.TXT flow6-manual.pdf frag6-manual.pdf		\
-		icmp6-manual.pdf jumbo6-manual.pdf na6-manual.pdf	\
-		ni6-manual.pdf ns6-manual.pdf ra6-manual.pdf		\
-		rd6-manual.pdf rs6-manual.pdf scan6-manual.pdf		\
-		tcp6-manual.pdf
+post-patch:
+	${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
+		${WRKSRC}/data/ipv6toolkit.conf
 
 .if !defined(NOPORTDOCS)
 post-install:
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCSDIR}
 .endif
 
diff --git a/security/ipv6toolkit/distinfo b/security/ipv6toolkit/distinfo
index 8a77426fe4a7..08f2317b1503 100644
--- a/security/ipv6toolkit/distinfo
+++ b/security/ipv6toolkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ipv6-toolkit-v1.2.3.tar.gz) = 37fde545740ff58ff27a5cb9590cb1aef36206d163471d31c5f7531f501e90c5
-SIZE (ipv6-toolkit-v1.2.3.tar.gz) = 1407650
+SHA256 (ipv6-toolkit-v1.3.tar.gz) = d45bb9cec9ea3a65416c153eb03cdb93d85437e1b802a0ed05f19b886700843c
+SIZE (ipv6-toolkit-v1.3.tar.gz) = 2918536
diff --git a/security/ipv6toolkit/files/patch-Makefile b/security/ipv6toolkit/files/patch-Makefile
index 0f484c2717c9..7daca0f6b154 100644
--- a/security/ipv6toolkit/files/patch-Makefile
+++ b/security/ipv6toolkit/files/patch-Makefile
@@ -1,11 +1,47 @@
---- /dev/null	2012-07-17 03:01:43.000000000 +0900
-+++ Makefile	2012-07-17 03:02:23.000000000 +0900
-@@ -0,0 +1,8 @@
+--- Makefile.orig	2013-02-16 18:15:13.000000000 +0900
++++ Makefile	2013-02-17 07:19:34.000000000 +0900
+@@ -1,12 +1,14 @@
 +# $FreeBSD$
 +
-+SUBDIR=	tools
-+.if defined(WITH_DOCS)
-+SUBDIR+=	manuals
-+.endif
-+
-+.include <bsd.subdir.mk>
+ #
+ # SI6 Networks' IPv6 toolkit Makefile
+ #
+-CC= gcc
+-CFLAGS= -Wall
++CC?= gcc
++CFLAGS+= -Wall -DIPV6TOOLKITCONF=\"${PREFIX}/etc/ipv6toolkit.conf\"
+ LDFLAGS+= -lpcap -lm
+-MANPATH= /usr/share/man
+-DATAPATH= /usr/share
+-BINPATH= /usr/bin
++MANPATH= ${MANPREFIX}/man
++DATAPATH= ${DATADIR}
++BINPATH= ${PREFIX}/bin
+ SRCPATH= tools
+ TOOLS= flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
+ 
+@@ -54,18 +56,18 @@
+ install: all
+ 	# Install the binaries
+ 	install -m0755 -d $(BINPATH)
+-	install -m0755 $(TOOLS) $(BINPATH)
++	${BSD_INSTALL_PROGRAM} $(TOOLS) $(BINPATH)
+ 
+ 	# Install the configuration file
+-	install -m0644 data/ipv6toolkit.conf /etc	
++	${BSD_INSTALL_DATA} data/ipv6toolkit.conf ${PREFIX}/etc	
+ 
+ 	# Install the IEEE OUI database
+-	install -m0755 -d $(DATAPATH)/ipv6toolkit
+-	install -m0644 data/oui.txt $(DATAPATH)/ipv6toolkit
++	install -m0755 -d $(DATAPATH)
++	${BSD_INSTALL_DATA} -m0644 data/oui.txt $(DATAPATH)
+ 
+ 	# Install the manual pages
+ 	install -m0755 -d $(MANPATH)/man1
+-	install -m0644 manuals/*.1 $(MANPATH)/man1
++	${BSD_INSTALL_MAN} manuals/*.1 $(MANPATH)/man1
+ 	install -m0755 -d $(MANPATH)/man5
+-	install -m0644 manuals/*.5 $(MANPATH)/man1
++	${BSD_INSTALL_MAN} -m0644 manuals/*.5 $(MANPATH)/man5
+ 
diff --git a/security/ipv6toolkit/files/patch-data-ipv6toolkit.conf b/security/ipv6toolkit/files/patch-data-ipv6toolkit.conf
new file mode 100644
index 000000000000..b96ff2139a73
--- /dev/null
+++ b/security/ipv6toolkit/files/patch-data-ipv6toolkit.conf
@@ -0,0 +1,8 @@
+--- data/ipv6toolkit.conf.orig	2013-02-17 07:14:44.000000000 +0900
++++ data/ipv6toolkit.conf	2013-02-17 07:15:00.000000000 +0900
+@@ -1,4 +1,4 @@
+ # SI6 Networks IPv6 Toolkit Configuration File
+ 
+-OUI-Database=/usr/share/ipv6toolkit/oui.txt
++OUI-Database=%%DATADIR%%/oui.txt
+ 
diff --git a/security/ipv6toolkit/files/patch-manuals-Makefile b/security/ipv6toolkit/files/patch-manuals-Makefile
deleted file mode 100644
index 66e4596c5d81..000000000000
--- a/security/ipv6toolkit/files/patch-manuals-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- /dev/null	2012-07-17 03:15:58.000000000 +0900
-+++ manuals/Makefile	2012-07-17 03:16:10.000000000 +0900
-@@ -0,0 +1,18 @@
-+# $FreeBSD$
-+
-+PREFIX?=	/usr/local
-+FILESDIR?=	${DESTDIR}${PREFIX}/share/doc/ipv6toolkit
-+MANDIR?=	${DESTDIR}${PREFIX}/man/man
-+
-+FILES=	flow6-manual.pdf frag6-manual.pdf icmp6-manual.pdf		\
-+	jumbo6-manual.pdf na6-manual.pdf ni6-manual.pdf			\
-+	ns6-manual.pdf ra6-manual.pdf rd6-manual.pdf rs6-manual.pdf	\
-+	scan6-manual.pdf tcp6-manual.pdf
-+
-+NO_MANCOMPRESS=
-+MAN=	scan6.1
-+
-+beforeinstall:
-+	mkdir -p ${FILESDIR}
-+
-+.include <bsd.prog.mk>
diff --git a/security/ipv6toolkit/files/patch-tools-Makefile b/security/ipv6toolkit/files/patch-tools-Makefile
deleted file mode 100644
index 6450fad7c523..000000000000
--- a/security/ipv6toolkit/files/patch-tools-Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- /dev/null	2012-07-17 03:00:00.000000000 +0900
-+++ tools/Makefile	2012-07-17 02:59:01.000000000 +0900
-@@ -0,0 +1,37 @@
-+# $FreeBSD$
-+
-+PREFIX?=	/usr/local
-+BINDIR?=	${DESTDIR}${PREFIX}/bin
-+CFLAGS+=	-Wall
-+
-+PROG=	flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
-+
-+.for P in ${PROG}
-+PT:=${P}
-+${P}.o: ${P}.c ${P}.h
-+${P}: ${P}.o
-+.if ${PT:Mflow6}
-+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${P}.o -lpcap -lm
-+.elif ${PT:Mfrag6}
-+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${P}.o -lpcap -lm
-+.else
-+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${P}.o -lpcap
-+.endif
-+CLEANFILES+=	${P} ${P}.o
-+.endfor
-+
-+all: ${PROG}
-+
-+beforeinstall:
-+	mkdir -p ${BINDIR}
-+
-+realinstall: _proginstall
-+
-+_proginstall:
-+	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-+	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
-+
-+.include <bsd.init.mk>
-+.include <bsd.files.mk>
-+.include <bsd.obj.mk>
-+.include <bsd.sys.mk>
diff --git a/security/ipv6toolkit/files/patch-tools-scan6.c b/security/ipv6toolkit/files/patch-tools-scan6.c
new file mode 100644
index 000000000000..90f299f0b5d1
--- /dev/null
+++ b/security/ipv6toolkit/files/patch-tools-scan6.c
@@ -0,0 +1,16 @@
+--- tools/scan6.c.orig	2013-02-17 06:55:02.000000000 +0900
++++ tools/scan6.c	2013-02-17 06:56:04.000000000 +0900
+@@ -969,9 +969,11 @@
+ 	if(!pps_f && !bps_f)
+ 		pktinterval= 1000;
+ 
+-
++#ifndef	IPV6TOOLKITCONF
++#define	IPV6TOOLKITCONF	"/etc/ipv6toolkit.conf"
++#endif
+ 	if(!configfile_f){
+-		strncpy(configfile, "/etc/ipv6toolkit.conf", MAX_FILENAME_SIZE);
++		strncpy(configfile, IPV6TOOLKITCONF, MAX_FILENAME_SIZE);
+ 	}
+ 
+ 	if(tgt_vendor_f){
diff --git a/security/ipv6toolkit/pkg-descr b/security/ipv6toolkit/pkg-descr
index 7d206750f640..e5dcde600be7 100644
--- a/security/ipv6toolkit/pkg-descr
+++ b/security/ipv6toolkit/pkg-descr
@@ -1,4 +1,4 @@
 The IPv6 toolkit is a portable IPv6 security assessment suite produced
 by Fernando Gont on behalf of the UK CPNI.
 
-WWW:	http://www.si6networks.com/research/tools.html
+WWW:	http://www.si6networks.com/tools/ipv6toolkit/
diff --git a/security/ipv6toolkit/pkg-plist b/security/ipv6toolkit/pkg-plist
index 78b8e0cac737..856f126ef9dd 100644
--- a/security/ipv6toolkit/pkg-plist
+++ b/security/ipv6toolkit/pkg-plist
@@ -11,3 +11,6 @@ bin/rd6
 bin/rs6
 bin/scan6
 bin/tcp6
+etc/ipv6toolkit.conf
+%%DATADIR%%/oui.txt
+@dirrm %%DATADIR%%