Attachment 135631 Details for Bug 180576 – patch-ports-games-ioquake3.txt

[patch] patch-ports-games-ioquake3.txt

patch-ports-games-ioquake3.txt (text/plain; charset=UTF-8), 24.40 KB, created by kamikaze on 2013-07-23 13:25:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kamikaze

Created: 2013-07-23 13:25:20 UTC

Size: 24.40 KB

patch

obsolete

>Index: games/ioquake3/Makefile
>===================================================================
>--- games/ioquake3/Makefile	(revision 323473)
>+++ games/ioquake3/Makefile	(working copy)
>@@ -15,60 +15,55 @@
> 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 OPUS OPENGL2
>+IOQ3?=		CLIENT TOOLS GAMELIBS
>+IOQ3ARCH?=	${ARCH}
>+
>+.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
> .endif
>+.if ${IOQ3:MOPUS}
>+OPTIONS_DEFINE+=	OPUS
>+OPTIONS_DEFAULT+=	OPUS
>+OPUS_DESC=	Opus audio codec support
>+.endif
> 
> MAKE_ARGS+=	DEFAULT_BASEDIR="${Q3DIR}" \
>-		DEFAULT_LIBDIR="${LIBDIR}" \
>+		DEFAULT_LIBDIR="${PREFIX}/${LIBDIR}" \
> 		HOMEPATH="${HOMEPATH}" \
> 		VERSION="${Q3ENGINEVER}" \
>-		ARCH="${ARCH}" \
>+		ARCH="${IOQ3ARCH}" \
> 		USE_LOCAL_HEADERS=0
>-PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}" \
>-		ARCH="${ARCH}" \
>-		BINSUFFIX="${BINSUFFIX}"
> ALL_TARGET=	release
> MAKE_JOBS_SAFE=	yes
> 
>-LIBDIR=		${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
>-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
>-BUILDDIR=	${WRKSRC}/build/${ALL_TARGET}-${OPSYS:L}-${ARCH}
>+LIBDIR=		lib/${PORTNAME}${PKGNAMESUFFIX}
>+DOCSDIR=	share/doc/${PORTNAME}${PKGNAMESUFFIX}
>+BUILDDIR=	${WRKSRC}/build/${ALL_TARGET}-${OPSYS:L}-${IOQ3ARCH}
> BINSUFFIX?=
> HOMEPATH?=	/.${PORTNAME}
> Q3CLIENT?=	ioquake3
>@@ -77,10 +72,21 @@
> 		q3cpp \
> 		q3lcc \
> 		q3rcc
>+Q3DOCS?=	README \
>+		id-readme.txt \
>+		md4-readme.txt \
>+		voip-readme.txt
> Q3BASE?=	baseq3 \
> 		missionpack
>+Q3GAMELIBS?=	cgame \
>+		qagame \
>+		ui
> Q3ICON?=	${PREFIX}/share/pixmaps/quake3.xpm
>-Q3RENDERER?=	renderer_opengl1_${ARCH}
>+.if ${IOQ3:MOPENGL2}
>+Q3RENDERER?=	renderer_opengl1_${IOQ3ARCH} renderer_opengl2_${IOQ3ARCH}
>+.else
>+Q3RENDERER?=	renderer_opengl1_${IOQ3ARCH}
>+.endif
> Q3INSTALL?=
> Q3ENGINEVER?=	${DISTVERSION}
> 
>@@ -97,7 +103,7 @@
> .endif
> 
> .if !defined(DESKTOP_ENTRIES)
>-. if ${PORT_OPTIONS:MCLIENT}
>+. if ${IOQ3:MCLIENT}
> DESKTOP_ENTRIES+=	"${Q3CLIENT} ${Q3ENGINEVER}" "${COMMENT}"  \
> 		"${Q3ICON}" \
> 		"${Q3CLIENT}${BINSUFFIX}" "Game;" false
>@@ -109,13 +115,21 @@
> . endif
> .endif
> 
>-.if ! ${PORT_OPTIONS:MCLIENT} && ! ${PORT_OPTIONS:MDEDICATED} && \
>-    ! ${PORT_OPTIONS:MSMP}
>-IGNORE=		needs at least one of CLIENT, DEDICATED and SMP options
>+.if ${IOQ3:MCLIENT}
>+MAKE_ARGS+=	BUILD_CLIENT=1
>+Q3BIN+=		${Q3CLIENT}
>+USE_SDL=	sdl
>+.else
>+MAKE_ARGS+=	BUILD_CLIENT=0
> .endif
> 
>-.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP}
>-# cURL
>+.if ${IOQ3:MSERVER}
>+MAKE_ARGS+=	BUILD_SERVER=1
>+Q3BIN+=		${Q3SERVER}
>+.else
>+MAKE_ARGS+=	BUILD_SERVER=0
>+.endif
>+
> .if ${PORT_OPTIONS:MCURL}
> LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
> MAKE_ARGS+=	USE_CURL=1 USE_CURL_DLOPEN=0
>@@ -122,7 +136,7 @@
> .else
> MAKE_ARGS+=	USE_CURL=0
> .endif
>-# OpenAL
>+
> .if ${PORT_OPTIONS:MOPENAL}
> USE_OPENAL=	al
> MAKE_ARGS+=	USE_OPENAL=1 USE_OPENAL_DLOPEN=0
>@@ -129,108 +143,100 @@
> .else
> MAKE_ARGS+=	USE_OPENAL=0
> .endif
>-# SDL
>-USE_SDL=	sdl
>-# Vorbis
>+
> .if ${PORT_OPTIONS:MVORBIS}
>-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
>+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
> MAKE_ARGS+=	USE_CODEC_VORBIS=1
> .else
> MAKE_ARGS+=	USE_CODEC_VORBIS=0
> .endif
>-# Mumble
>-.if ${PORT_OPTIONS:MMUMBLE}
>-MAKE_ARGS+=	USE_MUMBLE=1
>-.else
>-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}
>-MAKE_ARGS+=	BUILD_CLIENT=1
>-PLIST_SUB+=	CLIENT=""
>-Q3BIN+=		${Q3CLIENT}
>+.if ${PORT_OPTIONS:MOPUS}
>+MAKE_ARGS+=	USE_CODEC_OPUS=1 USE_INTERNAL_OPUS=1
> .else
>-MAKE_ARGS+=	BUILD_CLIENT=0
>-PLIST_SUB+=	CLIENT="@comment "
>+MAKE_ARGS+=	USE_CODEC_OPUS=0
> .endif
> 
>-.if ${PORT_OPTIONS:MDEDICATED}
>-MAKE_ARGS+=	BUILD_SERVER=1
>-PLIST_SUB+=	DEDICATED=""
>-Q3BIN+=		${Q3SERVER}
>+.if ${PORT_OPTIONS:MMUMBLE}
>+MAKE_ARGS+=	USE_MUMBLE=1
> .else
>-MAKE_ARGS+=	BUILD_SERVER=0
>-PLIST_SUB+=	DEDICATED="@comment "
>+MAKE_ARGS+=	USE_MUMBLE=0
> .endif
> 
> .if ${PORT_OPTIONS:MGAMELIBS}
> MAKE_ARGS+=	BUILD_GAME_SO=1
>-PLIST_SUB+=	GAMELIBS=""
> .else
>-PLIST_SUB+=	GAMELIBS="@comment "
>+MAKE_ARGS+=	BUILD_GAME_SO=0
> .endif
> 
> # Note that SMP is only supported on OS-X, hence the option has been removed.
> .if ${PORT_OPTIONS:MSMP}
> MAKE_ARGS+=	BUILD_CLIENT_SMP=1
>-PLIST_SUB+=	SMP=""
> Q3BIN+=		${Q3CLIENT}-smp
> .else
> MAKE_ARGS+=	BUILD_CLIENT_SMP=0
>-PLIST_SUB+=	SMP="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MDLRENDERER}
>-PLIST_SUB+=	DLRENDERER=""
> MAKE_ARGS+=	USE_RENDERER_DLOPEN=1
>+. if ${IOQ3:MOPENGL2}
>+Q3DOCS+=	opengl2-readme.txt
>+. endif
> .else
> MAKE_ARGS+=	USE_RENDERER_DLOPEN=0
>-PLIST_SUB+=	DLRENDERER="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MTOOLS}
>-PLIST_SUB+=	TOOLS=""
>-.else
>-PLIST_SUB+=	TOOLS="@comment "
>-.endif
>-
>-do-install: ${Q3INSTALL}
>+# Generate a set of install instruction tuples: <cmd>;<src>;<dst>
> .for bin in ${Q3BIN}
>-	${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${ARCH} \
>-		${PREFIX}/bin/${bin}${BINSUFFIX}
>+IOQ3_INST+=	PROGRAM;${bin}.${IOQ3ARCH};bin/${bin}${BINSUFFIX}
> .endfor
> .if ${PORT_OPTIONS:MTOOLS}
>-.for bin in ${Q3TOOLS}
>-	${INSTALL_PROGRAM} ${BUILDDIR}/tools/${bin} \
>-		${PREFIX}/bin/${bin}${BINSUFFIX}
>-.endfor
>+. for bin in ${Q3TOOLS}
>+IOQ3_INST+=	PROGRAM;tools/${bin};bin/${bin}${BINSUFFIX}
>+. endfor
> .endif
> .if ${PORT_OPTIONS:MDLRENDERER}
>-.for renderer in ${Q3RENDERER}
>-	${MKDIR} ${LIBDIR}
>-	${INSTALL_LIB} ${BUILDDIR}/${renderer}.so ${LIBDIR}
>-.endfor
>+. for renderer in ${Q3RENDERER}
>+IOQ3_INST+=	LIB;${renderer}.so;${LIBDIR}/${renderer}.so
>+. endfor
> .endif
> .if ${PORT_OPTIONS:MGAMELIBS}
>-.for dir in ${Q3BASE}
>-	${MKDIR} ${LIBDIR}/${dir}
>-	${INSTALL_LIB} ${BUILDDIR}/${dir}/*.so ${LIBDIR}/${dir}
>-.endfor
>+. for dir in ${Q3BASE}
>+PLIST_DIRS+=	${LIBDIR}/${dir}
>+.  for lib in ${Q3GAMELIBS}
>+IOQ3_INST+=	LIB;${dir}/${lib}${IOQ3ARCH}.so;${LIBDIR}/${dir}/${lib}${IOQ3ARCH}.so
>+.  endfor
>+. endfor
> .endif
>+.if ${PORT_OPTIONS:MDLRENDERER} || ${PORT_OPTIONS:MGAMELIBS}
>+PLIST_DIRS+=	${LIBDIR}
>+.endif
> .if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>+PLIST_DIRS+=	${DOCSDIR}
>+. for doc in ${Q3DOCS}
>+IOQ3_INST+=	DATA;../../${doc};${DOCSDIR}/${doc}
>+. endfor
> .endif
> 
>+# Generate PLIST_FILES
>+.for inst in ${IOQ3_INST}
>+PLIST_FILES+=	${inst:C/.*;//}
>+.endfor
>+
>+# Generate install target
>+do-install: ${Q3INSTALL}
>+.for dir in ${PLIST_DIRS}
>+	${MKDIR} ${PREFIX}/${dir}
>+.endfor
>+.for inst in ${IOQ3_INST}
>+	${INSTALL_${inst:C/;.*//}} ${BUILDDIR}/${inst:C/[^;]*;//:C/;.*//} \
>+		${PREFIX}/${inst:C/.*;//}
>+.endfor
>+
> post-install:
>-	@${ECHO_CMD}
>+	@${JOT} -s '' -b= 78
> 	@${CAT} ${PKGMESSAGE}
>-	@${ECHO_CMD}
>+	@${JOT} -s '' -b= 78
> 
> .if !defined(Q3TOTALCONV)
> .include "${.CURDIR}/../quake3-data/Makefile.include"
>Index: games/ioquake3/pkg-descr
>===================================================================
>--- games/ioquake3/pkg-descr	(revision 323473)
>+++ 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/pkg-message
>===================================================================
>--- games/ioquake3/pkg-message	(revision 323473)
>+++ games/ioquake3/pkg-message	(working copy)
>@@ -1,5 +1,3 @@
>-==============================================================================
>-
> Should the game freeze when entering a match, try to change the value of
> com_zoneMegs (e.g. to 48).
> 
>@@ -7,5 +5,3 @@
> they have additional variables which would be removed if other engines
> overwrite them. But you can safely copy the original directory to the new one
> for the first time.
>-
>-==============================================================================
>Index: games/ioquake3/pkg-plist
>===================================================================
>--- games/ioquake3/pkg-plist	(revision 323473)
>+++ games/ioquake3/pkg-plist	(working copy)
>@@ -1,19 +0,0 @@
>-%%DEDICATED%%bin/ioq3ded%%BINSUFFIX%%
>-%%CLIENT%%bin/ioquake3%%BINSUFFIX%%
>-%%SMP%%bin/ioquake3-smp%%BINSUFFIX%%
>-%%TOOLS%%bin/q3asm%%BINSUFFIX%%
>-%%TOOLS%%bin/q3cpp%%BINSUFFIX%%
>-%%TOOLS%%bin/q3lcc%%BINSUFFIX%%
>-%%TOOLS%%bin/q3rcc%%BINSUFFIX%%
>-%%DLRENDERER%%%%LIBDIR%%/renderer_opengl1_%%ARCH%%.so
>-%%GAMELIBS%%%%LIBDIR%%/baseq3/cgame%%ARCH%%.so
>-%%GAMELIBS%%%%LIBDIR%%/baseq3/qagame%%ARCH%%.so
>-%%GAMELIBS%%%%LIBDIR%%/baseq3/ui%%ARCH%%.so
>-%%GAMELIBS%%%%LIBDIR%%/missionpack/cgame%%ARCH%%.so
>-%%GAMELIBS%%%%LIBDIR%%/missionpack/qagame%%ARCH%%.so
>-%%GAMELIBS%%%%LIBDIR%%/missionpack/ui%%ARCH%%.so
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%GAMELIBS%%@dirrm %%LIBDIR%%/missionpack
>-%%GAMELIBS%%@dirrm %%LIBDIR%%/baseq3
>-@dirrmtry %%LIBDIR%%
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Index: games/ioquake3-devel/Makefile
>===================================================================
>--- games/ioquake3-devel/Makefile	(revision 323473)
>+++ games/ioquake3-devel/Makefile	(working copy)
>@@ -2,23 +2,25 @@
> # $FreeBSD$
> 
> PORTNAME?=	ioquake3-devel
>-DISTVERSION?=	1.36_SVN${SVNREVISION}
>+DISTVERSION?=	GIT${GITREVISION}
> PORTREVISION?=	0
> MASTER_SITES?=	ftp://deponie.yamagi.org/freebsd/distfiles/ioquake3/ \
> 		http://deponie.yamagi.org/freebsd/distfiles/ioquake3/
>+EXTRACT_SUFX?=	.tar.xz
> 
> MAINTAINER?=	kamikaze@bsdforen.de
>-COMMENT?=	Development SVN snapshots of ioquake3
>+COMMENT?=	Development GIT snapshots of ioquake3
> 
> MASTERDIR=	${.CURDIR}/../ioquake3
> DESCR?=		${.CURDIR}/../${PORTNAME}/pkg-descr
> DISTINFO_FILE?=	${.CURDIR}/../${PORTNAME}/distinfo
>-PATCHDIR?=	${WRKDIR}/freebsd-patchset/
>+PATCHDIR?=	${.CURDIR}/../${PORTNAME}/files
> PKGMESSAGE?=	${.CURDIR}/../${PORTNAME}/pkg-message
> 
>-SVNREVISION?=	2318
>+GITREVISION?=	2178
> BINSUFFIX?=	-devel
> 
>-HAS_DLRENDERER?=	yes
>+IOQ3?=		CLIENT TOOLS DLRENDERER GAMELIBS OPUS OPENGL2
>+IOQ3ARCH?=	${ARCH:S/i386/x86/:S/amd64/x86_64/}
> 
> .include "${MASTERDIR}/Makefile"
>Index: games/ioquake3-devel/distinfo
>===================================================================
>--- games/ioquake3-devel/distinfo	(revision 323473)
>+++ games/ioquake3-devel/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ioquake3-devel-1.36_SVN2318.zip) = 5e82c2108425ef3ce7de463ea924b8b83e6d84b38a60c4561195b4d37ab76c15
>-SIZE (ioquake3-devel-1.36_SVN2318.zip) = 5657343
>+SHA256 (ioquake3-devel-GIT2178.tar.xz) = 9567243047c7c0ef6f9e329a1c8be826bdce4f12d02685eb51ec3a8058324eb9
>+SIZE (ioquake3-devel-GIT2178.tar.xz) = 4167780
>Index: games/ioquake3-devel/pkg-message
>===================================================================
>--- games/ioquake3-devel/pkg-message	(revision 323473)
>+++ games/ioquake3-devel/pkg-message	(working copy)
>@@ -1,6 +1,2 @@
>-==============================================================================
>-
> Should the game have trouble meeting com_maxfps, which would result in less
> effective strafe jumping, set com_busywait 1 to restore the old behaviour.
>-
>-==============================================================================
>Index: games/ioquake3-devel-server/Makefile
>===================================================================
>--- games/ioquake3-devel-server/Makefile	(revision 323473)
>+++ 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 323473)
>+++ 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 GAMELIBS
>+
> .include "${MASTERDIR}/Makefile"
>Index: games/iourbanterror/Makefile
>===================================================================
>--- games/iourbanterror/Makefile	(revision 323473)
>+++ games/iourbanterror/Makefile	(working copy)
>@@ -1,15 +1,11 @@
>-# New ports collection makefile for:	ioquake3
>-# Date created:				3 Jun 2006
>-# Whom:					alepulver
>-#
>+# Created by: alepulver
> # $FreeBSD$
>-#
> 
> PORTNAME=	iourbanterror
>-PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
>+PORTVERSION=	${GAMEVERSION}.g${GITREVISION}
> PORTEPOCH=	1
> CATEGORIES=	games
>-DISTNAME=	ioquake3-devel-1.36_SVN${SVNREVISION}
>+DISTNAME=	ioquake3-devel-GIT${GITREVISION}
> 
> MAINTAINER=	kamikaze@bsdforen.de
> COMMENT=	Quake 3 engine modified for Urban Terror (based on ioquake3)
>@@ -18,14 +14,13 @@
> 
> MASTERDIR=	${.CURDIR}/../ioquake3-devel
> DISTINFO_FILE=	${.CURDIR}/../ioquake3-devel/distinfo
>-PLIST=		${.CURDIR}/../${PORTNAME}/pkg-plist
> 
>-NO_GAMELIBS=	yes
>-NO_TOOLS=	yes
>+IOQ3?=		CLIENT DLRENDERER OPUS OPENGL2
>+
> # The docs belong to ioquake3
>-NOPORTDOCS=	yes
>-GAMEVERSION=	4.1.1
>-Q3ENGINEVER=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
>+OPTIONS_EXCLUDE=	DOCS
>+GAMEVERSION=	4.2.014
>+Q3ENGINEVER=	GIT${GITREVISION}+${GAMEVERSION}
> Q3TOTALCONV=	yes
> Q3DIR=		${PREFIX}/share/quake3
> Q3ICON=		${PREFIX}/share/quake3/q3ut4/q3ut.ico
>@@ -38,12 +33,7 @@
> MAKE_ARGS+=	BUILD_MISSIONPACK=0 \
> 		BUILD_STANDALONE=1
> 
>-UTPATCHES=	${.CURDIR}/../${PORTNAME}/files/*
>-
> post-patch:
>-	@for utpatch in ${UTPATCHES}; do \
>-		${PATCH} -sd "${WRKSRC}" < $$utpatch; \
>-	done
> 	@${REINPLACE_CMD} \
> 		-e 's/ioquake3/${Q3CLIENT}/g' \
> 		-e 's/ioq3ded/${Q3SERVER}/g' \
>Index: games/iourbanterror/pkg-descr
>===================================================================
>--- games/iourbanterror/pkg-descr	(revision 323473)
>+++ 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/pkg-message
>===================================================================
>--- games/iourbanterror/pkg-message	(revision 323473)
>+++ games/iourbanterror/pkg-message	(working copy)
>@@ -1,5 +1,3 @@
>-==============================================================================
>-
> Note, that the port was switched over to use the original ioquake project
> source code instead of code provided by the UrbanTerror project. The
> UrbanTerror project is switching to a closed source licensing model:
>@@ -7,5 +5,3 @@
> 
> Should the game have trouble meeting com_maxfps, set com_busywait 1 to restore
> the old behaviour.
>-
>-==============================================================================
>Index: games/iourbanterror/pkg-plist
>===================================================================
>--- games/iourbanterror/pkg-plist	(revision 323473)
>+++ games/iourbanterror/pkg-plist	(working copy)
>@@ -1,5 +0,0 @@
>-%%DEDICATED%%bin/ioUrTded
>-%%CLIENT%%bin/ioUrbanTerror
>-%%SMP%%bin/ioUrbanTerror-smp
>-%%DLRENDERER%%%%LIBDIR%%/renderer_opengl1_%%ARCH%%.so
>-%%DLRENDERER%%@dirrm %%LIBDIR%%
>Index: games/iourbanterror-server/Makefile
>===================================================================
>--- games/iourbanterror-server/Makefile	(revision 323473)
>+++ 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 323473)
>+++ 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}
>@@ -24,19 +20,16 @@
> DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
> DISTINFO_FILE=	${.CURDIR}/../${PORTNAME}/distinfo
> PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
>-PLIST=		${.CURDIR}/../${PORTNAME}/pkg-plist
> PKGMESSAGE=	${.CURDIR}/../${PORTNAME}/pkg-message
> 
>-NO_GAMELIBS=	yes
>-NO_TOOLS=	yes
>+IOQ3?=		CLIENT
>+IOQ3ARCH?=	${ARCH}
> # OpenArena doc is too messy to bother
>-NOPORTDOCS=	yes
>-# Dynamically loaded renderer not yet supported
>-WITHOUT_DLRENDERER=	yes
>+OPTIONS_EXCLUDE=	DOCS
> 
> GAMEVERSION=	0.8.8
> SVNREVISION=	1910
>-Q3ENGINEVER=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
>+Q3ENGINEVER=	SVN${SVNREVISION}+${GAMEVERSION}
> Q3TOTALCONV=	yes
> Q3CLIENT=	openarena
> Q3SERVER=	oa_ded
>Index: games/openarena/pkg-descr
>===================================================================
>--- games/openarena/pkg-descr	(revision 323473)
>+++ 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/pkg-message
>===================================================================
>--- games/openarena/pkg-message	(revision 323473)
>+++ games/openarena/pkg-message	(working copy)
>@@ -1,6 +1,2 @@
>-==============================================================================
>-
> Should the game have trouble meeting com_maxfps, which would result in less
> effective strafe jumping, set com_busywait 1 to restore the old behaviour.
>-
>-==============================================================================
>Index: games/openarena/pkg-plist
>===================================================================
>--- games/openarena/pkg-plist	(revision 323473)
>+++ games/openarena/pkg-plist	(working copy)
>@@ -1,3 +0,0 @@
>-%%DEDICATED%%bin/oa_ded%%BINSUFFIX%%
>-%%CLIENT%%bin/openarena%%BINSUFFIX%%
>-%%SMP%%bin/openarena-smp%%BINSUFFIX%%
>Index: games/openarena-server/Makefile
>===================================================================
>--- games/openarena-server/Makefile	(revision 323473)
>+++ 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"
>Index: games/urbanterror-data/Makefile
>===================================================================
>--- games/urbanterror-data/Makefile	(revision 323473)
>+++ games/urbanterror-data/Makefile	(working copy)
>@@ -1,18 +1,14 @@
>-# New ports collection makefile for:	urbanterror-data
>-# Date created:				2007-09-10
>-# Whom:					alepulver
>-#
>+# Created by: alepulver
> # $FreeBSD$
>-#
> 
> PORTNAME=	data
>-PORTVERSION=	4.1.1
>+PORTVERSION=	4.2.014
> CATEGORIES=	games
>-MASTER_SITES=	ftp://ftp.snt.utwente.nl/pub/games/urbanterror/full_install/linux_or_mac/ \
>-		http://www.iourt.com/files/ \
>-		http://urbanterror.mtc-team.fr/
>+MASTER_SITES=	http://www.ftwgl.com/files/mirror/ \
>+		http://www.f1m.fr/uploads/urt/ \
>+		http://maps.goreclan.net/
> PKGNAMEPREFIX=	urbanterror-
>-DISTNAME=	UrbanTerror${PORTVERSION:S/.//g}
>+DISTNAME=	UrbanTerror${URT_VER}_full${URT_REV}
> EXTRACT_SUFX=	.zip
> EXTRACT_ONLY=
> 
>@@ -23,18 +19,25 @@
> NO_PACKAGE=	Package will be 1GB; set FORCE_PACKAGE if you really want it
> 
> DATADIR=	${PREFIX}/share/quake3
>+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
> 
>+URT_VER=	${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
>+URT_REV=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\2/}
>+
>+PLIST_SUB+=	VER=${URT_VER}
>+
>+.include <bsd.port.options.mk>
>+
> do-install:
> 	${MKDIR} ${DATADIR}/q3ut4
> 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \
> 		${EXTRACT_AFTER_ARGS} -C ${DATADIR} --strip-components 1 \
>-		UrbanTerror/q3ut4
>-.if !defined(NOPORTDOCS)
>+		UrbanTerror${URT_VER}/q3ut4
>+.if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${DOCSDIR}
>-	${MV} ${DATADIR}/q3ut4/readme${PORTVERSION:S/.//:C/\..*//}.txt \
>-		${DOCSDIR}/readme${PORTVERSION:S/.//g}.txt
>+	${MV} ${DATADIR}/q3ut4/readme${URT_VER}.txt ${DOCSDIR}
> .else
>-	${RM} ${DATADIR}/q3ut4/readme${PORTVERSION:S/.//:C/\..*//}.txt
>+	${RM} ${DATADIR}/q3ut4/readme${URT_VER}.txt
> .endif
> 
> .include <bsd.port.mk>
>Index: games/urbanterror-data/distinfo
>===================================================================
>--- games/urbanterror-data/distinfo	(revision 323473)
>+++ games/urbanterror-data/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (UrbanTerror411.zip) = 32d578c556975db2b09735d8be49b575cc0bfc4d379ca57d9981c656115a6f47
>-SIZE (UrbanTerror411.zip) = 1074190065
>+SHA256 (UrbanTerror42_full014.zip) = 52618f40223baedf37b0a97fc99fd05d3915d20eaff38c71e4eeb66835c7d169
>+SIZE (UrbanTerror42_full014.zip) = 1548345447
>Index: games/urbanterror-data/pkg-descr
>===================================================================
>--- games/urbanterror-data/pkg-descr	(revision 323473)
>+++ games/urbanterror-data/pkg-descr	(working copy)
>@@ -9,4 +9,4 @@
> This port only contains the data, and can be played with ioUrbanTerror
> (games/iourbanterror) or any other Quake 3 Arena compatible engine.
> 
>-WWW:	http://www.urbanterror.net/
>+WWW: http://www.urbanterror.net/
>Index: games/urbanterror-data/pkg-plist
>===================================================================
>--- games/urbanterror-data/pkg-plist	(revision 323473)
>+++ games/urbanterror-data/pkg-plist	(working copy)
>@@ -1,19 +1,34 @@
>-%%PORTDOCS%%%%DOCSDIR%%/readme411.txt
>-%%DATADIR%%/q3ut4/QIIIA Game Source (SDK) License.doc
>-%%DATADIR%%/q3ut4/Urban Terror on the Web.url
>-%%DATADIR%%/q3ut4/autoexec.cfg
>-%%DATADIR%%/q3ut4/demos/tutorial.dm_68
>-%%DATADIR%%/q3ut4/description.txt
>-%%DATADIR%%/q3ut4/mapcycle.txt
>-%%DATADIR%%/q3ut4/q3ut.ico
>-%%DATADIR%%/q3ut4/screenshots/shot0000.jpg
>-%%DATADIR%%/q3ut4/server.cfg
>+%%PORTDOCS%%%%DOCSDIR%%/readme%%VER%%.txt
>+%%DATADIR%%/q3ut4/How_To_Install.txt
>+%%DATADIR%%/q3ut4/QIIIA_Game_Source_License.doc
>+%%DATADIR%%/q3ut4/autoexec_example.cfg
>+%%DATADIR%%/q3ut4/mapcycle_example.txt
>+%%DATADIR%%/q3ut4/server_example.cfg
> %%DATADIR%%/q3ut4/ut4_commune.pk3
>-%%DATADIR%%/q3ut4/zpak000.pk3
>-%%DATADIR%%/q3ut4/zpak000_assets.pk3
>-%%DATADIR%%/q3ut4/zpak001_assets.pk3
>-@dirrm %%DATADIR%%/q3ut4/screenshots
>-@dirrm %%DATADIR%%/q3ut4/demos
>+%%DATADIR%%/q3ut4/ut4_jumpents.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0001.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0002.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0003.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0004.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0005.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0006.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0007.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0008.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0009.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0010.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0011.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0012.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0013.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0014.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0015.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0016.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0017.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0018.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0019.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0020.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0021.pk3
>+%%DATADIR%%/q3ut4/zUrT42_0022.pk3
>+%%DATADIR%%/q3ut4/zUrT42_qvm.pk3
> @dirrm %%DATADIR%%/q3ut4
> @dirrmtry %%DATADIR%%
> %%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 180576: 135630 | 135631 | 135632