From owner-svn-ports-head@FreeBSD.ORG  Tue Nov 19 02:32:54 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 528041AA;
 Tue, 19 Nov 2013 02:32:54 +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 282AA2C0B;
 Tue, 19 Nov 2013 02:32:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAJ2WsSO094182;
 Tue, 19 Nov 2013 02:32:54 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAJ2WsV5094181;
 Tue, 19 Nov 2013 02:32:54 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201311190232.rAJ2WsV5094181@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 19 Nov 2013 02:32:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334280 - head/games/steelstorm
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.16
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: Tue, 19 Nov 2013 02:32:54 -0000

Author: amdmi3
Date: Tue Nov 19 02:32:53 2013
New Revision: 334280
URL: http://svnweb.freebsd.org/changeset/ports/334280

Log:
  - Support staging
  - Mark MAKE_JOBS_UNSAFE

Modified:
  head/games/steelstorm/Makefile

Modified: head/games/steelstorm/Makefile
==============================================================================
--- head/games/steelstorm/Makefile	Tue Nov 19 01:49:40 2013	(r334279)
+++ head/games/steelstorm/Makefile	Tue Nov 19 02:32:53 2013	(r334280)
@@ -30,33 +30,30 @@ BUILD_WRKSRC=	${WRKSRC}/engine_source
 MAKEFILE=	BSDmakefile
 MAKE_ENV=	STRIP="${STRIP_CMD}"
 ALL_TARGET=	# empty
+MAKE_JOBS_UNSAFE=yes
 
 PORTDOCS=	README.txt
+PORTDATA=	*
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
-OPTIONS_MULTI=	FLAVOR
-OPTIONS_MULTI_FLAVOR=	CLIENT DEDICATED
+OPTIONS_MULTI=	COMPONENTS
+OPTIONS_MULTI_COMPONENTS=	CLIENT DEDICATED
+OPTIONS_DEFAULT=OPTIMIZED_CFLAGS CLIENT DEDICATED
+
 CLIENT_DESC=	Build client
 DEDICATED_DESC=	Dedicated server
-FLAVOR_DESC=	Executable Selection
-
-OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS CLIENT DEDICATED
 
-PLIST_FILES=	%%DATADIR%%/ssgamedata000001.pk3
-PLIST_DIRS=	%%DATADIR%%
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
 ALL_TARGET+=	cl-release
 USE_XORG+=	x11 xpm xext xxf86dga xxf86vm
-PLIST_FILES+=	bin/steelstorm
+PLIST_FILES+=	bin/${PORTNAME}
 .endif
 
 .if ${PORT_OPTIONS:MDEDICATED}
 ALL_TARGET+=	sv-release
-PLIST_FILES+=	bin/steelstorm-dedicated
+PLIST_FILES+=	bin/${PORTNAME}-dedicated
 .endif
 
 post-patch:
@@ -71,16 +68,14 @@ post-patch:
 
 do-install:
 .if ${PORT_OPTIONS:MCLIENT}
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-glx ${PREFIX}/bin/steelstorm
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-glx ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 .endif
 .if ${PORT_OPTIONS:MDEDICATED}
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-dedicated ${PREFIX}/bin/steelstorm-dedicated
-.endif
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/gamedata/ssgamedata000001.pk3 ${DATADIR}/
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}/
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-dedicated ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-dedicated
 .endif
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/gamedata/ssgamedata000001.pk3 ${STAGEDIR}${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>