Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 May 2013 11:34:08 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317945 - head/games/cube
Message-ID:  <201305121134.r4CBY8Y0074356@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sun May 12 11:34:08 2013
New Revision: 317945
URL: http://svnweb.freebsd.org/changeset/ports/317945

Log:
  - Tighten Makefile header and COMMENT line
  - Utilize DISTVERSION (simplifies things)
  - Sort the knobs, cleanup OPTIONS a bit, fix a typo
  - Rename DEDICATED option to SERVER
  - Define USE_GL more strictly as "glu" instead of vague "yes"
  - Reformat port description for better readability

Modified:
  head/games/cube/Makefile
  head/games/cube/pkg-descr
  head/games/cube/pkg-plist

Modified: head/games/cube/Makefile
==============================================================================
--- head/games/cube/Makefile	Sun May 12 11:25:13 2013	(r317944)
+++ head/games/cube/Makefile	Sun May 12 11:34:08 2013	(r317945)
@@ -1,61 +1,60 @@
-# New ports collection makefile for:	cube
-# Date created:        17 October 2002
-# Whom:                Arjan van Leeuwen
-#
+# Created by: Arjan van Leeuwen <avleeuwen@piwebs.com>
 # $FreeBSD$
-#
 
 PORTNAME=	cube
-PORTVERSION=	2005.08.29
+DISTVERSION=	2005_08_29
 PORTREVISION=	11
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2005_08_29
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 DISTFILES=	${CUBE_DATA} ${CUBE_SRC}
 EXTRACT_ONLY=	${CUBE_SRC}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An OpenGL 3D First Person Shooter game
+COMMENT=	OpenGL 3D FPS (first person shooter) game
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet
 
 USE_ZIP=	yes
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}_source/src
-CFLAGS+=	-fsigned-char
-ALL_TARGET=	#empty
-MALE_JOBS_SAFE=	yes
+ALL_TARGET=	#
+MAKE_JOBS_SAFE=	yes
 
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
-OPTIONS_MULTI=	TYPE
-OPTIONS_MULTI_TYPE=	CLIENT DEDICATED
-OPTIONS_DEFAULT=	CLIENT DEDICATED
-CLIENT_DESC=	Build client
-DEDICATED_DESC=	Build dedicated server
+CFLAGS+=	-fsigned-char
+WRKSRC=		${WRKDIR}/${PORTNAME}_source/src
 
 SUB_FILES=	cube_client cube_server
 
-CUBE_DATA=	${PORTNAME}_${PORTVERSION:S/./_/g}_unix.tar.gz
-CUBE_SRC=	${PORTNAME}_${PORTVERSION:S/./_/g}_src.zip
+CUBE_DATA=	${PORTNAME}_${DISTVERSION}_unix.tar.gz
+CUBE_SRC=	${PORTNAME}_${DISTVERSION}_src.zip
+
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
+OPTIONS_MULTI=	FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT SERVER
+OPTIONS_DEFAULT=	CLIENT SERVER
+
+FLAVOR_DESC=	Clients and servers
+CLIENT_DESC=	Build client
+SERVER_DESC=	Build dedicated server
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
-USE_GL=		yes
+USE_GL=		glu
 USE_SDL=	image mixer sdl
 ALL_TARGET+=	client
-PLIST_SUB+=	CLIENT=""
 CUBE_BIN+=	client
+PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDEDICATED}
+.if ${PORT_OPTIONS:MSERVER}
 ALL_TARGET+=	server
-PLIST_SUB+=	DEDICATED=""
 CUBE_BIN+=	server
+PLIST_SUB+=	SERVER=""
 .else
-PLIST_SUB+=	DEDICATED="@comment "
+PLIST_SUB+=	SERVER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
@@ -70,13 +69,13 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/cube_${f} ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/cube_${f} ${PREFIX}/libexec
 .endfor
-	${MKDIR} ${DATADIR}
-	@(cd ${WRKDIR}/cube && ${COPYTREE_SHARE} "data packages" ${DATADIR}/)
+	@${MKDIR} ${DATADIR}
+	@(cd ${WRKDIR}/cube && ${COPYTREE_SHARE} "data packages" ${DATADIR})
 	${INSTALL_DATA} ${WRKDIR}/cube/autoexec.cfg ${DATADIR}
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/cube/readme.html ${DOCSDIR}
-	@(cd ${WRKDIR}/cube/docs && ${COPYTREE_SHARE} \* ${DOCSDIR}/)
+	@(cd ${WRKDIR}/cube/docs && ${COPYTREE_SHARE} . ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>

Modified: head/games/cube/pkg-descr
==============================================================================
--- head/games/cube/pkg-descr	Sun May 12 11:25:13 2013	(r317944)
+++ head/games/cube/pkg-descr	Sun May 12 11:34:08 2013	(r317945)
@@ -1,20 +1,18 @@
-Cube is a 3D First Person Shooter that uses OpenGL and SDL.
+Cube is a 3D First Person Shooter that uses OpenGL and SDL.  It features:
 
-Features:
-- Single-player and Multiplayer gameplay.
-- Allows in-engine editing of geometry in full 3D (you fly around the map,
-  point / drag stuff to select it / modify it), which can even be done with
-  multiple people at once (a first!).
-- Has simplistic but effective fine grain vertex lighting that looks like
-  lightmapping and can do dynamic lights & shadows.
-- Doesn't need any kind of map precompilation, even lighting is done on the
-  fly.
-- Has very simplistic quad-tree world structure that can do slopes
-  (heightfields with caps) and slants, water.
-- Does decent collision detection & physics.
-- Has client/server networking that goes a long way in giving a lag-free game
-  experience.
-- Features a Doom/Quake-style singleplayer and multiplayer game with some
-  uncompromising brutal oldskool gameplay.
+  - Single- and multi-player gameplay
+  - In-engine editing of geometry in full 3D (you fly around the map, point
+    and drag stuff to select or modify it), which can even be done with
+    multiple people at once
+  - Simplistic, but effective fine grain vertex lighting that looks like
+    lightmapping and can do dynamic lights and shadows
+  - No need for any kind of map precompilation, even lighting is done on fly
+  - Very simplistic quad-tree world structure that can do slopes (height-
+    fields with caps) and slants, water
+  - Decent collision detection and physics
+  - Client/server networking that goes a long way in giving a lag-free game
+    experience
+  - Doom/Quake-style singleplayer and multiplayer game with some
+    uncompromising brutal old-school gameplay
 
 WWW: http://www.cubeengine.com/

Modified: head/games/cube/pkg-plist
==============================================================================
--- head/games/cube/pkg-plist	Sun May 12 11:25:13 2013	(r317944)
+++ head/games/cube/pkg-plist	Sun May 12 11:34:08 2013	(r317945)
@@ -1,7 +1,7 @@
 %%CLIENT%%bin/cube_client
-%%DEDICATED%%bin/cube_server
+%%SERVER%%bin/cube_server
 %%CLIENT%%libexec/cube_client
-%%DEDICATED%%libexec/cube_server
+%%SERVER%%libexec/cube_server
 %%DATADIR%%/autoexec.cfg
 %%DATADIR%%/data/Health.png
 %%DATADIR%%/data/crosshair.png



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