From owner-svn-ports-all@FreeBSD.ORG  Fri Dec 27 08:09:03 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D6724E54;
 Fri, 27 Dec 2013 08:09:03 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A93171A4A;
 Fri, 27 Dec 2013 08:09:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBR893bm021991;
 Fri, 27 Dec 2013 08:09:03 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBR893UI021988;
 Fri, 27 Dec 2013 08:09:03 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312270809.rBR893UI021988@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 27 Dec 2013 08:09:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337645 - head/shells/ambit
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.17
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: Fri, 27 Dec 2013 08:09:03 -0000

Author: bapt
Date: Fri Dec 27 08:09:02 2013
New Revision: 337645
URL: http://svnweb.freebsd.org/changeset/ports/337645

Log:
  Support stage

Modified:
  head/shells/ambit/Makefile
  head/shells/ambit/pkg-plist

Modified: head/shells/ambit/Makefile
==============================================================================
--- head/shells/ambit/Makefile	Fri Dec 27 08:06:49 2013	(r337644)
+++ head/shells/ambit/Makefile	Fri Dec 27 08:09:02 2013	(r337645)
@@ -16,14 +16,11 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 AMBITDIR?=	/var/spool/${PORTNAME}
-MAN1=		${PORTNAME}.1
-MANCOMPRESSED=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_SUB=	AMBITDIR=${AMBITDIR}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s!/bin/bash!${LOCALBASE}/bin/bash!" \
@@ -32,13 +29,10 @@ post-patch:
 		-e "s!/var/.MyNameIs!${AMBITDIR}!" ${WRKSRC}/usr/bin/ambit
 
 do-install:
-	@${MKDIR} ${AMBITDIR}/hosts
-	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/ambit ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/usr/lib/ambit/libambit.sh ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man1/${PORTNAME}.1.gz ${MANPREFIX}/man/man1
-	@if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \
-	 ${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf ; \
-	fi
+	@${MKDIR} ${STAGEDIR}${AMBITDIR}/hosts
+	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/ambit ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/usr/lib/ambit/libambit.sh ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man1/${PORTNAME}.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/shells/ambit/pkg-plist
==============================================================================
--- head/shells/ambit/pkg-plist	Fri Dec 27 08:06:49 2013	(r337644)
+++ head/shells/ambit/pkg-plist	Fri Dec 27 08:09:02 2013	(r337645)
@@ -1,5 +1,6 @@
 bin/ambit
 lib/libambit.sh
+man/man1/ambit.1.gz
 @unexec if cmp -s %D/etc/ambit.conf.sample %D/etc/ambit.conf; then rm -f %D/etc/ambit.conf; fi
 etc/ambit.conf.sample
 @exec if [ ! -f %D/etc/ambit.conf ] ; then cp -p %D/%F %B/ambit.conf; fi