6 files changed, 37 insertions, 37 deletions

diff --git a/security/ipv6toolkit/Makefile b/security/ipv6toolkit/Makefile
index 4705777f6170..d59451daa58a 100644
--- a/security/ipv6toolkit/Makefile
+++ b/security/ipv6toolkit/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	ipv6toolkit
-PORTVERSION=	1.3.4
+PORTVERSION=	1.4
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.si6networks.com/tools/ipv6toolkit/
-DISTNAME=	ipv6-toolkit-v${PORTVERSION}
+DISTNAME=	ipv6toolkit-v${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Set of IPv6 security assessment tools
@@ -14,8 +14,8 @@ LICENSE=	GPLv3
 MAKE_ENV=	DATADIR=${DATADIR}
 SUB_FILES=	BSDMakefile Makefile
 MAKEFILE=	BSDMakefile
-PORTDOCS=	README.TXT
-MAN1=		address6.1 flow6.1 frag6.1 icmp6.1 jumbo6.1 na6.1 ni6.1 \
+PORTDOCS=	README.TXT CHANGES.TXT CONTRIB.TXT
+MAN1=		addr6.1 flow6.1 frag6.1 icmp6.1 jumbo6.1 na6.1 ni6.1 \
 		ns6.1 ra6.1 rd6.1 rs6.1 scan6.1 tcp6.1
 MAN5=		ipv6toolkit.conf.5
 
@@ -29,8 +29,6 @@ post-extract:
 	@cd ${WRKSRC} && ${MKDIR} ${PROGDIRS}
 
 post-patch: apply-slist
-	${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
-		${WRKSRC}/data/ipv6toolkit.conf
 	${INSTALL_DATA} ${WRKDIR}/BSDMakefile ${WRKSRC}
 	for D in ${PROGDIRS}; do \
 		${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}/$$D; \
@@ -39,7 +37,7 @@ post-patch: apply-slist
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/ipv6toolkit/distinfo b/security/ipv6toolkit/distinfo
index 7473572e3467..3c691f334460 100644
--- a/security/ipv6toolkit/distinfo
+++ b/security/ipv6toolkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ipv6-toolkit-v1.3.4.tar.gz) = 75ff27cd30407cd57f35a7646b82e6fede9cfc7e1fac089b3da43e547424af48
-SIZE (ipv6-toolkit-v1.3.4.tar.gz) = 1052088
+SHA256 (ipv6toolkit-v1.4.tar.gz) = 50087c6bcd252b62401bb7b53e5747e8fb01fd7542d4680554bacf059245704e
+SIZE (ipv6toolkit-v1.4.tar.gz) = 481666
diff --git a/security/ipv6toolkit/files/BSDMakefile.in b/security/ipv6toolkit/files/BSDMakefile.in
index a5d922db242d..37eaef219575 100644
--- a/security/ipv6toolkit/files/BSDMakefile.in
+++ b/security/ipv6toolkit/files/BSDMakefile.in
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	address6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
+SUBDIR=	addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
 
 all: ${SUBDIR}
 
@@ -8,17 +8,22 @@ all: ${SUBDIR}
 
 FILESGROUPS=	CONF DB
 CONF=		data/ipv6toolkit.conf
-CONFDIR?=	${PREFIX}/etc
+CONFDIR?=	/etc
 DB=		data/oui.txt
-DBDIR?=		${PREFIX}/share/ipv6toolkit
+DBDIR?=		/share/ipv6toolkit
 
 PREFIX?=	/usr/local
-MANDIR?=	${PREFIX}/man/man
+DESTDIR=	${PREFIX}
+MANDIR?=	/man/man
 MAN=		ipv6toolkit.conf.5
 NO_MANCOMPRESS=
 
+data/ipv6toolkit.conf:
+	echo "# SI6 Networks' IPv6 Toolkit Configuration File" > ${.TARGET}
+	echo OUI-Database=${DESTDIR}${DBDIR}/oui.txt >> ${.TARGET}
+
 beforeinstall:
-	install -d -m 0555 ${DBDIR}
+	install -d -m 0555 ${DESTDIR}${DBDIR}
 afterinstall: installfiles maninstall
 
 .include <bsd.prog.mk>
diff --git a/security/ipv6toolkit/files/Makefile.in b/security/ipv6toolkit/files/Makefile.in
index d1d4a132a3f1..9016dbee1883 100644
--- a/security/ipv6toolkit/files/Makefile.in
+++ b/security/ipv6toolkit/files/Makefile.in
@@ -2,8 +2,13 @@
 
 PREFIX?=	/usr/local
 LOCALBASE?=	/usr/local
-BINDIR?=	${PREFIX}/bin
-MANDIR?=	${PREFIX}/man/man
+DESTDIR=	${PREFIX}
+.if ${.CURDIR:T} == addr6
+BINDIR?=	/bin
+.else
+BINDIR?=	/sbin
+.endif
+MANDIR?=	/man/man
 NO_MANCOMPRESS=
 
 .PATH: ${.CURDIR}/../tools ${.CURDIR}/../manuals
diff --git a/security/ipv6toolkit/files/patch-data-ipv6toolkit.conf b/security/ipv6toolkit/files/patch-data-ipv6toolkit.conf
deleted file mode 100644
index b96ff2139a73..000000000000
--- a/security/ipv6toolkit/files/patch-data-ipv6toolkit.conf
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/pkg-plist b/security/ipv6toolkit/pkg-plist
index 69769ff6b798..085803e1c634 100644
--- a/security/ipv6toolkit/pkg-plist
+++ b/security/ipv6toolkit/pkg-plist
@@ -1,17 +1,17 @@
 @comment $FreeBSD$
-bin/address6
-bin/flow6
-bin/frag6
-bin/icmp6
-bin/jumbo6
-bin/na6
-bin/ni6
-bin/ns6
-bin/ra6
-bin/rd6
-bin/rs6
-bin/scan6
-bin/tcp6
+bin/addr6
+sbin/flow6
+sbin/frag6
+sbin/icmp6
+sbin/jumbo6
+sbin/na6
+sbin/ni6
+sbin/ns6
+sbin/ra6
+sbin/rd6
+sbin/rs6
+sbin/scan6
+sbin/tcp6
 etc/ipv6toolkit.conf
 %%DATADIR%%/oui.txt
 @dirrm %%DATADIR%%