Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Nov 2013 03:11:52 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334052 - head/games/cube
Message-ID:  <201311170311.rAH3BrWC096868@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Sun Nov 17 03:11:52 2013
New Revision: 334052
URL: http://svnweb.freebsd.org/changeset/ports/334052

Log:
  - Add stage support
  - Use OPTIONS_SUB

Modified:
  head/games/cube/Makefile

Modified: head/games/cube/Makefile
==============================================================================
--- head/games/cube/Makefile	Sun Nov 17 03:09:13 2013	(r334051)
+++ head/games/cube/Makefile	Sun Nov 17 03:11:52 2013	(r334052)
@@ -37,7 +37,10 @@ FLAVOR_DESC=	Clients and servers
 CLIENT_DESC=	Build client
 SERVER_DESC=	Build dedicated server
 
-NO_STAGE=	yes
+OPTIONS_SUB=	yes
+
+OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fomit-frame-pointer
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
@@ -45,22 +48,12 @@ USE_GL=		glu
 USE_SDL=	image mixer sdl
 ALL_TARGET+=	client
 CUBE_BIN+=	client
-LDFLAGS=	-lX11
-PLIST_SUB+=	CLIENT=""
-.else
-PLIST_SUB+=	CLIENT="@comment "
+LDFLAGS+=	-lX11
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
 ALL_TARGET+=	server
 CUBE_BIN+=	server
-PLIST_SUB+=	SERVER=""
-.else
-PLIST_SUB+=	SERVER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+=	-O3 -fomit-frame-pointer
 .endif
 
 post-extract:
@@ -68,16 +61,14 @@ post-extract:
 
 do-install:
 .for f in ${CUBE_BIN}
-	${INSTALL_SCRIPT} ${WRKDIR}/cube_${f} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/cube_${f} ${PREFIX}/libexec
+	${INSTALL_SCRIPT} ${WRKDIR}/cube_${f} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cube_${f} ${STAGEDIR}${PREFIX}/libexec
 .endfor
-	@${MKDIR} ${DATADIR}
-	@(cd ${WRKDIR}/cube && ${COPYTREE_SHARE} "data packages" ${DATADIR})
-	${INSTALL_DATA} ${WRKDIR}/cube/autoexec.cfg ${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/cube/readme.html ${DOCSDIR}
-	@(cd ${WRKDIR}/cube/docs && ${COPYTREE_SHARE} . ${DOCSDIR})
-.endif
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@(cd ${WRKDIR}/cube && ${COPYTREE_SHARE} "data packages" ${STAGEDIR}${DATADIR})
+	${INSTALL_DATA} ${WRKDIR}/cube/autoexec.cfg ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/cube/readme.html ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKDIR}/cube/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311170311.rAH3BrWC096868>