From owner-svn-ports-all@FreeBSD.ORG  Sun Apr 13 11:40:10 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 AB5E82E7;
 Sun, 13 Apr 2014 11:40: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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 983C21529;
 Sun, 13 Apr 2014 11:40:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3DBeAxK006076;
 Sun, 13 Apr 2014 11:40:10 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3DBeAGw006075;
 Sun, 13 Apr 2014 11:40:10 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201404131140.s3DBeAGw006075@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sun, 13 Apr 2014 11:40:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351203 - head/games/endgame-singularity
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: Sun, 13 Apr 2014 11:40:10 -0000

Author: pawel
Date: Sun Apr 13 11:40:10 2014
New Revision: 351203
URL: http://svnweb.freebsd.org/changeset/ports/351203
QAT: https://qat.redports.org/buildarchive/r351203/

Log:
  - Add staging support
  - Use option helper

Modified:
  head/games/endgame-singularity/Makefile

Modified: head/games/endgame-singularity/Makefile
==============================================================================
--- head/games/endgame-singularity/Makefile	Sun Apr 13 10:55:38 2014	(r351202)
+++ head/games/endgame-singularity/Makefile	Sun Apr 13 11:40:10 2014	(r351203)
@@ -24,13 +24,7 @@ PROJECTHOST=	${PKGNAMEPREFIX}${PORTNAME}
 OPTIONS_DEFINE=	MUSIC DOCS
 OPTIONS_DEFAULT=	MUSIC
 MUSIC_DESC=	Install original music pack
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMUSIC}
-RUN_DEPENDS+=	endgame-singularity-music>=006:${PORTSDIR}/games/endgame-singularity-music
-.endif
+MUSIC_RUN_DEPENDS=	endgame-singularity-music>=006:${PORTSDIR}/games/endgame-singularity-music
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.pyc' -delete
@@ -67,11 +61,9 @@ post-build:
 	@${ECHO_CMD} 'import ${PORTNAME}.${PORTNAME}' >> ${WRKSRC}/${PORTNAME}.py
 
 post-install:
-	@cd ${WRKSRC}/data/&&${COPYTREE_SHARE} . ${DATADIR}/
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${PREFIX}/bin/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -d ${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-.endif
+	(cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>