View | Details | Raw Unified | Return to bug 165842 | Differences between
and this patch

Collapse All | Expand All

(-)ioquake3-devel/Makefile (-3 / +6 lines)
Lines 14-25 Link Here
14
MAINTAINER?=	kamikaze@bsdforen.de
14
MAINTAINER?=	kamikaze@bsdforen.de
15
COMMENT?=	Development SVN snapshots of ioquake3
15
COMMENT?=	Development SVN snapshots of ioquake3
16
16
17
PLIST?=		${.CURDIR}/../ioquake3/pkg-plist
17
MASTERDIR=	${.CURDIR}/../ioquake3
18
DESCR?=		${.CURDIR}/../${PORTNAME}/pkg-descr
19
DISTINFO_FILE?=	${.CURDIR}/../${PORTNAME}/distinfo
18
PATCHDIR?=	${WRKDIR}/freebsd-patchset/
20
PATCHDIR?=	${WRKDIR}/freebsd-patchset/
21
PKGMESSAGE?=	${.CURDIR}/../${PORTNAME}/pkg-message
19
22
20
SVNREVISION?=	2194
23
SVNREVISION?=	2244
21
BINSUFFIX?=	-devel
24
BINSUFFIX?=	-devel
22
25
23
HAS_DLRENDERER?=	yes
26
HAS_DLRENDERER?=	yes
24
27
25
.include "${.CURDIR}/../ioquake3/Makefile"
28
.include "${MASTERDIR}/Makefile"
(-)ioquake3-devel/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (ioquake3-devel-1.36_SVN2194.zip) = 91ef10e29ebc49c4d1faa4265b573e98c3b804b71004111142ee7b55543a54ff
1
SHA256 (ioquake3-devel-1.36_SVN2244.zip) = a7ade108c015a1aa572082900a9995371d7853d6953226ef93bdfad9e46583fb
2
SIZE (ioquake3-devel-1.36_SVN2194.zip) = 5660634
2
SIZE (ioquake3-devel-1.36_SVN2244.zip) = 5650901
(-)ioquake3/Makefile (-16 / +47 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME?=	ioquake3
8
PORTNAME?=	ioquake3
9
DISTVERSION?=	1.36
9
DISTVERSION?=	1.36
10
PORTREVISION?=	9
10
PORTREVISION?=	10
11
CATEGORIES=	games
11
CATEGORIES=	games
12
MASTER_SITES?=	http://ioquake3.org/files/${DISTVERSION}/
12
MASTER_SITES?=	http://ioquake3.org/files/${DISTVERSION}/
13
# Using zip this way enables slaves to override it.
13
# Using zip this way enables slaves to override it.
Lines 20-44 Link Here
20
20
21
USE_GMAKE=	yes
21
USE_GMAKE=	yes
22
22
23
OPTIONS+=	CLIENT "Build client" on \
23
.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX:M*-server}
24
		DEDICATED "Build dedicated server" on \
24
# Server config
25
WITH_DEDICATED=	yes
26
WITHOUT_CLIENT=	yes
27
WITHOUT_SERVER=	yes
28
WITHOUT_CURL=	yes
29
WITHOUT_OPENAL=	yes
30
WITHOUT_MUMBLE=	yes
31
WITHOUT_VORBIS=	yes
32
WITHOUT_TOOLS=	yes
33
WITHOUT_DLRENDERER=	yes
34
.else
35
# Client config
36
WITH_CLIENT=	yes
37
WITHOUT_DEDICATED=	yes
38
OPTIONS+=	SERVER "Install dedicated server" on \
25
		CURL "Enable cURL for http/ftp download" on \
39
		CURL "Enable cURL for http/ftp download" on \
26
		OPENAL "Enable OpenAL audio output" on \
40
		OPENAL "Enable OpenAL audio output" on \
27
		MUMBLE "Enable Mumble support (no dependencies)" on \
41
		MUMBLE "Enable Mumble support (no dependencies)" on \
28
		VORBIS "Enable Ogg Vorbis support" on
42
		VORBIS "Enable Ogg Vorbis support" on
29
.if !defined(NO_GAMELIBS)
43
. if defined(NO_TOOLS)
30
OPTIONS+=	GAMELIBS "Build game libraries" off
44
WITHOUT_TOOLS=	yes
31
.endif
45
. else
32
.if defined(HAS_DLRENDERER)
46
OPTIONS+=	TOOLS "Enable modding tools" on
47
. endif
48
. if defined(HAS_DLRENDERER)
33
OPTIONS+=	DLRENDERER "Build dynamically loaded renderer" on
49
OPTIONS+=	DLRENDERER "Build dynamically loaded renderer" on
34
.else
50
. else
35
WITHOUT_DLRENDERER=	yes
51
WITHOUT_DLRENDERER=	yes
52
. endif
53
.endif
54
# Common config
55
.if !defined(NO_GAMELIBS)
56
OPTIONS+=	GAMELIBS "Build game libraries" off
36
.endif
57
.endif
37
58
38
MAKE_ARGS+=	DEFAULT_BASEDIR="${Q3DIR}" \
59
MAKE_ARGS+=	DEFAULT_BASEDIR="${Q3DIR}" \
39
		DEFAULT_LIBDIR="${LIBDIR}" \
