svn commit: r354716 - head/net/iet

[Xin LI]

Author: delphij
Date: Wed May 21 07:21:42 2014
New Revision: 354716
URL: http://svnweb.freebsd.org/changeset/ports/354716
QAT: https://qat.redports.org/buildarchive/r354716/

Log:
  Stageify.

Modified:
  head/net/iet/Makefile
  head/net/iet/pkg-plist

Modified: head/net/iet/Makefile
==============================================================================
--- head/net/iet/Makefile	Wed May 21 07:07:42 2014	(r354715)
+++ head/net/iet/Makefile	Wed May 21 07:21:42 2014	(r354716)
@@ -3,7 +3,7 @@
 
 PORTNAME=	iet
 PORTVERSION=	1.4.20.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net kld
 MASTER_SITES=	SF/iscsitarget/iscsitarget/${PORTVERSION}/
 DISTNAME=	iscsitarget-${PORTVERSION}
@@ -22,11 +22,8 @@ SSP_UNSAFE=	kernel module does not suppo
 BUILD_WRKSRC=	${WRKSRC}/freebsd
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-MAN5=		ietd.conf.5
-MAN8=		ietadm.8 ietd.8
-MANCOMPRESSED=	maybe
-
 USE_RC_SUBR=	ietd
+USES=		kmod uidfix
 
 KMODDIR=	${PREFIX}/modules
 PLIST_SUB+=	KMODDIR=${KMODDIR}
@@ -34,7 +31,6 @@ MAKE_ENV+=	KMODDIR=${KMODDIR} DATADIR=${
 
 IET_CONF_FILES=	ietd.conf initiators.allow initiators.deny targets.allow
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if !exists(${SRC_BASE}/sys/Makefile)
@@ -46,11 +42,6 @@ BROKEN=		requires 8.0-RELEASE or higher
 .endif
 
 pre-install:
-	${MKDIR} ${DATADIR} ${KMODDIR} ${ETCDIR}
-
-post-install:
-.for f in ${IET_CONF_FILES}
-	@[ -f ${ETCDIR}/${f} ] || ${CP} ${DATADIR}/${f} ${ETCDIR}/
-.endfor
+	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${KMODDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.post.mk>

Modified: head/net/iet/pkg-plist
==============================================================================
--- head/net/iet/pkg-plist	Wed May 21 07:07:42 2014	(r354715)
+++ head/net/iet/pkg-plist	Wed May 21 07:21:42 2014	(r354716)
@@ -1,21 +1,21 @@
 modules/iet.ko
 @exec mkdir -p %D/etc/iet
- at unexec (cmp -s %D/%%DATADIR%%/ietd.conf %D/etc/iet/ietd.conf && rm -f %D/etc/iet/ietd.conf) || true
+ at unexec if cmp -s %D/%%DATADIR%%/ietd.conf %D/etc/iet/ietd.conf ; then rm -f %D/etc/iet/ietd.conf ; fi
 %%DATADIR%%/ietd.conf
- at exec [ -f %B/ietd.conf ] || cp %B/%f %D/etc/iet/ietd.conf
- at unexec (cmp -s %D/%%DATADIR%%/initiators.allow %D/etc/iet/initiators.allow && rm -f %D/etc/iet/initiators.allow) || true
+ at exec if [ ! -f %D/etc/iet/ietd.conf ]; then cp -p %D/%F %D/etc/iet/ietd.conf; fi
+ at unexec if cmp -s %D/%%DATADIR%%/initiators.allow %D/etc/iet/initiators.allow ; then rm -f %D/etc/iet/initiators.allow ; fi
 %%DATADIR%%/initiators.allow
- at exec [ -f %B/initiators.allow ] || cp %B/%f %D/etc/iet/initiators.allow
- at unexec (cmp -s %D/%%DATADIR%%/initiators.deny %D/etc/iet/initiators.deny && rm -f %D/etc/iet/initiators.deny) || true
+ at exec if [ ! -f %D/etc/iet/initiators.allow ]; then cp -p %D/%F %D/etc/iet/initiators.allow; fi
+ at unexec if cmp -s %D/%%DATADIR%%/initiators.deny %D/etc/iet/initiators.deny ; then rm -f %D/etc/iet/initiators.deny ; fi
 %%DATADIR%%/initiators.deny
- at exec [ -f %B/initiators.deny ] || cp %B/%f %D/etc/iet/initiators.deny
- at unexec (cmp -s %D/%%DATADIR%%/targets.allow %D/etc/iet/targets.allow && rm -f %D/etc/iet/targets.allow) || true
+ at exec if [ ! -f %D/etc/iet/initiators.deny ]; then cp -p %D/%F %D/etc/iet/initiators.deny; fi
+ at unexec if cmp -s %D/%%DATADIR%%/targets.allow %D/etc/iet/targets.allow ; then rm -f %D/etc/iet/targets.allow ; fi
 %%DATADIR%%/targets.allow
- at exec [ -f %B/targets.allow ] || cp %B/%f %D/etc/iet/targets.allow
+ at exec if [ ! -f %D/etc/iet/targets.allow ]; then cp -p %D/%F %D/etc/iet/targets.allow; fi
 @dirrmtry etc/iet
 @dirrm %%DATADIR%%
+man/man5/ietd.conf.5.gz
+man/man8/ietadm.8.gz
+man/man8/ietd.8.gz
 sbin/ietd
 sbin/ietadm
- at exec /usr/sbin/kldxref %%KMODDIR%%
- at unexec /usr/sbin/kldxref %%KMODDIR%%
- at dirrmtry modules