Date: Wed, 21 May 2014 07:21:42 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354716 - head/net/iet Message-ID: <201405210721.s4L7LgML056347@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 -@unexec (cmp -s %D/%%DATADIR%%/ietd.conf %D/etc/iet/ietd.conf && rm -f %D/etc/iet/ietd.conf) || true +@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 -@exec [ -f %B/ietd.conf ] || cp %B/%f %D/etc/iet/ietd.conf -@unexec (cmp -s %D/%%DATADIR%%/initiators.allow %D/etc/iet/initiators.allow && rm -f %D/etc/iet/initiators.allow) || true +@exec if [ ! -f %D/etc/iet/ietd.conf ]; then cp -p %D/%F %D/etc/iet/ietd.conf; fi +@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 -@exec [ -f %B/initiators.allow ] || cp %B/%f %D/etc/iet/initiators.allow -@unexec (cmp -s %D/%%DATADIR%%/initiators.deny %D/etc/iet/initiators.deny && rm -f %D/etc/iet/initiators.deny) || true +@exec if [ ! -f %D/etc/iet/initiators.allow ]; then cp -p %D/%F %D/etc/iet/initiators.allow; fi +@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 -@exec [ -f %B/initiators.deny ] || cp %B/%f %D/etc/iet/initiators.deny -@unexec (cmp -s %D/%%DATADIR%%/targets.allow %D/etc/iet/targets.allow && rm -f %D/etc/iet/targets.allow) || true +@exec if [ ! -f %D/etc/iet/initiators.deny ]; then cp -p %D/%F %D/etc/iet/initiators.deny; fi +@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 -@exec [ -f %B/targets.allow ] || cp %B/%f %D/etc/iet/targets.allow +@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 -@exec /usr/sbin/kldxref %%KMODDIR%% -@unexec /usr/sbin/kldxref %%KMODDIR%% -@dirrmtry modules
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405210721.s4L7LgML056347>