svn commit: r339963 - in head/security/ipv6toolkit: . files

[Hiroki Sato]

Author: hrs
Date: Thu Jan 16 18:54:26 2014
New Revision: 339963
URL: http://svnweb.freebsd.org/changeset/ports/339963
QAT: https://qat.redports.org/buildarchive/r339963/

Log:
  - Update to 1.5.2.
  - Add STAGEDIR support.

Deleted:
  head/security/ipv6toolkit/files/patch-tools-icmp6.c
Modified:
  head/security/ipv6toolkit/Makefile
  head/security/ipv6toolkit/distinfo
  head/security/ipv6toolkit/files/BSDMakefile.in
  head/security/ipv6toolkit/files/Makefile.in
  head/security/ipv6toolkit/pkg-plist

Modified: head/security/ipv6toolkit/Makefile
==============================================================================
--- head/security/ipv6toolkit/Makefile	Thu Jan 16 18:44:57 2014	(r339962)
+++ head/security/ipv6toolkit/Makefile	Thu Jan 16 18:54:26 2014	(r339963)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ipv6toolkit
-PORTVERSION=	1.4.1
+PORTVERSION=	1.5.2
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.si6networks.com/tools/ipv6toolkit/
 DISTNAME=	ipv6toolkit-v${PORTVERSION}
@@ -15,16 +15,13 @@ MAKE_ENV=	DATADIR=${DATADIR} WRKSRC=${WR
 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 \
-		ns6.1 ra6.1 rd6.1 rs6.1 scan6.1 tcp6.1
-MAN5=		ipv6toolkit.conf.5
 
-PROGDIRS=	${MAN1:S/.1//}
+PROGDIRS=	addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 \
+		scan6 tcp6
 LIBDIRS=	libipv6
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-extract:
@@ -41,8 +38,8 @@ post-patch: apply-slist
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/security/ipv6toolkit/distinfo
==============================================================================
--- head/security/ipv6toolkit/distinfo	Thu Jan 16 18:44:57 2014	(r339962)
+++ head/security/ipv6toolkit/distinfo	Thu Jan 16 18:54:26 2014	(r339963)
@@ -1,2 +1,2 @@
-SHA256 (ipv6toolkit-v1.4.1.tar.gz) = facf4ff7ff962644fcd37c04273000a480f3270eeb16b21e0c701032d2861b4f
-SIZE (ipv6toolkit-v1.4.1.tar.gz) = 469374
+SHA256 (ipv6toolkit-v1.5.2.tar.gz) = 299af685fad82f9b373ea0fc9daa53ca62c81b717d9ddeb59f7329ffa2ea8212
+SIZE (ipv6toolkit-v1.5.2.tar.gz) = 422780

Modified: head/security/ipv6toolkit/files/BSDMakefile.in
==============================================================================
--- head/security/ipv6toolkit/files/BSDMakefile.in	Thu Jan 16 18:44:57 2014	(r339962)
+++ head/security/ipv6toolkit/files/BSDMakefile.in	Thu Jan 16 18:54:26 2014	(r339963)
@@ -10,13 +10,13 @@ addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 n
 
 FILESGROUPS=	CONF DB
 CONF=		data/ipv6toolkit.conf
-CONFDIR?=	/etc
+CONFDIR?=	${PREFIX}/etc
 DB=		data/oui.txt
-DBDIR?=		/share/ipv6toolkit
+DBDIR?=		${PREFIX}/share/ipv6toolkit
 
 PREFIX?=	/usr/local
-DESTDIR=	${PREFIX}
-MANDIR?=	/man/man
+BINDIR?=	${PREFIX}/bin
+MANDIR?=	${PREFIX}/man/man
 MAN=		ipv6toolkit.conf.5
 NO_MANCOMPRESS=
 

Modified: head/security/ipv6toolkit/files/Makefile.in
==============================================================================
--- head/security/ipv6toolkit/files/Makefile.in	Thu Jan 16 18:44:57 2014	(r339962)
+++ head/security/ipv6toolkit/files/Makefile.in	Thu Jan 16 18:54:26 2014	(r339963)
@@ -2,13 +2,12 @@
 
 PREFIX?=	/usr/local
 LOCALBASE?=	/usr/local
-DESTDIR=	${PREFIX}
 .if ${.CURDIR:T} == addr6
-BINDIR?=	/bin
+BINDIR?=	${PREFIX}/bin
 .else
-BINDIR?=	/sbin
+BINDIR?=	${PREFIX}/sbin
 .endif
-MANDIR?=	/man/man
+MANDIR?=	${PREFIX}/man/man
 NO_MANCOMPRESS=
 
 .PATH: ${.CURDIR}/../tools ${.CURDIR}/../manuals

Modified: head/security/ipv6toolkit/pkg-plist
==============================================================================
--- head/security/ipv6toolkit/pkg-plist	Thu Jan 16 18:44:57 2014	(r339962)
+++ head/security/ipv6toolkit/pkg-plist	Thu Jan 16 18:54:26 2014	(r339963)
@@ -13,5 +13,19 @@ sbin/rs6
 sbin/scan6
 sbin/tcp6
 etc/ipv6toolkit.conf
+man/man1/addr6.1.gz
+man/man1/flow6.1.gz
+man/man1/frag6.1.gz
+man/man1/icmp6.1.gz
+man/man1/jumbo6.1.gz
+man/man1/na6.1.gz
+man/man1/ni6.1.gz
+man/man1/ns6.1.gz
+man/man1/ra6.1.gz
+man/man1/rd6.1.gz
+man/man1/rs6.1.gz
+man/man1/scan6.1.gz
+man/man1/tcp6.1.gz
+man/man5/ipv6toolkit.conf.5.gz
 %%DATADIR%%/oui.txt
 @dirrm %%DATADIR%%