Attachment 135630 Details for Bug 180576 – file.diff

[patch] file.diff

file.diff (text/plain), 8.06 KB, created by kamikaze on 2013-07-15 16:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kamikaze

Created: 2013-07-15 16:20:00 UTC

Size: 8.06 KB

patch

obsolete

>Index: games/ioquake3/Makefile
>===================================================================
>--- games/ioquake3/Makefile	(revision 323028)
>+++ games/ioquake3/Makefile	(working copy)
>@@ -15,40 +15,31 @@
> USES=		pkgconfig
> USE_GMAKE=	yes
> 
>-.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX:M*-server}
>-# Server config
>-WITH_DEDICATED=	yes
>-WITHOUT_CLIENT=	yes
>-WITHOUT_SERVER=	yes
>-WITHOUT_CURL=	yes
>-WITHOUT_OPENAL=	yes
>-WITHOUT_MUMBLE=	yes
>-WITHOUT_VORBIS=	yes
>-WITHOUT_TOOLS=	yes
>-WITHOUT_DLRENDERER=	yes
>-.else
>-# Client config
>-WITH_CLIENT=	yes
>-WITHOUT_DEDICATED=	yes
>+# Port configuration flags CLIENT SERVER TOOLS DLRENDERER GAMELIBS
>+IOQ3?=		CLIENT TOOLS GAMELIBS
>+
>+.if ! ${IOQ3:MCLIENT} && ! ${IOQ3:MSERVER}
>+BROKEN=		Slave ports must at least specify IOQ3=CLIENT or IOQ3=SERVER
>+.endif
>+
>+# Client options
>+.if ${IOQ3:MCLIENT}
> OPTIONS_DEFINE=	SERVER CURL OPENAL MUMBLE VORBIS DEBUG
> OPTIONS_DEFAULT=	SERVER CURL OPENAL MUMBLE VORBIS
> SERVER_DESC=	Install dedicated server
> MUMBLE_DESC=	Enable Mumble support (no dependencies)
>-. if defined(NO_TOOLS)
>-WITHOUT_TOOLS=	yes
>-. else
>+.endif
>+.if ${IOQ3:MTOOLS}
> OPTIONS_DEFINE+=	TOOLS
> OPTIONS_DEFAULT+=	TOOLS
> TOOLS_DESC=	Enable modding tools
>-. endif
>-. if defined(HAS_DLRENDERER)
>+.endif
>+.if ${IOQ3:MDLRENDERER}
> OPTIONS_DEFINE+=	DLRENDERER
> OPTIONS_DEFAULT+=	DLRENDERER
> DLRENDERER_DESC=	Build dynamically loaded renderer
>-. endif
> .endif
>-# Common config
>-.if !defined(NO_GAMELIBS)
>+.if ${IOQ3:MGAMELIBS}
> OPTIONS_DEFINE+=	GAMELIBS
> OPTIONS_DEFAULT+=	GAMELIBS
> GAMELIBS_DESC=	Build game libraries
>@@ -97,7 +88,7 @@
> .endif
> 
> .if !defined(DESKTOP_ENTRIES)
>-. if ${PORT_OPTIONS:MCLIENT}
>+. if ${IOQ3:MCLIENT}
> DESKTOP_ENTRIES+=	"${Q3CLIENT} ${Q3ENGINEVER}" "${COMMENT}"  \
> 		"${Q3ICON}" \
> 		"${Q3CLIENT}${BINSUFFIX}" "Game;" false
>@@ -109,12 +100,7 @@
> . endif
> .endif
> 
>-.if ! ${PORT_OPTIONS:MCLIENT} && ! ${PORT_OPTIONS:MDEDICATED} && \
>-    ! ${PORT_OPTIONS:MSMP}
>-IGNORE=		needs at least one of CLIENT, DEDICATED and SMP options
>-.endif
>-
>-.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP}
>+.if ${IOQ3:MCLIENT}
> # cURL
> .if ${PORT_OPTIONS:MCURL}
> LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
>@@ -145,12 +131,9 @@
> MAKE_ARGS+=	USE_MUMBLE=0
> .endif
> .else
>-# Features that aren't installed without a client
>-WITHOUT_DLRENDERER=	yes
> .endif
> 
>-# SMP is only built with CLIENT.
>-.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP}
>+.if ${IOQ3:MCLIENT}
> MAKE_ARGS+=	BUILD_CLIENT=1
> PLIST_SUB+=	CLIENT=""
> Q3BIN+=		${Q3CLIENT}
>@@ -159,7 +142,7 @@
> PLIST_SUB+=	CLIENT="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MDEDICATED}
>+.if ${IOQ3:MSERVER}
> MAKE_ARGS+=	BUILD_SERVER=1
> PLIST_SUB+=	DEDICATED=""
> Q3BIN+=		${Q3SERVER}
>Index: games/ioquake3/pkg-descr
>===================================================================
>--- games/ioquake3/pkg-descr	(revision 323028)
>+++ games/ioquake3/pkg-descr	(working copy)
>@@ -8,4 +8,4 @@
> the engine has been ported to many new platforms and has had a slew of new
> features added, along with massive bug extermination.
> 
>-WWW:	http://ioquake3.org/
>+WWW: http://ioquake3.org/
>Index: games/ioquake3-devel/Makefile
>===================================================================
>--- games/ioquake3-devel/Makefile	(revision 323028)
>+++ games/ioquake3-devel/Makefile	(working copy)
>@@ -19,6 +19,6 @@
> SVNREVISION?=	2318
> BINSUFFIX?=	-devel
> 
>-HAS_DLRENDERER?=	yes
>+IOQ3?=		CLIENT TOOLS DLRENDERER GAMELIBS
> 
> .include "${MASTERDIR}/Makefile"
>Index: games/ioquake3-devel-server/Makefile
>===================================================================
>--- games/ioquake3-devel-server/Makefile	(revision 323028)
>+++ games/ioquake3-devel-server/Makefile	(working copy)
>@@ -1,9 +1,5 @@
>-# New ports collection makefile for:	ioquake3-devel-server
>-# Date created:				19 May 2012
>-# Whom:					Dominic Fandrey <kamikaze@bsdforen.de>
>-#
>+# Created by: Dominic Fandrey
> # $FreeBSD$
>-#
> 
> PORTNAME=	ioquake3-devel
> PKGNAMESUFFIX=	-server
>@@ -14,4 +10,6 @@
> UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
> MASTERDIR=	${.CURDIR}/../${PORTNAME}
> 
>+IOQ3=		SERVER GAMELIBS
>+
> .include "${MASTERDIR}/Makefile"
>Index: games/ioquake3-server/Makefile
>===================================================================
>--- games/ioquake3-server/Makefile	(revision 323028)
>+++ games/ioquake3-server/Makefile	(working copy)
>@@ -1,9 +1,5 @@
>-# New ports collection makefile for:	ioquake3-server
>-# Date created:				19 May 2012
>-# Whom:					Dominic Fandrey <kamikaze@bsdforen.de>
>-#
>+# Created by: Dominic Fandrey <kamikaze@bsdforen.de>
> # $FreeBSD$
>-#
> 
> PORTNAME=	ioquake3
> PKGNAMESUFFIX=	-server
>@@ -14,4 +10,6 @@
> UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
> MASTERDIR=	${.CURDIR}/../${PORTNAME}
> 
>+IOQ3=		SERVER
>+
> .include "${MASTERDIR}/Makefile"
>Index: games/iourbanterror/Makefile
>===================================================================
>--- games/iourbanterror/Makefile	(revision 323028)
>+++ games/iourbanterror/Makefile	(working copy)
>@@ -1,9 +1,5 @@
>-# New ports collection makefile for:	ioquake3
>-# Date created:				3 Jun 2006
>-# Whom:					alepulver
>-#
>+# Created by: alepulver
> # $FreeBSD$
>-#
> 
> PORTNAME=	iourbanterror
> PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
>@@ -20,8 +16,8 @@
> DISTINFO_FILE=	${.CURDIR}/../ioquake3-devel/distinfo
> PLIST=		${.CURDIR}/../${PORTNAME}/pkg-plist
> 
>-NO_GAMELIBS=	yes
>-NO_TOOLS=	yes
>+IOQ3?=		CLIENT DLRENDERER
>+
> # The docs belong to ioquake3
> NOPORTDOCS=	yes
> GAMEVERSION=	4.1.1
>Index: games/iourbanterror/pkg-descr
>===================================================================
>--- games/iourbanterror/pkg-descr	(revision 323028)
>+++ games/iourbanterror/pkg-descr	(working copy)
>@@ -9,4 +9,4 @@
> This port installs a modified ioquake3 engine for Urban Terror called
> ioUrbanTerror, and depends on the data, resulting in a playable game.
> 
>-WWW:	http://www.urbanterror.info/
>+WWW: http://www.urbanterror.info/
>Index: games/iourbanterror-server/Makefile
>===================================================================
>--- games/iourbanterror-server/Makefile	(revision 323028)
>+++ games/iourbanterror-server/Makefile	(working copy)
>@@ -1,9 +1,5 @@
>-# New ports collection makefile for:	iourbanterror-server
>-# Date created:				19 May 2012
>-# Whom:					Dominic Fandrey <kamikaze@bsdforen.de>
>-#
>+# Created by: Dominic Fandrey
> # $FreeBSD$
>-#
> 
> PORTNAME=	iourbanterror
> PKGNAMESUFFIX=	-server
>@@ -14,4 +10,6 @@
> UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
> MASTERDIR=	${.CURDIR}/../${PORTNAME}
> 
>+IOQ3=		SERVER
>+
> .include "${MASTERDIR}/Makefile"
>Index: games/openarena/Makefile
>===================================================================
>--- games/openarena/Makefile	(revision 323028)
>+++ games/openarena/Makefile	(working copy)
>@@ -1,9 +1,5 @@
>-# New ports collection makefile for:	openarena
>-# Date created:				2007-08-01
>-# Whom:					Josh Tolbert <hemi@puresimplicity.net>
>-#
>+# Created by: Josh Tolbert
> # $FreeBSD$
>-#
> 
> PORTNAME=	openarena
> PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
>@@ -27,12 +23,9 @@
> PLIST=		${.CURDIR}/../${PORTNAME}/pkg-plist
> PKGMESSAGE=	${.CURDIR}/../${PORTNAME}/pkg-message
> 
>-NO_GAMELIBS=	yes
>-NO_TOOLS=	yes
>+IOQ3?=		CLIENT
> # OpenArena doc is too messy to bother
> NOPORTDOCS=	yes
>-# Dynamically loaded renderer not yet supported
>-WITHOUT_DLRENDERER=	yes
> 
> GAMEVERSION=	0.8.8
> SVNREVISION=	1910
>Index: games/openarena/pkg-descr
>===================================================================
>--- games/openarena/pkg-descr	(revision 323028)
>+++ games/openarena/pkg-descr	(working copy)
>@@ -4,4 +4,4 @@
> Domination, Overload, Harvester, and more. There are 17 unique player models to
> choose from and 12 weapons.
> 
>-WWW:	http://openarena.ws/
>+WWW: http://openarena.ws/
>Index: games/openarena-server/Makefile
>===================================================================
>--- games/openarena-server/Makefile	(revision 323028)
>+++ games/openarena-server/Makefile	(working copy)
>@@ -1,9 +1,5 @@
>-# New ports collection makefile for:	openarena-server
>-# Date created:				19 May 2012
>-# Whom:					Dominic Fandrey <kamikaze@bsdforen.de>
>-#
>+# Created by: Dominic Fandrey
> # $FreeBSD$
>-#
> 
> PORTNAME=	openarena
> PKGNAMESUFFIX=	-server
>@@ -14,4 +10,6 @@
> UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
> MASTERDIR=	${.CURDIR}/../${PORTNAME}
> 
>+IOQ3=		SERVER
>+
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 180576: 135630 | 135631 | 135632