Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Jun 2014 15:12:08 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r359772 - head/sysutils/swapexd
Message-ID:  <201406291512.s5TFC8q7075599@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Sun Jun 29 15:12:08 2014
New Revision: 359772
URL: http://svnweb.freebsd.org/changeset/ports/359772
QAT: https://qat.redports.org/buildarchive/r359772/

Log:
  1: Stagify.
  2: use @sample to handle config file.
  
  Approved by:	portmgr@ (blanket approval)

Modified:
  head/sysutils/swapexd/Makefile

Modified: head/sysutils/swapexd/Makefile
==============================================================================
--- head/sysutils/swapexd/Makefile	Sun Jun 29 15:11:16 2014	(r359771)
+++ head/sysutils/swapexd/Makefile	Sun Jun 29 15:12:08 2014	(r359772)
@@ -11,9 +11,8 @@ COMMENT=	Tool for growing and shrinking 
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
-PLIST_FILES=	sbin/${PORTNAME} etc/rc.d/swapexd
+PLIST_FILES=	sbin/${PORTNAME} etc/rc.d/swapexd "@sample etc/swapexd.conf.sample"
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -24,18 +23,8 @@ post-patch:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin/
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
-	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/swapexd ${PREFIX}/etc/rc.d
-
-# Deal with config files -- would be a shame to have to make a pkg-plist this
-# small
-post-install:
-	${ECHO_CMD} '@unexec cmp -s %D/etc/${PORTNAME}.conf.sample %D/etc/${PORTNAME}.conf && rm -f %D/etc/${PORTNAME}.conf || true 2>/dev/null' >> ${TMPPLIST}
-	${ECHO_CMD} 'etc/${PORTNAME}.conf.sample' >> ${TMPPLIST}
-	${ECHO_CMD} '@exec [ -f %D/etc/${PORTNAME}.conf ] || cp -p %D/%F %B/${PORTNAME}.conf' >> ${TMPPLIST}
-	[ -f %D/etc/${PORTNAME}.conf ] \
-		|| ${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.sample \
-				${PREFIX}/etc/${PORTNAME}.conf
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/swapexd ${STAGEDIR}${PREFIX}/etc/rc.d
 
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406291512.s5TFC8q7075599>