From owner-svn-ports-head@FreeBSD.ORG  Fri Dec 27 08:21:10 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 7C04C203;
 Fri, 27 Dec 2013 08:21:10 +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 508911B2E;
 Fri, 27 Dec 2013 08:21:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBR8LAGa027835;
 Fri, 27 Dec 2013 08:21:10 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBR8LAMR027834;
 Fri, 27 Dec 2013 08:21:10 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312270821.rBR8LAMR027834@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 27 Dec 2013 08:21:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337648 - head/shells/flash
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Dec 2013 08:21:10 -0000

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

Log:
  Support stage

Modified:
  head/shells/flash/Makefile

Modified: head/shells/flash/Makefile
==============================================================================
--- head/shells/flash/Makefile	Fri Dec 27 08:16:03 2013	(r337647)
+++ head/shells/flash/Makefile	Fri Dec 27 08:21:09 2013	(r337648)
@@ -9,15 +9,13 @@ MASTER_SITES=	http://www.sourcefiles.org
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A ncurses-based restriction shell
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-rdynamic
 CFLAGS+=	-rdynamic
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-MAN1=		flash.1
-
 PROGRAM=	alarms background countdown
 SCRIPT=		mailshell system.menu system.menu.9798 system.menu.oldlast \
 		system.menu.old
@@ -25,35 +23,26 @@ DATA=		system.bg.Netsoc.3 system.bg.Nets
 		system.maillogin system.module system.module.9798 system.rc \
 		system.rc.mailshell
 
-NO_STAGE=	yes
 post-patch:
 .for file in ${SCRIPT}
 	@${REINPLACE_CMD} -e "s:/usr/slocal:${PREFIX}:g" ${WRKSRC}/orcasetup/${file}
 .endfor
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/flash ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/flash.1 ${MANPREFIX}/man/man1
-	@${MKDIR} ${PREFIX}/lib/flash
-	${INSTALL_DATA} ${WRKSRC}/Manual ${PREFIX}/lib/flash
+	${INSTALL_PROGRAM} ${WRKSRC}/flash ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/flash.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/flash
+	${INSTALL_DATA} ${WRKSRC}/Manual ${STAGEDIR}${PREFIX}/lib/flash
 .for file in ${PROGRAM}
-	${INSTALL_PROGRAM} ${WRKSRC}/modules/${file} ${PREFIX}/lib/flash
+	${INSTALL_PROGRAM} ${WRKSRC}/modules/${file} ${STAGEDIR}${PREFIX}/lib/flash
 .endfor
 .for file in ${SCRIPT}
-	${INSTALL_SCRIPT} ${WRKSRC}/orcasetup/${file} ${PREFIX}/lib/flash
+	${INSTALL_SCRIPT} ${WRKSRC}/orcasetup/${file} ${STAGEDIR}${PREFIX}/lib/flash
 .endfor
 .for file in ${DATA}
-	${INSTALL_DATA} ${WRKSRC}/orcasetup/${file} ${PREFIX}/lib/flash
+	${INSTALL_DATA} ${WRKSRC}/orcasetup/${file} ${STAGEDIR}${PREFIX}/lib/flash
 .endfor
-	@${MKDIR} ${PREFIX}/lib/flash/flashdocs
-	${INSTALL_DATA} ${WRKSRC}/orcasetup/flashdocs/* ${PREFIX}/lib/flash/flashdocs
-
-post-install:
-	@${ECHO_MSG} "Updating /etc/shells"
-	@${CP} /etc/shells /etc/shells.bak
-	@(${GREP} -v ${PREFIX}/bin/flash /etc/shells.bak; \
-	${ECHO_CMD} ${PREFIX}/bin/flash) > /etc/shells
-	@${RM} /etc/shells.bak
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/flash/flashdocs
+	${INSTALL_DATA} ${WRKSRC}/orcasetup/flashdocs/* ${STAGEDIR}${PREFIX}/lib/flash/flashdocs
 
 .include <bsd.port.mk>