Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 May 2013 12:15:23 +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: r317949 - head/games/worldofpadman
Message-ID:  <201305121215.r4CCFNZ6089105@svn.freebsd.org>

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

Log:
  - Rename DEDICATED option to SERVER, add missing FLAVOR_DESC
  - Ensure that USE_GL is set, as SDL can be compiled without GL support
  - Adjust one PLIST_SUB: SMP -> SMPCLIENT

Modified:
  head/games/worldofpadman/Makefile
  head/games/worldofpadman/pkg-plist

Modified: head/games/worldofpadman/Makefile
==============================================================================
--- head/games/worldofpadman/Makefile	Sun May 12 12:03:06 2013	(r317948)
+++ head/games/worldofpadman/Makefile	Sun May 12 12:15:23 2013	(r317949)
@@ -22,23 +22,24 @@ MAKE_ENV=	DEFAULT_BASEDIR="${DATADIR}" P
 ALL_TARGET=	release
 NO_PACKAGE=	package will be ~600MB; set FORCE_PACKAGE if you really want it
 
+SRC_FILE=	${PORTNAME}-${PORTVERSION}
+VM_ARCHS=	amd64 i386 powerpc
+
 OPTIONS_DEFINE=		CURL CURL_DLOPEN GAMELIBS MP3 OPENAL OPENAL_DLOPEN \
 			OPTIMIZED_CFLAGS VORBIS
-OPTIONS_MULTI=		TYPE
-OPTIONS_MULTI_TYPE=	CLIENT DEDICATED SMP_CLIENT
-OPTIONS_DEFAULT=	CLIENT CURL CURL_DLOPEN DEDICATED OPTIMIZED_CFLAGS \
+OPTIONS_MULTI=		FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT SERVER SMP_CLIENT
+OPTIONS_DEFAULT=	CLIENT CURL CURL_DLOPEN SERVER OPTIMIZED_CFLAGS \
 			VORBIS SMP_CLIENT
 
+FLAVOR_DESC=		Clients and servers
 CLIENT_DESC=		Build client
 CURL_DLOPEN_DESC=	Enable dynamic loading of cURL
-DEDICATED_DESC=		Build dedicated server
+SERVER_DESC=		Build dedicated server
 GAMELIBS_DESC=		Force building game libraries
 OPENAL_DLOPEN_DESC=	Enable dynamic loading of OpenAL
 SMP_CLIENT_DESC=	Build SMP (threaded) client
 
-SRC_FILE=	${PORTNAME}-${PORTVERSION}
-VM_ARCHS=	amd64 i386 powerpc
-
 .include <bsd.port.options.mk>
 
 .for arch in ${ARCH}
@@ -69,6 +70,7 @@ MAKE_ENV+=	USE_OPENAL_DLOPEN=1
 .    endif
 .  endif
 # SDL
+USE_GL=		glu
 USE_SDL=	sdl
 # Vorbis
 .  if ${PORT_OPTIONS:MVORBIS}
@@ -85,12 +87,12 @@ WOPBIN+=	wop
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDEDICATED}
+.if ${PORT_OPTIONS:MSERVER}
 MAKE_ENV+=	BUILD_SERVER=1
-PLIST_SUB+=	DEDICATED=""
+PLIST_SUB+=	SERVER=""
 WOPBIN+=	wopded
 .else
-PLIST_SUB+=	DEDICATED="@comment "
+PLIST_SUB+=	SERVER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED)
@@ -111,10 +113,10 @@ MAKE_ENV+=	USE_OPTIMIZED_CFLAGS=1
 
 .if ${PORT_OPTIONS:MSMP_CLIENT}
 MAKE_ENV+=	BUILD_CLIENT_SMP=1
-PLIST_SUB+=	SMP=""
+PLIST_SUB+=	SMPCLIENT=""
 WOPBIN+=	wop-smp
 .else
-PLIST_SUB+=	SMP="@comment "
+PLIST_SUB+=	SMPCLIENT="@comment "
 .endif
 
 post-extract:

Modified: head/games/worldofpadman/pkg-plist
==============================================================================
--- head/games/worldofpadman/pkg-plist	Sun May 12 12:03:06 2013	(r317948)
+++ head/games/worldofpadman/pkg-plist	Sun May 12 12:15:23 2013	(r317949)
@@ -1,6 +1,6 @@
 %%CLIENT%%bin/worldofpadman
-%%SMP%%bin/worldofpadman-smp
-%%DEDICATED%%bin/worldofpadmanded
+%%SMPCLIENT%%bin/worldofpadman-smp
+%%SERVER%%bin/worldofpadmanded
 %%PORTDOCS%%%%DOCSDIR%%/banner.html
 %%PORTDOCS%%%%DOCSDIR%%/copyright_de.html
 %%PORTDOCS%%%%DOCSDIR%%/copyright_en.html



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