60
		DEFAULT_LIBDIR="${LIBDIR}" \
40
		HOMEPATH="${HOMEPATH}" \
61
		HOMEPATH="${HOMEPATH}" \
41
		VERSION="${DISTVERSION}" \
62
		VERSION="${Q3ENGINEVER}" \
42
		ARCH="${ARCH}" \
63
		ARCH="${ARCH}" \
43
		USE_LOCAL_HEADERS=0
64
		USE_LOCAL_HEADERS=0
44
PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}" \
65
PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}" \
Lines 47-53 Link Here
47
ALL_TARGET=	release
68
ALL_TARGET=	release
48
MAKE_JOBS_SAFE=	yes
69
MAKE_JOBS_SAFE=	yes
49
70
50
LIBDIR=		${PREFIX}/lib/${PORTNAME}
71
LIBDIR=		${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
72
DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
51
BUILDDIR=	${WRKSRC}/build/${ALL_TARGET}-${OPSYS:L}-${ARCH}
73
BUILDDIR=	${WRKSRC}/build/${ALL_TARGET}-${OPSYS:L}-${ARCH}
52
BINSUFFIX?=
74
BINSUFFIX?=
53
HOMEPATH?=	/.${PORTNAME}
75
HOMEPATH?=	/.${PORTNAME}
Lines 62-74 Link Here
62
Q3ICON?=	${PREFIX}/share/pixmaps/quake3.xpm
84
Q3ICON?=	${PREFIX}/share/pixmaps/quake3.xpm
63
Q3RENDERER?=	renderer_opengl1_${ARCH}
85
Q3RENDERER?=	renderer_opengl1_${ARCH}
64
Q3INSTALL?=
86
Q3INSTALL?=
87
Q3ENGINEVER?=	${DISTVERSION}
65
88
66
ONLY_FOR_ARCHS=	amd64 i386
89
ONLY_FOR_ARCHS=	amd64 i386
67
90
68
# Make sure TARGET and CFLAGS fit together for cross-compiling.
69
MACHINE_ARCH=	${ARCH}
70
.include <bsd.cpu.mk>
71
72
.include <bsd.port.options.mk>
91
.include <bsd.port.options.mk>
73
92
74
.if defined(NO_GAMELIBS) && defined(WITH_GAMELIBS)
93
.if defined(NO_GAMELIBS) && defined(WITH_GAMELIBS)
Lines 82-95 Link Here
82
ALL_TARGET=	debug
101
ALL_TARGET=	debug
83
.endif
102
.endif
84
103
104
.if !defined(WITHOUT_SERVER)
105
RUN_DEPENDS+=	${Q3SERVER}:${PORTSDIR}/games/${PORTNAME}-server
106
.endif
107
85
.if !defined(DESKTOP_ENTRIES)
108
.if !defined(DESKTOP_ENTRIES)
86
. if !defined(WITHOUT_CLIENT)
109
. if !defined(WITHOUT_CLIENT)
87
DESKTOP_ENTRIES+=	"${Q3CLIENT} ${DISTVERSION}" "${COMMENT}"  \
110
DESKTOP_ENTRIES+=	"${Q3CLIENT} ${Q3ENGINEVER}" "${COMMENT}"  \
88
		"${Q3ICON}" \
111
		"${Q3ICON}" \
89
		"${Q3CLIENT}${BINSUFFIX}" "Application;Game;" false
112
		"${Q3CLIENT}${BINSUFFIX}" "Application;Game;" false
90
. endif
113
. endif
91
. if defined(WITH_SMP)
114
. if defined(WITH_SMP)
92
DESKTOP_ENTRIES+=	"${Q3CLIENT} ${DISTVERSION} SMP" "${COMMENT}" \
115
DESKTOP_ENTRIES+=	"${Q3CLIENT} ${Q3ENGINEVER} SMP" "${COMMENT}" \
93
		"${Q3ICON}" \
116
		"${Q3ICON}" \
94
		"${Q3CLIENT}-smp${BINSUFFIX}" "Application;Game;" false
117
		"${Q3CLIENT}-smp${BINSUFFIX}" "Application;Game;" false
95
. endif
118
. endif
Lines 179-193 Link Here
179
PLIST_SUB+=	DLRENDERER="@comment "
202
PLIST_SUB+=	DLRENDERER="@comment "
180
.endif
203
.endif
181
204
205
.if !defined(WITHOUT_TOOLS)
206
PLIST_SUB+=	TOOLS=""
207
.else
208
PLIST_SUB+=	TOOLS="@comment "
209
.endif
210
182
do-install: ${Q3INSTALL}
211
do-install: ${Q3INSTALL}
183
.for bin in ${Q3BIN}
212
.for bin in ${Q3BIN}
184
	${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${ARCH} \
213
	${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${ARCH} \
185
		${PREFIX}/bin/${bin}${BINSUFFIX}
214
		${PREFIX}/bin/${bin}${BINSUFFIX}
186
.endfor
215
.endfor
216
.if !defined(WITHOUT_TOOLS)
187
.for bin in ${Q3TOOLS}
217
.for bin in ${Q3TOOLS}
188
	${INSTALL_PROGRAM} ${BUILDDIR}/tools/${bin} \
218
	${INSTALL_PROGRAM} ${BUILDDIR}/tools/${bin} \
189
		${PREFIX}/bin/${bin}${BINSUFFIX}
219
		${PREFIX}/bin/${bin}${BINSUFFIX}
190
.endfor
220
.endfor
221
.endif
191
.if !defined(WITHOUT_DLRENDERER)
222
.if !defined(WITHOUT_DLRENDERER)
192
.for renderer in ${Q3RENDERER}
223
.for renderer in ${Q3RENDERER}
193
	${MKDIR} ${LIBDIR}
224
	${MKDIR} ${LIBDIR}
(-)ioquake3/files/patch-code-client-cl_curl.h (-12 lines)
Lines 1-12 Link Here
1
--- code/client/cl_curl.h.orig	2011-11-03 10:16:32.000000000 +0100
2
+++ code/client/cl_curl.h	2011-11-03 10:16:56.000000000 +0100
3
@@ -34,8 +34,7 @@
4
 #elif defined(MACOS_X)
5
 #define DEFAULT_CURL_LIB "libcurl.dylib"
6
 #else
7
-#define DEFAULT_CURL_LIB "libcurl.so.4"
8
-#define ALTERNATE_CURL_LIB "libcurl.so.3"
9
+#define DEFAULT_CURL_LIB "libcurl.so"
10
 #endif
11
 
12
 #ifdef USE_LOCAL_HEADERS
(-)ioquake3/pkg-plist (-4 / +4 lines)
Lines 1-10 Link Here
1
%%DEDICATED%%bin/ioq3ded%%BINSUFFIX%%
1
%%DEDICATED%%bin/ioq3ded%%BINSUFFIX%%
2
%%CLIENT%%bin/ioquake3%%BINSUFFIX%%
2
%%CLIENT%%bin/ioquake3%%BINSUFFIX%%
3
%%SMP%%bin/ioquake3-smp%%BINSUFFIX%%
3
%%SMP%%bin/ioquake3-smp%%BINSUFFIX%%
4
bin/q3asm%%BINSUFFIX%%
4
%%TOOLS%%bin/q3asm%%BINSUFFIX%%
5
bin/q3cpp%%BINSUFFIX%%
5
%%TOOLS%%bin/q3cpp%%BINSUFFIX%%
6
bin/q3lcc%%BINSUFFIX%%
6
%%TOOLS%%bin/q3lcc%%BINSUFFIX%%
7
bin/q3rcc%%BINSUFFIX%%
7
%%TOOLS%%bin/q3rcc%%BINSUFFIX%%
8
%%DLRENDERER%%%%LIBDIR%%/renderer_opengl1_%%ARCH%%.so
8
%%DLRENDERER%%%%LIBDIR%%/renderer_opengl1_%%ARCH%%.so
9
%%GAMELIBS%%%%LIBDIR%%/baseq3/cgame%%ARCH%%.so
9
%%GAMELIBS%%%%LIBDIR%%/baseq3/cgame%%ARCH%%.so
10
%%GAMELIBS%%%%LIBDIR%%/baseq3/qagame%%ARCH%%.so
10
%%GAMELIBS%%%%LIBDIR%%/baseq3/qagame%%ARCH%%.so
(-)iourbanterror/Makefile (-8 / +10 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	iourbanterror
8
PORTNAME=	iourbanterror
9
PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
9
PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
10
DISTVERSION=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
11
PORTEPOCH=	1
10
PORTEPOCH=	1
12
CATEGORIES=	games
11
CATEGORIES=	games
13
DISTNAME=	ioquake3-devel-1.36_SVN${SVNREVISION}
12
DISTNAME=	ioquake3-devel-1.36_SVN${SVNREVISION}
Lines 17-34 Link Here
17
16
18
RUN_DEPENDS=	${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror-data
17
RUN_DEPENDS=	${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror-data
19
18
20
PLIST=		${.CURDIR}/pkg-plist
19
MASTERDIR=	${.CURDIR}/../ioquake3-devel
20
DISTINFO_FILE=	${.CURDIR}/../ioquake3-devel/distinfo
21
PLIST=		${.CURDIR}/../${PORTNAME}/pkg-plist
21
22
22
NO_GAMELIBS=	yes
23
NO_GAMELIBS=	yes
24
NO_TOOLS=	yes
23
# The docs belong to ioquake3
25
# The docs belong to ioquake3
24
NOPORTDOCS=	yes
26
NOPORTDOCS=	yes
25
GAMEVERSION=	4.1.1
27
GAMEVERSION=	4.1.1
28
Q3ENGINEVER=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
26
Q3TOTALCONV=	yes
29
Q3TOTALCONV=	yes
27
Q3DIR=		${PREFIX}/share/quake3
30
Q3DIR=		${PREFIX}/share/quake3
28
Q3ICON=		${PREFIX}/share/quake3/q3ut4/q3ut.ico
31
Q3ICON=		${PREFIX}/share/quake3/q3ut4/q3ut.ico
29
Q3CLIENT=	ioUrbanTerror
32
Q3CLIENT=	ioUrbanTerror
30
Q3SERVER=	ioUrTded
33
Q3SERVER=	ioUrTded
31
Q3TOOLS=
32
Q3BASE=		q3ut4
34
Q3BASE=		q3ut4
33
BINSUFFIX=
35
BINSUFFIX=
34
HOMEPATH=	/.ioUrbanTerror
36
HOMEPATH=	/.ioUrbanTerror
Lines 36-51 Link Here
36
MAKE_ARGS+=	BUILD_MISSIONPACK=0 \
38
MAKE_ARGS+=	BUILD_MISSIONPACK=0 \
37
		BUILD_STANDALONE=1
39
		BUILD_STANDALONE=1
38
40
39
UTPATCHES!=	echo ${.CURDIR}/files/*
41
UTPATCHES=	${.CURDIR}/../${PORTNAME}/files/*
40
42
41
post-patch:
43
post-patch:
42
.for _file in ${UTPATCHES}
44
	@for utpatch in ${UTPATCHES}; do \
43
	@${PATCH} -sd "${WRKSRC}" < ${_file}
45
		${PATCH} -sd "${WRKSRC}" < $$utpatch; \
44
.endfor
46
	done
45
	@${REINPLACE_CMD} \
47
	@${REINPLACE_CMD} \
46
		-e 's/ioquake3/${Q3CLIENT}/g' \
48
		-e 's/ioquake3/${Q3CLIENT}/g' \
47
		-e 's/ioq3ded/${Q3SERVER}/g' \
49
		-e 's/ioq3ded/${Q3SERVER}/g' \
48
		-e 's/baseq3/${Q3BASE}/g' \
50
		-e 's/baseq3/${Q3BASE}/g' \
49
		"${WRKSRC}/Makefile"
51
		"${WRKSRC}/Makefile"
50
52
51
.include "../ioquake3-devel/Makefile"
53
.include "${MASTERDIR}/Makefile"
(-)iourbanterror/distinfo (-2 lines)
Lines 1-2 Link Here
1
SHA256 (ioquake3-devel-1.36_SVN2194.zip) = 91ef10e29ebc49c4d1faa4265b573e98c3b804b71004111142ee7b55543a54ff
2
SIZE (ioquake3-devel-1.36_SVN2194.zip) = 5660634
(-)openarena-data/Makefile (-18 / +16 lines)
Lines 6-40 Link Here
6
#
6
#
7
7
8
PORTNAME=	data
8
PORTNAME=	data
9
PORTVERSION=	0.8.5
9
PORTVERSION=	0.8.8
10
CATEGORIES=	games
10
CATEGORIES=	games
11
MASTER_SITES=	http://openarena.ws/request.php?2\\\#/:data \
11
MASTER_SITES=	SF/oarena:data \
12
		http://openarena.ws/request.php?3\\\#/:patch
12
		http://openarena.ws/request.php?4\\\#/:data \
13
DISTFILES=	${OA_DATA}:data \
13
		SF/oarena:patch \
14
		${OA_PATCH}:patch
14
		http://openarena.ws/request.php?5\\\#/:patch
15
DISTFILES=	${OA_DATA}:data
15
EXTRACT_ONLY=
16
EXTRACT_ONLY=
16
17
17
MAINTAINER=	kamikaze@bsdforen.de
18
MAINTAINER=	kamikaze@bsdforen.de
18
COMMENT=	OpenArena game data files
19
COMMENT=	OpenArena game data files
19
20
20
USE_ZIP=	yes
21
22
WRKSRC=		${WRKDIR}/baseoa
21
WRKSRC=		${WRKDIR}/baseoa
23
NO_BUILD=	yes
22
NO_BUILD=	yes
24
FETCH_ARGS=
23
FETCH_ARGS=
25
USE_ZIP=	yes
26
24
27
OA_DATA=	oa081.zip
25
OA_DATA=	${PKGNAMEPREFIX}${OA_DATA_VER}.zip
28
OA_DATA_VER=	0.8.1
26
OA_DATA_VER=	0.8.8
29
OA_PATCH=	oa085p.zip
27
30
OA_PATCH_VER=	0.8.1
28
.include "../openarena/Makefile.include"
31
32
post-extract:
33
	${UNZIP_CMD} -j ${DISTDIR}/${OA_DATA} ${PKGNAMEPREFIX}${OA_DATA_VER}/${OABASE}/\* -d ${WRKSRC}
34
	${UNZIP_CMD} -j ${DISTDIR}/${OA_PATCH} ${PKGNAMEPREFIX}${OA_PATCH_VER}/${OABASE}/\* -d ${WRKSRC}
35
29
36
do-install:
30
do-install:
37
	${MKDIR} ${DATADIR}
31
	${MKDIR} ${DATADIR}
38
	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})
32
.for _file in ${DISTFILES:C/:[^:]*//}
33
	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${_file} \
34
		${EXTRACT_AFTER_ARGS} -C ${DATADIR} --strip-components 2 \
35
		${PKGNAMEPREFIX}\?.\?.\?/baseoa/
36
.endfor
39
37
40
.include "../openarena/Makefile.include"
38
.include <bsd.port.post.mk>
(-)openarena-data/distinfo (-4 / +2 lines)
Lines 1-4 Link Here
1
SHA256 (oa081.zip) = c96282de8bc2ac5781df58c6adbce4265376e36190af50d7528f51dc739b6d7d
1
SHA256 (openarena-0.8.8.zip) = 5a8faf7f5b51f351b0a1618c06b6b98a5f1a6758f1d39818de2c87df2a0bac4a
2
SIZE (oa081.zip) = 318927645
2
SIZE (openarena-0.8.8.zip) = 425189255
3
SHA256 (oa085p.zip) = d360c4b095bc3b34d03d9a366b21c12052c3f9e9c57e86b17c8b2c038baa4719
4
SIZE (oa085p.zip) = 42528474
(-)openarena-data/pkg-plist (+1 lines)
Lines 6-10 Link Here
6
%%DATADIR%%/pak5-TA.pk3
6
%%DATADIR%%/pak5-TA.pk3
7
%%DATADIR%%/pak6-misc.pk3
7
%%DATADIR%%/pak6-misc.pk3
8
%%DATADIR%%/pak6-patch085.pk3
8
%%DATADIR%%/pak6-patch085.pk3
9
%%DATADIR%%/pak6-patch088.pk3
9
@dirrm %%DATADIR%%
10
@dirrm %%DATADIR%%
10
@dirrmtry %%OADIR%%
11
@dirrmtry %%OADIR%%
(-)openarena-oax/Makefile (-6 / +2 lines)
Lines 11-23 Link Here
11
MASTER_SITES=	http://files.poulsander.com/~poul19/public_files/eliminationSource/
11
MASTER_SITES=	http://files.poulsander.com/~poul19/public_files/eliminationSource/
12
DISTNAME=	${PORTNAME}${PORTVERSION}
12
DISTNAME=	${PORTNAME}${PORTVERSION}
13
EXTRACT_SUFX=	.zip
13
EXTRACT_SUFX=	.zip
14
EXTRACT_ONLY=
15
14
16
MAINTAINER=	kamikaze@bsdforen.de
15
MAINTAINER=	kamikaze@bsdforen.de
17
COMMENT=	OpenArena Mod: OpenArena Xpanded
16
COMMENT=	OpenArena Mod: OpenArena Xpanded
18
17
19
USE_ZIP=	yes
20
21
PLIST_SUB+=	DISTNAME="${DISTNAME}" \
18
PLIST_SUB+=	DISTNAME="${DISTNAME}" \
22
		PORTNAME="${PORTNAME}"
19
		PORTNAME="${PORTNAME}"
23
20
Lines 25-35 Link Here
25
22
26
OABASE=		${DISTNAME}
23
OABASE=		${DISTNAME}
27
24
28
post-extract:
29
	${UNZIP_CMD} -j ${DISTDIR}/${DISTFILES} -d ${WRKSRC}
30
31
do-install:
25
do-install:
32
	${MKDIR} ${DATADIR}
26
	${MKDIR} ${DATADIR}
33
	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})
27
	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})
34
28
35
.include "../openarena/Makefile.include"
29
.include "../openarena/Makefile.include"
30
31
.include <bsd.port.post.mk>
(-)openarena-oax/distinfo (-1 / +1 lines)
Lines 1-2 Link Here
1
SHA256 (oaxB50.zip) = 8c3a8846544acc4498a0bdc2fdbeb2206f9dd003be06498aab62e4573d7d108f
1
SHA256 (oaxB50.zip) = 8c3a8846544acc4498a0bdc2fdbeb2206f9dd003be06498aab62e4573d7d108f
2
SIZE (oaxB50.zip) = 472236
2
SIZE (oaxB50.zip) = 472236
(-)openarena/Makefile (-10 / +17 lines)
Lines 7-17 Link Here
7
7
8
PORTNAME=	openarena
8
PORTNAME=	openarena
9
PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
9
PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
10
DISTVERSION=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
10
PORTREVISION=	0
11
PORTREVISION=	9
12
PORTEPOCH=	1
11
PORTEPOCH=	1
13
MASTER_SITES=	http://files.poulsander.com/~poul19/public_files/oa/dev081/
12
MASTER_SITES=	SF/oarena/src \
14
DISTNAME=	${PORTNAME}-engine-source-0.8.x-22
13
		http://files.poulsander.com/~poul19/public_files/oa/dev088/
14
DISTNAME=	${PORTNAME}-engine-source-0.8.8
15
# Master port defines EXTRACT_SUFX unless already defined
15
# Master port defines EXTRACT_SUFX unless already defined
16
EXTRACT_SUFX=	.tar.bz2
16
EXTRACT_SUFX=	.tar.bz2
17
17
Lines 20-41 Link Here
20
20
21
RUN_DEPENDS=	${DATADIR}/${Q3BASE}/pak0.pk3:${PORTSDIR}/games/openarena-data
21
RUN_DEPENDS=	${DATADIR}/${Q3BASE}/pak0.pk3:${PORTSDIR}/games/openarena-data
22
22
23
MASTERDIR=	${.CURDIR}/../ioquake3
24
DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
25
DISTINFO_FILE=	${.CURDIR}/../${PORTNAME}/distinfo
26
PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
27
PLIST=		${.CURDIR}/../${PORTNAME}/pkg-plist
28
PKGMESSAGE=	${.CURDIR}/../${PORTNAME}/pkg-message
29
23
NO_GAMELIBS=	yes
30
NO_GAMELIBS=	yes
31
NO_TOOLS=	yes
24
# OpenArena doc is too messy to bother
32
# OpenArena doc is too messy to bother
25
NOPORTDOCS=	yes
33
NOPORTDOCS=	yes
34
# Dynamically loaded renderer not yet supported
35
WITHOUT_DLRENDERER=	yes
26
36
27
GAMEVERSION=	0.8.5
37
GAMEVERSION=	0.8.8
28
SVNREVISION=	1910
38
SVNREVISION=	1910
39
Q3ENGINEVER=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
29
Q3TOTALCONV=	yes
40
Q3TOTALCONV=	yes
30
Q3CLIENT=	openarena
41
Q3CLIENT=	openarena
31
Q3SERVER=	oa_ded
42
Q3SERVER=	oa_ded
32
Q3TOOLS=
33
Q3BASE=		baseoa
43
Q3BASE=		baseoa
34
Q3DIR=		${DATADIR}
44
Q3DIR=		${DATADIR}
35
# No icon included with OpenArena
45
# No icon included with OpenArena
36
Q3ICON=
46
Q3ICON=
37
47
38
# Dynamically loaded renderer not yet supported
48
.include "${MASTERDIR}/Makefile"
39
WITHOUT_DLRENDERER=	yes
40
41
.include "../ioquake3/Makefile"
(-)openarena/Makefile.include (-4 / +2 lines)
Lines 12-23 Link Here
12
.include <bsd.port.pre.mk>
12
.include <bsd.port.pre.mk>
13
13
14
# You only need server or client.
14
# You only need server or client.
15
.if exists(${PREFIX}/bin/oa_ded)
15
.if exists(${LOCALBASE}/bin/oa_ded)
16
OABIN=		oa_ded
16
OABIN=		oa_ded
17
.elif exists(${PREFIX}/bin/openarena)
17
.elif exists(${LOCALBASE}/bin/openarena)
18
OABIN=		openarena
18
OABIN=		openarena
19
.else
19
.else
20
OABIN=		openarena-smp
20
OABIN=		openarena-smp
21
.endif
21
.endif
22
23
.include <bsd.port.post.mk>
(-)openarena/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (openarena-engine-source-0.8.x-22.tar.bz2) = d2a9123b3e35f656de795957afcb64917612e91cfc55157410cceaa6a7939a60
1
SHA256 (openarena-engine-source-0.8.8.tar.bz2) = 95aa500cb7e42e57fb1f6db7b97a254168f4fa2e3676d6cdc33180b69fde0e77
2
SIZE (openarena-engine-source-0.8.x-22.tar.bz2) = 7422832
2
SIZE (openarena-engine-source-0.8.8.tar.bz2) = 3777830
(-)openarena/files/patch-Makefile (-4 / +4 lines)
Lines 1-5 Link Here
1
--- Makefile.orig	2011-11-04 21:03:54.000000000 +0100
1
--- Makefile.orig	2011-12-12 23:48:49.000000000 +0100
2
+++ Makefile	2011-11-04 21:09:54.000000000 +0100
2
+++ Makefile	2012-03-07 23:00:53.000000000 +0100
3
@@ -205,6 +205,8 @@
3
@@ -205,6 +205,8 @@
4
     OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
4
     OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
5
     SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
5
     SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
Lines 9-15 Link Here
9
   endif
9
   endif
10
   # Use sdl-config if all else fails
10
   # Use sdl-config if all else fails
11
   ifeq ($(SDL_CFLAGS),)
11
   ifeq ($(SDL_CFLAGS),)
12
@@ -569,9 +571,15 @@
12
@@ -570,9 +572,15 @@
13
 
13
 
14
 ifeq ($(PLATFORM),freebsd)
14
 ifeq ($(PLATFORM),freebsd)
15
 
15
 
Lines 25-31 Link Here
25
     -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
25
     -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
26
   CLIENT_CFLAGS = $(SDL_CFLAGS)
26
   CLIENT_CFLAGS = $(SDL_CFLAGS)
27
   SERVER_CFLAGS = 
27
   SERVER_CFLAGS = 
28
@@ -594,27 +602,24 @@
28
@@ -595,27 +603,24 @@
29
 
29
 
30
   # optional features/libraries
30
   # optional features/libraries
31
   ifeq ($(USE_OPENAL),1)
31
   ifeq ($(USE_OPENAL),1)
(-)openarena/files/patch-feature-DEFAULT_LIBDIR (-10 / +10 lines)
Lines 1-5 Link Here
1
--- code/qcommon/files.c.orig	2011-03-10 02:01:27.599036000 +0100
1
--- code/qcommon/files.c.orig	2011-12-24 13:29:32.000000000 +0100
2
+++ code/qcommon/files.c	2011-03-19 22:40:42.000000000 +0100
2
+++ code/qcommon/files.c	2012-03-07 23:00:53.000000000 +0100
3
@@ -250,6 +250,7 @@
3
@@ -250,6 +250,7 @@
4
 #endif
4
 #endif
5
 
5
 
Lines 8-22 Link Here
8
 static	cvar_t		*fs_basegame;
8
 static	cvar_t		*fs_basegame;
9
 static	cvar_t		*fs_gamedirvar;
9
 static	cvar_t		*fs_gamedirvar;
10
 static	searchpath_t	*fs_searchpaths;
10
 static	searchpath_t	*fs_searchpaths;
11
@@ -2956,6 +2957,7 @@
11
@@ -2859,6 +2860,7 @@
12
 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
12
 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
13
 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT|CVAR_PROTECTED );
