Update to 1.4.1.

5 files changed, 26 insertions, 9 deletions

diff --git a/security/ipv6toolkit/Makefile b/security/ipv6toolkit/Makefile
index d59451daa58a..174386f3a0dd 100644
--- a/security/ipv6toolkit/Makefile
+++ b/security/ipv6toolkit/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ipv6toolkit
-PORTVERSION=	1.4
+PORTVERSION=	1.4.1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.si6networks.com/tools/ipv6toolkit/
 DISTNAME=	ipv6toolkit-v${PORTVERSION}
@@ -11,8 +11,8 @@ COMMENT=	Set of IPv6 security assessment tools
 
 LICENSE=	GPLv3
 
-MAKE_ENV=	DATADIR=${DATADIR}
-SUB_FILES=	BSDMakefile Makefile
+MAKE_ENV=	DATADIR=${DATADIR} WRKSRC=${WRKSRC}
+SUB_FILES=	BSDMakefile Makefile Makefile.lib
 MAKEFILE=	BSDMakefile
 PORTDOCS=	README.TXT CHANGES.TXT CONTRIB.TXT
 MAN1=		addr6.1 flow6.1 frag6.1 icmp6.1 jumbo6.1 na6.1 ni6.1 \
@@ -20,19 +20,23 @@ MAN1=		addr6.1 flow6.1 frag6.1 icmp6.1 jumbo6.1 na6.1 ni6.1 \
 MAN5=		ipv6toolkit.conf.5
 
 PROGDIRS=	${MAN1:S/.1//}
+LIBDIRS=	libipv6
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-extract:
-	@cd ${WRKSRC} && ${MKDIR} ${PROGDIRS}
+	@cd ${WRKSRC} && ${MKDIR} ${PROGDIRS} ${LIBDIRS}
 
 post-patch: apply-slist
 	${INSTALL_DATA} ${WRKDIR}/BSDMakefile ${WRKSRC}
 	for D in ${PROGDIRS}; do \
 		${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}/$$D; \
 	done
+	for D in ${LIBDIRS}; do \
+		${INSTALL_DATA} ${WRKDIR}/Makefile.lib ${WRKSRC}/$$D/Makefile; \
+	done
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
diff --git a/security/ipv6toolkit/distinfo b/security/ipv6toolkit/distinfo
index 3c691f334460..d591643355fc 100644
--- a/security/ipv6toolkit/distinfo
+++ b/security/ipv6toolkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ipv6toolkit-v1.4.tar.gz) = 50087c6bcd252b62401bb7b53e5747e8fb01fd7542d4680554bacf059245704e
-SIZE (ipv6toolkit-v1.4.tar.gz) = 481666
+SHA256 (ipv6toolkit-v1.4.1.tar.gz) = facf4ff7ff962644fcd37c04273000a480f3270eeb16b21e0c701032d2861b4f
+SIZE (ipv6toolkit-v1.4.1.tar.gz) = 469374
diff --git a/security/ipv6toolkit/files/BSDMakefile.in b/security/ipv6toolkit/files/BSDMakefile.in
index 37eaef219575..2eba54fbbb4f 100644
--- a/security/ipv6toolkit/files/BSDMakefile.in
+++ b/security/ipv6toolkit/files/BSDMakefile.in
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
-SUBDIR=	addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
+SUBDIR=	libipv6 addr6 flow6 frag6 icmp6 jumbo6 \
+	na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
 
 all: ${SUBDIR}
+addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6: libipv6
 
 .PATH: ${.CURDIR}/manuals
 
diff --git a/security/ipv6toolkit/files/Makefile.in b/security/ipv6toolkit/files/Makefile.in
index 9016dbee1883..169949de0083 100644
--- a/security/ipv6toolkit/files/Makefile.in
+++ b/security/ipv6toolkit/files/Makefile.in
@@ -15,7 +15,8 @@ NO_MANCOMPRESS=
 
 PROG=	${.CURDIR:T}
 MAN=	${PROG}.1
-LDADD=	-lpcap -lm
-CFLAGS+=	-DIPV6TOOLKITCONF=\"${PREFIX}/etc/ipv6toolkit.conf\"
+LDADD=	-lpcap -lm ${WRKSRC}/libipv6/libipv6.a
+CFLAGS+=-I${.CURDIR}/../tools \
+	-DIPV6TOOLKITCONF=\"${PREFIX}/etc/ipv6toolkit.conf\"
 
 .include <bsd.prog.mk>
diff --git a/security/ipv6toolkit/files/Makefile.lib.in b/security/ipv6toolkit/files/Makefile.lib.in
new file mode 100644
index 000000000000..8113bd567bb7
--- /dev/null
+++ b/security/ipv6toolkit/files/Makefile.lib.in
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+LIB=	ipv6
+SRCS=	libipv6.c
+
+.PATH: ${.CURDIR}/../tools
+
+install:
+
+.include <bsd.lib.mk>