svn commit: r353374 - in head/net-mgmt/ipv6mon: . files

[Baptiste Daroussin]

Author: bapt
Date: Fri May  9 00:01:54 2014
New Revision: 353374
URL: http://svnweb.freebsd.org/changeset/ports/353374
QAT: https://qat.redports.org/buildarchive/r353374/

Log:
  Support stage
  Use @sample

Modified:
  head/net-mgmt/ipv6mon/Makefile
  head/net-mgmt/ipv6mon/files/patch-Makefile
  head/net-mgmt/ipv6mon/pkg-plist

Modified: head/net-mgmt/ipv6mon/Makefile
==============================================================================
--- head/net-mgmt/ipv6mon/Makefile	Fri May  9 00:01:50 2014	(r353373)
+++ head/net-mgmt/ipv6mon/Makefile	Fri May  9 00:01:54 2014	(r353374)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ipv6mon
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://www.si6networks.com/tools/ipv6mon/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -11,37 +11,32 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	Tool for monitoring IPv6 address usage
 
+OPTIONS_DEFINE=	DOCS
+
 LICENSE=	GPLv3
 
-MAKE_ENV=	DESTDIR=${PREFIX}/
+USES=		uidfix
+#Ignore "normal" destdir from port infra
+DESTDIRNAME=	IGNOREME
+MAKE_ENV=	DESTDIR=${STAGEDIR}${PREFIX}/
 CFLAGS+=	-DIPV6MON_CONF=\\\"${PREFIX}/etc/ipv6mon.conf\\\"
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 USE_RC_SUBR=	${PORTNAME}
 
-MAN5=		ipv6mon.conf.5
-MAN8=		ipv6mon.8
-
 PORTDOCS=	README.TXT \
 		ipv6mon-installation-notes.odt \
 		ipv6mon-installation-notes.pdf \
 		ipv6mon-manual.odt \
 		ipv6mon-manual.pdf
 
-NO_STAGE=	yes
 post-extract:
 	${INSTALL_DATA} ${WRKSRC}/manuals/* ${WRKSRC}
 
 post-install:
-	if [ ! -r ${PREFIX}/etc/ipv6mon.conf ]; then \
-		${INSTALL_DATA} ${PREFIX}/etc/ipv6mon.conf.dist \
-			${PREFIX}/etc/ipv6mon.conf; \
-	fi
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/etc/rc.d
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/ipv6mon/files/patch-Makefile
==============================================================================
--- head/net-mgmt/ipv6mon/files/patch-Makefile	Fri May  9 00:01:50 2014	(r353373)
+++ head/net-mgmt/ipv6mon/files/patch-Makefile	Fri May  9 00:01:54 2014	(r353374)
@@ -7,7 +7,7 @@
 +LDADD=	-lpcap
 +
 +FILES=		ipv6mon.conf
-+FILESNAME=	ipv6mon.conf.dist
++FILESNAME=	ipv6mon.conf.sample
 +FILESDIR=	etc
 +
 +BINDIR=	sbin

Modified: head/net-mgmt/ipv6mon/pkg-plist
==============================================================================
--- head/net-mgmt/ipv6mon/pkg-plist	Fri May  9 00:01:50 2014	(r353373)
+++ head/net-mgmt/ipv6mon/pkg-plist	Fri May  9 00:01:54 2014	(r353374)
@@ -1,4 +1,4 @@
- at unexec cmp -s %D/etc/ipv6mon.conf.dist %D/etc/ipv6mon.conf && rm -f %D/etc/ipv6mon.conf || true
-etc/ipv6mon.conf.dist
- at exec if [ ! -r %D/etc/ipv6mon.conf ]; then install -m 444 %D/etc/ipv6mon.conf.dist %D/etc/ipv6mon.conf; fi
+ at sample etc/ipv6mon.conf.sample
 sbin/ipv6mon
+man/man5/ipv6mon.conf.5.gz
+man/man8/ipv6mon.8.gz