From owner-svn-ports-all@FreeBSD.ORG  Sun Jul  6 14:48:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8F8A24DA;
 Sun,  6 Jul 2014 14:48:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 628FD2808;
 Sun,  6 Jul 2014 14:48:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s66Emmo0036130;
 Sun, 6 Jul 2014 14:48:48 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s66EmmVQ036127;
 Sun, 6 Jul 2014 14:48:48 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201407061448.s66EmmVQ036127@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 6 Jul 2014 14:48:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360914 - head/emulators/vboxtool
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jul 2014 14:48:48 -0000

Author: bapt
Date: Sun Jul  6 14:48:47 2014
New Revision: 360914
URL: http://svnweb.freebsd.org/changeset/ports/360914
QAT: https://qat.redports.org/buildarchive/r360914/

Log:
  Support stage
  Use @sample

Modified:
  head/emulators/vboxtool/Makefile
  head/emulators/vboxtool/pkg-plist

Modified: head/emulators/vboxtool/Makefile
==============================================================================
--- head/emulators/vboxtool/Makefile	Sun Jul  6 14:42:15 2014	(r360913)
+++ head/emulators/vboxtool/Makefile	Sun Jul  6 14:48:47 2014	(r360914)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vboxtool
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
@@ -24,7 +24,6 @@ GROUPS=		vboxusers
 
 SAMPLESDIR=	${PREFIX}/share/${PORTNAME}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|!/bin/bash|!/usr/bin/env bash|' \
 		-e 's|/etc/|${PREFIX}&|g' \
@@ -32,18 +31,10 @@ post-patch:
 		${WRKSRC}/script/vboxtoolinit
 
 do-install:
-	@if  [ ! -f ${PREFIX}/etc/${PORTNAME} ]; then \
-		${MKDIR}  	${PREFIX}/etc/${PORTNAME};\
-	fi
-	${MKDIR}  	${EXAMPLESDIR}
-	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/vboxtool.conf ]; then \
-		${INSTALL_DATA} 	${FILESDIR}/vboxtool.conf	${PREFIX}/etc/${PORTNAME}/vboxtool.conf;\
-	fi
-	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/machines.conf ]; then \
-		${INSTALL_DATA} 	${FILESDIR}/machines.conf	${PREFIX}/etc/${PORTNAME}/machines.conf;\
-	fi
-	${INSTALL_SCRIPT} -m 0750	${WRKSRC}/script/vboxtool		${PREFIX}/bin/vboxtool
-	${INSTALL_SCRIPT} -m 0750	${WRKSRC}/script/vboxtoolinit		${PREFIX}/etc/rc.d/vboxtoolinit
-	${INSTALL_DATA} 	${FILESDIR}/machines.conf	${EXAMPLESDIR}/machines.conf
-	${INSTALL_DATA} 	${FILESDIR}/vboxtool.conf	${EXAMPLESDIR}/vboxtool.conf
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${FILESDIR}/vboxtool.conf ${STAGEDIR}${ETCDIR}/vboxtool.conf.sample
+	${INSTALL_DATA} ${FILESDIR}/machines.conf ${STAGEDIR}${ETCDIR}/machines.conf.sample
+	${INSTALL_SCRIPT} -m 0750 ${WRKSRC}/script/vboxtool ${STAGEDIR}${PREFIX}/bin/vboxtool
+	${INSTALL_SCRIPT} -m 0750 ${WRKSRC}/script/vboxtoolinit ${STAGEDIR}${PREFIX}/etc/rc.d/vboxtoolinit
+
 .include <bsd.port.mk>

Modified: head/emulators/vboxtool/pkg-plist
==============================================================================
--- head/emulators/vboxtool/pkg-plist	Sun Jul  6 14:42:15 2014	(r360913)
+++ head/emulators/vboxtool/pkg-plist	Sun Jul  6 14:48:47 2014	(r360914)
@@ -1,8 +1,5 @@
-@unexec if  cmp -s  %%PREFIX%%/%%EXAMPLESDIR%%/machines.conf %D/etc/vboxtool/machines.conf; then  rm -f %D/etc/vboxtool/machines.conf; fi
-@unexec if  cmp -s %%PREFIX%%/%%EXAMPLESDIR%%/vboxtool.conf %D/etc/vboxtool/vboxtool.conf; then  rm -f %D/etc/vboxtool/vboxtool.conf; fi
 bin/vboxtool
 etc/rc.d/vboxtoolinit
-%%EXAMPLESDIR%%/machines.conf
-%%EXAMPLESDIR%%/vboxtool.conf
+@sample etc/vboxtool/machines.conf.sample
+@sample etc/vboxtool/vboxtool.conf.sample
 @dirrmtry etc/vboxtool
-@dirrmtry %%EXAMPLESDIR%%