From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 17 23:52:46 2013
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 ESMTP id C2607326;
 Thu, 17 Oct 2013 23:52:46 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
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 4F8332BC7;
 Thu, 17 Oct 2013 23:52:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HNqksk032911;
 Thu, 17 Oct 2013 23:52:46 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HNqj5o032909;
 Thu, 17 Oct 2013 23:52:45 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201310172352.r9HNqj5o032909@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 17 Oct 2013 23:52:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330698 - head/games/npush
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.14
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: Thu, 17 Oct 2013 23:52:46 -0000

Author: amdmi3
Date: Thu Oct 17 23:52:45 2013
New Revision: 330698
URL: http://svnweb.freebsd.org/changeset/ports/330698

Log:
  - Support staging

Modified:
  head/games/npush/Makefile
  head/games/npush/pkg-plist

Modified: head/games/npush/Makefile
==============================================================================
--- head/games/npush/Makefile	Thu Oct 17 23:52:35 2013	(r330697)
+++ head/games/npush/Makefile	Thu Oct 17 23:52:45 2013	(r330698)
@@ -11,9 +11,10 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A curses-based logic game similar to Sokoban and Boulder Dash
 
 PORTDOCS=	*
+PORTDATA=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"levels|"${DATADIR}/levels|' \
@@ -23,16 +24,14 @@ do-build:
 	cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -o npush npush.cpp -lncurses
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/npush ${PREFIX}/bin
-	${MKDIR} ${DATADIR}/levels
-	${INSTALL_DATA} ${WRKSRC}/levels/* ${DATADIR}/levels
-	${INSTALL_DATA} ${WRKSRC}/npush.png ${PREFIX}/share/pixmaps/
-	${MKDIR} ${PREFIX}/share/applications/
-	${INSTALL_DATA} ${WRKSRC}/npush.desktop ${PREFIX}/share/applications/
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/npush ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}/levels
+	${INSTALL_DATA} ${WRKSRC}/levels/* ${STAGEDIR}${DATADIR}/levels
+	${INSTALL_DATA} ${WRKSRC}/npush.png ${STAGEDIR}${PREFIX}/share/pixmaps/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/npush.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.html ${WRKSRC}/readme.txt \
-		${WRKSRC}/screenshot?.png ${DOCSDIR}
-.endif
+		${WRKSRC}/screenshot?.png ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/games/npush/pkg-plist
==============================================================================
--- head/games/npush/pkg-plist	Thu Oct 17 23:52:35 2013	(r330697)
+++ head/games/npush/pkg-plist	Thu Oct 17 23:52:45 2013	(r330698)
@@ -1,24 +1,4 @@
 bin/npush
 share/applications/npush.desktop
-%%DATADIR%%/levels/Level 01 - Gold and Exit
-%%DATADIR%%/levels/Level 02 - Rocks
-%%DATADIR%%/levels/Level 03 - Dynamite
-%%DATADIR%%/levels/Level 04 - The Show Starts
-%%DATADIR%%/levels/Level 05 - The Triangle
-%%DATADIR%%/levels/Level 06 - Moving along
-%%DATADIR%%/levels/Level 07 - Duality
-%%DATADIR%%/levels/Level 08 - Traps and Treasure
-%%DATADIR%%/levels/Level 09 - Cooperation
-%%DATADIR%%/levels/Level 10 - Golden Age
-%%DATADIR%%/levels/Level 11 - Story of a lifetime
-%%DATADIR%%/levels/Level 12 - In the Mine
-%%DATADIR%%/levels/Level 13 - Warm-up
-%%DATADIR%%/levels/Level 14 - To and fro
-%%DATADIR%%/levels/Level 15 - Little by little
-%%DATADIR%%/levels/Level 16 - The break in
-%%DATADIR%%/levels/Level 17 - The great escape
-%%DATADIR%%/levels/Level 18 - The one road
 share/pixmaps/npush.png
-@dirrm %%DATADIR%%/levels
-@dirrm %%DATADIR%%
 @dirrmtry share/applications