Update to v2.0beta.

5 files changed, 24 insertions, 11 deletions

diff --git a/security/ipv6toolkit/Makefile b/security/ipv6toolkit/Makefile
index 3774aedd1e6..5b71c734b28 100644
--- a/security/ipv6toolkit/Makefile
+++ b/security/ipv6toolkit/Makefile
@@ -1,22 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	ipv6toolkit
-PORTVERSION=	1.5.2
+PORTVERSION=	2.0.b
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.si6networks.com/tools/ipv6toolkit/
-DISTNAME=	ipv6toolkit-v${PORTVERSION}
+DISTNAME=	ipv6toolkit-v2.0beta
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Set of IPv6 security assessment tools
 
 LICENSE=	GPLv3
 
+USES=		shebangfix
+SHEBANG_FILES=	tools/blackhole6 tools/script6
 MAKE_ENV=	DATADIR=${DATADIR} WRKSRC=${WRKSRC}
 SUB_FILES=	BSDMakefile Makefile Makefile.lib
 MAKEFILE=	BSDMakefile
-PORTDOCS=	README.TXT CHANGES.TXT CONTRIB.TXT
+PORTDOCS=	README.TXT CHANGES.TXT CREDITS.TXT
 
-PROGDIRS=	addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 \
+PROGDIRS=	addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 path6 ra6 rd6 rs6 \
 		scan6 tcp6
 LIBDIRS=	libipv6
 
@@ -36,8 +38,10 @@ post-patch: apply-slist
 		${INSTALL_DATA} ${WRKDIR}/Makefile.lib ${WRKSRC}/$$D/Makefile; \
 	done
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/blackhole6 ${WRKSRC}/tools/script6 \
+	    ${STAGEDIR}${PREFIX}/sbin
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
diff --git a/security/ipv6toolkit/distinfo b/security/ipv6toolkit/distinfo
index 6156c1893b7..48ff3b21660 100644
--- a/security/ipv6toolkit/distinfo
+++ b/security/ipv6toolkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ipv6toolkit-v1.5.2.tar.gz) = 299af685fad82f9b373ea0fc9daa53ca62c81b717d9ddeb59f7329ffa2ea8212
-SIZE (ipv6toolkit-v1.5.2.tar.gz) = 422780
+SHA256 (ipv6toolkit-v2.0beta.tar.gz) = f8205623a53878b4273b0ee5fb819d02ff8c1759f891ec242097bcb988b6dc5a
+SIZE (ipv6toolkit-v2.0beta.tar.gz) = 1151990
diff --git a/security/ipv6toolkit/files/BSDMakefile.in b/security/ipv6toolkit/files/BSDMakefile.in
index 7cb0afb665e..986e938eb4f 100644
--- a/security/ipv6toolkit/files/BSDMakefile.in
+++ b/security/ipv6toolkit/files/BSDMakefile.in
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 SUBDIR=	libipv6 addr6 flow6 frag6 icmp6 jumbo6 \
-	na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
+	na6 ni6 ns6 path6 ra6 rd6 rs6 scan6 tcp6
 
 all: ${SUBDIR}
-addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6: libipv6
+addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 path6 ra6 rd6 rs6 scan6 tcp6: libipv6
 
 .PATH: ${.CURDIR}/manuals
 
@@ -17,15 +17,16 @@ DBDIR?=		${PREFIX}/share/ipv6toolkit
 PREFIX?=	/usr/local
 BINDIR?=	${PREFIX}/bin
 MANDIR?=	${PREFIX}/man/man
-MAN=		ipv6toolkit.conf.5
+MAN=		blackhole6.1 script6.1 ipv6toolkit.conf.5 ipv6toolkit.7
 NO_MANCOMPRESS=
+WITH_INSTALL_AS_USER=yes
 
 data/ipv6toolkit.conf:
 	echo "# SI6 Networks' IPv6 Toolkit Configuration File" > ${.TARGET}
 	echo OUI-Database=${DESTDIR}${DBDIR}/oui.txt >> ${.TARGET}
 
 beforeinstall:
-	install -d -m 0555 ${DESTDIR}${DBDIR}
+	install -d -m 0755 ${DESTDIR}${DBDIR}
 afterinstall: installfiles maninstall
 
 .include <bsd.prog.mk>
diff --git a/security/ipv6toolkit/files/Makefile.in b/security/ipv6toolkit/files/Makefile.in
index f4dcaafc4ab..7dcf6b9161d 100644
--- a/security/ipv6toolkit/files/Makefile.in
+++ b/security/ipv6toolkit/files/Makefile.in
@@ -9,6 +9,7 @@ BINDIR?=	${PREFIX}/sbin
 .endif
 MANDIR?=	${PREFIX}/man/man
 NO_MANCOMPRESS=
+WITH_INSTALL_AS_USER=yes
 
 .PATH: ${.CURDIR}/../tools ${.CURDIR}/../manuals
 
diff --git a/security/ipv6toolkit/pkg-plist b/security/ipv6toolkit/pkg-plist
index 64d5d0fd85c..2ab26c5f47a 100644
--- a/security/ipv6toolkit/pkg-plist
+++ b/security/ipv6toolkit/pkg-plist
@@ -1,4 +1,5 @@
 bin/addr6
+sbin/blackhole6
 sbin/flow6
 sbin/frag6
 sbin/icmp6
@@ -6,13 +7,16 @@ sbin/jumbo6
 sbin/na6
 sbin/ni6
 sbin/ns6
+sbin/path6
 sbin/ra6
 sbin/rd6
 sbin/rs6
 sbin/scan6
+sbin/script6
 sbin/tcp6
 etc/ipv6toolkit.conf
 man/man1/addr6.1.gz
+man/man1/blackhole6.1.gz
 man/man1/flow6.1.gz
 man/man1/frag6.1.gz
 man/man1/icmp6.1.gz
@@ -20,11 +24,14 @@ man/man1/jumbo6.1.gz
 man/man1/na6.1.gz
 man/man1/ni6.1.gz
 man/man1/ns6.1.gz
+man/man1/path6.1.gz
 man/man1/ra6.1.gz
 man/man1/rd6.1.gz
 man/man1/rs6.1.gz
 man/man1/scan6.1.gz
+man/man1/script6.1.gz
 man/man1/tcp6.1.gz
 man/man5/ipv6toolkit.conf.5.gz
+man/man7/ipv6toolkit.7.gz
 %%DATADIR%%/oui.txt
 @dirrm %%DATADIR%%