From owner-svn-ports-head@FreeBSD.ORG  Sun Sep 29 11:16:46 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 ESMTP id E0771A0B;
 Sun, 29 Sep 2013 11:16:46 +0000 (UTC)
 (envelope-from madpilot@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 CE466222B;
 Sun, 29 Sep 2013 11:16: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 r8TBGkQ0019660;
 Sun, 29 Sep 2013 11:16:46 GMT
 (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8TBGkpI019658;
 Sun, 29 Sep 2013 11:16:46 GMT
 (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201309291116.r8TBGkpI019658@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Sun, 29 Sep 2013 11:16:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328676 - head/games/corsix-th
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.14
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: Sun, 29 Sep 2013 11:16:47 -0000

Author: madpilot
Date: Sun Sep 29 11:16:46 2013
New Revision: 328676
URL: http://svnweb.freebsd.org/changeset/ports/328676

Log:
  - Support staging
  - Convert to new LIB_DEPENDS format
  - Use options helpers
  - Don't check for ARCH in compiler conditional.

Modified:
  head/games/corsix-th/Makefile

Modified: head/games/corsix-th/Makefile
==============================================================================
--- head/games/corsix-th/Makefile	Sun Sep 29 11:10:45 2013	(r328675)
+++ head/games/corsix-th/Makefile	Sun Sep 29 11:16:46 2013	(r328676)
@@ -27,14 +27,14 @@ OPTIONS_DEFINE=	MOVIES
 OPTIONS_DEFAULT=	MOVIES
 MOVIES_DESC=	Play in-game movies
 
-NO_STAGE=	yes
+MOVIES_CMAKE_ON=	-DWITH_MOVIES=ON
+MOVIES_CMAKE_OFF=	-DWITH_MOVIES=OFF
+MOVIES_LIB_DEPENDS=	libswresample1.so:${PORTSDIR}/multimedia/ffmpeg1
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMOVIES}
-CMAKE_ARGS+=	-DWITH_MOVIES=ON
-LIB_DEPENDS+=	swresample1:${PORTSDIR}/multimedia/ffmpeg1
 # partly copied from editors/libreoffice
-.if ${ARCH} == "i386"
 .if exists(/usr/bin/clang) && ${OSVERSION} > 900014
 CC=		/usr/bin/clang
 CPP=		/usr/bin/clang-cpp
@@ -43,9 +43,6 @@ CXX=		/usr/bin/clang++
 USE_GCC=	yes
 .endif
 .endif
-.else
-CMAKE_ARGS+=	-DWITH_MOVIES=OFF
-.endif
 
 post-patch:
 # Allow the game to find its resources without wrapper scripts
@@ -54,10 +51,10 @@ post-patch:
 			${WRKSRC}/CorsixTH/Src/main.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/CorsixTH/CorsixTH ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/CorsixTH/CorsixTH.lua ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/CorsixTH/CorsixTH ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/CorsixTH/CorsixTH.lua ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/CorsixTH && ${COPYTREE_SHARE} "Bitmap Levels Lua" \
-		${DATADIR}
+		${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>