13
 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
14
 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
14
 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
15
+	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
15
+	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
16
 	homePath = Sys_DefaultHomePath();
16
 	homePath = Sys_DefaultHomePath();
17
 	if (!homePath || !homePath[0]) {
17
 	if (!homePath || !homePath[0]) {
18
 		homePath = fs_basepath->string;
18
 		homePath = fs_basepath->string;
19
@@ -2975,6 +2977,11 @@
19
@@ -2878,6 +2880,11 @@
20
 	if (fs_apppath->string[0])
20
 	if (fs_apppath->string[0])
21
 		FS_AddGameDirectory(fs_apppath->string, gameName);
21
 		FS_AddGameDirectory(fs_apppath->string, gameName);
22
 	#endif
22
 	#endif
Lines 28-36 Link Here
28
 	
28
 	
29
 	// NOTE: same filtering below for mods and basegame
29
 	// NOTE: same filtering below for mods and basegame
30
 	if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) {
30
 	if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) {
31
--- code/qcommon/qcommon.h.orig	2011-03-10 02:01:27.599036000 +0100
31
--- code/qcommon/qcommon.h.orig	2011-12-24 13:29:32.000000000 +0100
32
+++ code/qcommon/qcommon.h	2011-03-19 22:40:42.000000000 +0100
32
+++ code/qcommon/qcommon.h	2012-03-07 23:00:53.000000000 +0100
33
@@ -1104,6 +1104,9 @@
33
@@ -1099,6 +1099,9 @@
34
 char    *Sys_DefaultAppPath(void);
34
 char    *Sys_DefaultAppPath(void);
35
 #endif
35
 #endif
36
 
36
 
Lines 40-47 Link Here
40
 void  Sys_SetDefaultHomePath(const char *path);
40
 void  Sys_SetDefaultHomePath(const char *path);
41
 char	*Sys_DefaultHomePath(void);
41
 char	*Sys_DefaultHomePath(void);
42
 const char	*Sys_TempPath(void);
42
 const char	*Sys_TempPath(void);
43
--- code/sys/sys_main.c.orig	2011-02-23 17:17:09.009063000 +0100
43
--- code/sys/sys_main.c.orig	2011-12-24 13:29:37.000000000 +0100
44
+++ code/sys/sys_main.c	2011-03-19 22:40:42.000000000 +0100
44
+++ code/sys/sys_main.c	2012-03-07 23:00:53.000000000 +0100
45
@@ -49,6 +49,7 @@
45
@@ -49,6 +49,7 @@
46
 
46
 
47
 static char binaryPath[ MAX_OSPATH ] = { 0 };
47
 static char binaryPath[ MAX_OSPATH ] = { 0 };
(-)urbanterror-data/Makefile (-13 / +14 lines)
Lines 5-40 Link Here
5
# $FreeBSD: ports/games/urbanterror-data/Makefile,v 1.7 2011/03/22 18:53:41 pav Exp $
5
# $FreeBSD: ports/games/urbanterror-data/Makefile,v 1.7 2011/03/22 18:53:41 pav Exp $
6
#
6
#
7
7
8
PORTNAME=	urbanterror
8
PORTNAME=	data
9
PORTVERSION=	4.1.1
9
PORTVERSION=	4.1.1
10
CATEGORIES=	games
10
CATEGORIES=	games
11
MASTER_SITES=	ftp://ftp.snt.utwente.nl/pub/games/urbanterror/full_install/linux_or_mac/
11
MASTER_SITES=	ftp://ftp.snt.utwente.nl/pub/games/urbanterror/full_install/linux_or_mac/ \
12
#		http://www.urbanterror.info/downloads/software/urt/${DISTNAME}${EXTRACT_SUFX}?download=direct\\\#
12
		http://www.iourt.com/files/ \
13
PKGNAMESUFFIX=	-data
13
		http://urbanterror.mtc-team.fr/
14
PKGNAMEPREFIX=	urbanterror-
14
DISTNAME=	UrbanTerror${PORTVERSION:S/.//g}
15
DISTNAME=	UrbanTerror${PORTVERSION:S/.//g}
16
EXTRACT_SUFX=	.zip
17
EXTRACT_ONLY=
15
18
16
MAINTAINER=	kamikaze@bsdforen.de
19
MAINTAINER=	kamikaze@bsdforen.de
17
COMMENT=	Standalone realism based mod originally for Quake III Arena
20
COMMENT=	Standalone realism based mod originally for Quake III Arena
18
21
19
USE_ZIP=	yes
20
NO_BUILD=	yes
22
NO_BUILD=	yes
21
NO_PACKAGE=	Package will be 1GB; set FORCE_PACKAGE if you really want it
23
NO_PACKAGE=	Package will be 1GB; set FORCE_PACKAGE if you really want it
22
WRKSRC=		${WRKDIR}/UrbanTerror
24
WRKSRC=		${WRKDIR}/UrbanTerror
23
25
24
DATADIR=	${Q3DIR}
26
DATADIR=	${PREFIX}/share/quake3
25
26
.include "../quake3-data/Makefile.include"
27
28
post-extract:
29
	@cd ${WRKSRC}/q3ut4 && ${MV} readme${PORTVERSION:S/.//:C/\..*//}.txt ..
30
27
31
do-install:
28
do-install:
32
	${MKDIR} ${DATADIR}/q3ut4
29
	${MKDIR} ${DATADIR}/q3ut4
33
	${CP} -r ${WRKSRC}/q3ut4/* ${DATADIR}/q3ut4
30
	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \
31
		${EXTRACT_AFTER_ARGS} -C ${DATADIR} --strip-components 1 \
32
		UrbanTerror/q3ut4
34
.if !defined(NOPORTDOCS)
33
.if !defined(NOPORTDOCS)
35
	${MKDIR} ${DOCSDIR}
34
	${MKDIR} ${DOCSDIR}
36
	${INSTALL_DATA} ${WRKSRC}/readme${PORTVERSION:S/.//:C/\..*//}.txt \
35
	${MV} ${DATADIR}/q3ut4/readme${PORTVERSION:S/.//:C/\..*//}.txt \
37
		${DOCSDIR}/readme${PORTVERSION:S/.//g}.txt
36
		${DOCSDIR}/readme${PORTVERSION:S/.//g}.txt
37
.else
38
	${RM} ${DATADIR}/q3ut4/readme${PORTVERSION:S/.//:C/\..*//}.txt
38
.endif
39
.endif
39
40
40
.include <bsd.port.mk>
41
.include <bsd.port.mk>

Return to bug 165842