FreeBSD Bugzilla – Attachment 122617 Details for
Bug 165842
[maintainer-update] games/ioquake3 and slaves
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-ports-games-ioquake3.txt
patch-ports-games-ioquake3.txt (text/plain), 14.64 KB, created by
kamikaze
on 2012-03-10 08:37:58 UTC
(
hide
)
Description:
patch-ports-games-ioquake3.txt
Filename:
MIME Type:
Creator:
kamikaze
Created:
2012-03-10 08:37:58 UTC
Size:
14.64 KB
patch
obsolete
>diff -Nur ioquake3.orig/Makefile ioquake3/Makefile >--- ioquake3.orig/Makefile 2012-03-07 20:15:24.000000000 +0100 >+++ ioquake3/Makefile 2012-03-08 07:33:38.000000000 +0100 >@@ -7,7 +7,7 @@ > > PORTNAME?= ioquake3 > DISTVERSION?= 1.36 >-PORTREVISION?= 9 >+PORTREVISION?= 10 > CATEGORIES= games > MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/ > # Using zip this way enables slaves to override it. >@@ -20,19 +20,40 @@ > > USE_GMAKE= yes > >-OPTIONS+= CLIENT "Build client" on \ >- DEDICATED "Build dedicated server" on \ >+.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 >+OPTIONS+= SERVER "Install dedicated server" on \ > CURL "Enable cURL for http/ftp download" on \ > OPENAL "Enable OpenAL audio output" on \ > MUMBLE "Enable Mumble support (no dependencies)" on \ > VORBIS "Enable Ogg Vorbis support" on >-.if !defined(NO_GAMELIBS) >-OPTIONS+= GAMELIBS "Build game libraries" off >-.endif >-.if defined(HAS_DLRENDERER) >+. if defined(NO_TOOLS) >+WITHOUT_TOOLS= yes >+. else >+OPTIONS+= TOOLS "Enable modding tools" on >+. endif >+. if defined(HAS_DLRENDERER) > OPTIONS+= DLRENDERER "Build dynamically loaded renderer" on >-.else >+. else > WITHOUT_DLRENDERER= yes >+. endif >+.endif >+# Common config >+.if !defined(NO_GAMELIBS) >+OPTIONS+= GAMELIBS "Build game libraries" off > .endif > > MAKE_ARGS+= DEFAULT_BASEDIR="${Q3DIR}" \ >@@ -47,7 +68,8 @@ > ALL_TARGET= release > MAKE_JOBS_SAFE= yes > >-LIBDIR= ${PREFIX}/lib/${PORTNAME} >+LIBDIR= ${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX} >+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} > BUILDDIR= ${WRKSRC}/build/${ALL_TARGET}-${OPSYS:L}-${ARCH} > BINSUFFIX?= > HOMEPATH?= /.${PORTNAME} >@@ -82,6 +104,10 @@ > ALL_TARGET= debug > .endif > >+.if !defined(WITHOUT_SERVER) >+RUN_DEPENDS+= ${Q3SERVER}:${PORTSDIR}/games/${PORTNAME}-server >+.endif >+ > .if !defined(DESKTOP_ENTRIES) > . if !defined(WITHOUT_CLIENT) > DESKTOP_ENTRIES+= "${Q3CLIENT} ${DISTVERSION}" "${COMMENT}" \ >@@ -179,15 +205,23 @@ > PLIST_SUB+= DLRENDERER="@comment " > .endif > >+.if !defined(WITHOUT_TOOLS) >+PLIST_SUB+= TOOLS="" >+.else >+PLIST_SUB+= TOOLS="@comment " >+.endif >+ > do-install: ${Q3INSTALL} > .for bin in ${Q3BIN} > ${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${ARCH} \ > ${PREFIX}/bin/${bin}${BINSUFFIX} > .endfor >+.if !defined(WITHOUT_TOOLS) > .for bin in ${Q3TOOLS} > ${INSTALL_PROGRAM} ${BUILDDIR}/tools/${bin} \ > ${PREFIX}/bin/${bin}${BINSUFFIX} > .endfor >+.endif > .if !defined(WITHOUT_DLRENDERER) > .for renderer in ${Q3RENDERER} > ${MKDIR} ${LIBDIR} >diff -Nur ioquake3.orig/files/patch-code-client-cl_curl.h ioquake3/files/patch-code-client-cl_curl.h >--- ioquake3.orig/files/patch-code-client-cl_curl.h 2012-03-07 20:15:24.000000000 +0100 >+++ ioquake3/files/patch-code-client-cl_curl.h 1970-01-01 01:00:00.000000000 +0100 >@@ -1,12 +0,0 @@ >---- code/client/cl_curl.h.orig 2011-11-03 10:16:32.000000000 +0100 >-+++ code/client/cl_curl.h 2011-11-03 10:16:56.000000000 +0100 >-@@ -34,8 +34,7 @@ >- #elif defined(MACOS_X) >- #define DEFAULT_CURL_LIB "libcurl.dylib" >- #else >--#define DEFAULT_CURL_LIB "libcurl.so.4" >--#define ALTERNATE_CURL_LIB "libcurl.so.3" >-+#define DEFAULT_CURL_LIB "libcurl.so" >- #endif >- >- #ifdef USE_LOCAL_HEADERS >diff -Nur ioquake3.orig/pkg-plist ioquake3/pkg-plist >--- ioquake3.orig/pkg-plist 2012-03-07 20:15:24.000000000 +0100 >+++ ioquake3/pkg-plist 2012-03-07 21:25:10.000000000 +0100 >@@ -1,10 +1,10 @@ > %%DEDICATED%%bin/ioq3ded%%BINSUFFIX%% > %%CLIENT%%bin/ioquake3%%BINSUFFIX%% > %%SMP%%bin/ioquake3-smp%%BINSUFFIX%% >-bin/q3asm%%BINSUFFIX%% >-bin/q3cpp%%BINSUFFIX%% >-bin/q3lcc%%BINSUFFIX%% >-bin/q3rcc%%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 >diff -Nur ioquake3-devel.orig/Makefile ioquake3-devel/Makefile >--- ioquake3-devel.orig/Makefile 2012-03-07 20:15:08.000000000 +0100 >+++ ioquake3-devel/Makefile 2012-03-07 22:52:24.000000000 +0100 >@@ -14,12 +14,15 @@ > MAINTAINER?= kamikaze@bsdforen.de > COMMENT?= Development SVN snapshots of ioquake3 > >-PLIST?= ${.CURDIR}/../ioquake3/pkg-plist >+MASTERDIR= ${.CURDIR}/../ioquake3 >+DESCR?= ${.CURDIR}/../${PORTNAME}/pkg-descr >+DISTINFO_FILE?= ${.CURDIR}/../${PORTNAME}/distinfo > PATCHDIR?= ${WRKDIR}/freebsd-patchset/ >+PKGMESSAGE?= ${.CURDIR}/../${PORTNAME}/pkg-message > >-SVNREVISION?= 2194 >+SVNREVISION?= 2224 > BINSUFFIX?= -devel > > HAS_DLRENDERER?= yes > >-.include "${.CURDIR}/../ioquake3/Makefile" >+.include "${MASTERDIR}/Makefile" >diff -Nur ioquake3-devel.orig/distinfo ioquake3-devel/distinfo >--- ioquake3-devel.orig/distinfo 2012-03-07 20:15:08.000000000 +0100 >+++ ioquake3-devel/distinfo 2012-03-07 21:50:09.000000000 +0100 >@@ -1,2 +1,2 @@ >-SHA256 (ioquake3-devel-1.36_SVN2194.zip) = 91ef10e29ebc49c4d1faa4265b573e98c3b804b71004111142ee7b55543a54ff >-SIZE (ioquake3-devel-1.36_SVN2194.zip) = 5660634 >+SHA256 (ioquake3-devel-1.36_SVN2224.zip) = 2cfd8a8510cb82cc0d6f72a26df5fc850c3700765940449c837abd17242c790c >+SIZE (ioquake3-devel-1.36_SVN2224.zip) = 5651057 >diff -Nur iourbanterror.orig/Makefile iourbanterror/Makefile >--- iourbanterror.orig/Makefile 2012-03-07 22:42:19.000000000 +0100 >+++ iourbanterror/Makefile 2012-03-07 22:29:50.000000000 +0100 >@@ -17,9 +17,12 @@ > > RUN_DEPENDS= ${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror-data > >-PLIST= ${.CURDIR}/pkg-plist >+MASTERDIR= ${.CURDIR}/../ioquake3-devel >+DISTINFO_FILE= ${.CURDIR}/../ioquake3-devel/distinfo >+PLIST= ${.CURDIR}/../${PORTNAME}/pkg-plist > > NO_GAMELIBS= yes >+NO_TOOLS= yes > # The docs belong to ioquake3 > NOPORTDOCS= yes > GAMEVERSION= 4.1.1 >@@ -28,7 +31,6 @@ > Q3ICON= ${PREFIX}/share/quake3/q3ut4/q3ut.ico > Q3CLIENT= ioUrbanTerror > Q3SERVER= ioUrTded >-Q3TOOLS= > Q3BASE= q3ut4 > BINSUFFIX= > HOMEPATH= /.ioUrbanTerror >@@ -36,7 +38,7 @@ > MAKE_ARGS+= BUILD_MISSIONPACK=0 \ > BUILD_STANDALONE=1 > >-UTPATCHES!= echo ${.CURDIR}/files/* >+UTPATCHES!= echo ${.CURDIR}/../${PORTNAME}/files/* > > post-patch: > .for _file in ${UTPATCHES} >@@ -48,4 +50,4 @@ > -e 's/baseq3/${Q3BASE}/g' \ > "${WRKSRC}/Makefile" > >-.include "../ioquake3-devel/Makefile" >+.include "${MASTERDIR}/Makefile" >diff -Nur iourbanterror.orig/distinfo iourbanterror/distinfo >--- iourbanterror.orig/distinfo 2012-03-07 22:42:19.000000000 +0100 >+++ iourbanterror/distinfo 1970-01-01 01:00:00.000000000 +0100 >@@ -1,2 +0,0 @@ >-SHA256 (ioquake3-devel-1.36_SVN2194.zip) = 91ef10e29ebc49c4d1faa4265b573e98c3b804b71004111142ee7b55543a54ff >-SIZE (ioquake3-devel-1.36_SVN2194.zip) = 5660634 >diff -Nur openarena.orig/Makefile openarena/Makefile >--- openarena.orig/Makefile 2012-03-07 22:42:41.000000000 +0100 >+++ openarena/Makefile 2012-03-07 23:00:21.000000000 +0100 >@@ -8,10 +8,10 @@ > PORTNAME= openarena > PORTVERSION= ${GAMEVERSION}.s${SVNREVISION} > DISTVERSION= 1.36_SVN${SVNREVISION}+${GAMEVERSION} >-PORTREVISION= 9 >+PORTREVISION= 0 > PORTEPOCH= 1 >-MASTER_SITES= http://files.poulsander.com/~poul19/public_files/oa/dev081/ >-DISTNAME= ${PORTNAME}-engine-source-0.8.x-22 >+MASTER_SITES= http://files.poulsander.com/~poul19/public_files/oa/dev088/ >+DISTNAME= ${PORTNAME}-engine-source-0.8.8 > # Master port defines EXTRACT_SUFX unless already defined > EXTRACT_SUFX= .tar.bz2 > >@@ -20,22 +20,28 @@ > > RUN_DEPENDS= ${DATADIR}/${Q3BASE}/pak0.pk3:${PORTSDIR}/games/openarena-data > >+MASTERDIR= ${.CURDIR}/../ioquake3 >+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 > # OpenArena doc is too messy to bother > NOPORTDOCS= yes >+# Dynamically loaded renderer not yet supported >+WITHOUT_DLRENDERER= yes > >-GAMEVERSION= 0.8.5 >+GAMEVERSION= 0.8.8 > SVNREVISION= 1910 > Q3TOTALCONV= yes > Q3CLIENT= openarena > Q3SERVER= oa_ded >-Q3TOOLS= > Q3BASE= baseoa > Q3DIR= ${DATADIR} > # No icon included with OpenArena > Q3ICON= > >-# Dynamically loaded renderer not yet supported >-WITHOUT_DLRENDERER= yes >- >-.include "../ioquake3/Makefile" >+.include "${MASTERDIR}/Makefile" >diff -Nur openarena.orig/distinfo openarena/distinfo >--- openarena.orig/distinfo 2012-03-07 22:42:41.000000000 +0100 >+++ openarena/distinfo 2012-03-07 22:54:04.000000000 +0100 >@@ -1,2 +1,2 @@ >-SHA256 (openarena-engine-source-0.8.x-22.tar.bz2) = d2a9123b3e35f656de795957afcb64917612e91cfc55157410cceaa6a7939a60 >-SIZE (openarena-engine-source-0.8.x-22.tar.bz2) = 7422832 >+SHA256 (openarena-engine-source-0.8.8.tar.bz2) = 95aa500cb7e42e57fb1f6db7b97a254168f4fa2e3676d6cdc33180b69fde0e77 >+SIZE (openarena-engine-source-0.8.8.tar.bz2) = 3777830 >diff -Nur openarena.orig/files/patch-Makefile openarena/files/patch-Makefile >--- openarena.orig/files/patch-Makefile 2012-03-07 22:42:41.000000000 +0100 >+++ openarena/files/patch-Makefile 2012-03-07 23:02:26.000000000 +0100 >@@ -1,5 +1,5 @@ >---- Makefile.orig 2011-11-04 21:03:54.000000000 +0100 >-+++ Makefile 2011-11-04 21:09:54.000000000 +0100 >+--- Makefile.orig 2011-12-12 23:48:49.000000000 +0100 >++++ Makefile 2012-03-07 23:00:53.000000000 +0100 > @@ -205,6 +205,8 @@ > OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal) > SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//') >@@ -9,7 +9,7 @@ > endif > # Use sdl-config if all else fails > ifeq ($(SDL_CFLAGS),) >-@@ -569,9 +571,15 @@ >+@@ -570,9 +572,15 @@ > > ifeq ($(PLATFORM),freebsd) > >@@ -25,7 +25,7 @@ > -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON > CLIENT_CFLAGS = $(SDL_CFLAGS) > SERVER_CFLAGS = >-@@ -594,27 +602,24 @@ >+@@ -595,27 +603,24 @@ > > # optional features/libraries > ifeq ($(USE_OPENAL),1) >diff -Nur openarena.orig/files/patch-feature-DEFAULT_LIBDIR openarena/files/patch-feature-DEFAULT_LIBDIR >--- openarena.orig/files/patch-feature-DEFAULT_LIBDIR 2012-03-07 22:42:41.000000000 +0100 >+++ openarena/files/patch-feature-DEFAULT_LIBDIR 2012-03-07 23:03:54.000000000 +0100 >@@ -1,5 +1,5 @@ >---- code/qcommon/files.c.orig 2011-03-10 02:01:27.599036000 +0100 >-+++ code/qcommon/files.c 2011-03-19 22:40:42.000000000 +0100 >+--- code/qcommon/files.c.orig 2011-12-24 13:29:32.000000000 +0100 >++++ code/qcommon/files.c 2012-03-07 23:00:53.000000000 +0100 > @@ -250,6 +250,7 @@ > #endif > >@@ -8,15 +8,15 @@ > static cvar_t *fs_basegame; > static cvar_t *fs_gamedirvar; > static searchpath_t *fs_searchpaths; >-@@ -2956,6 +2957,7 @@ >+@@ -2859,6 +2860,7 @@ > fs_debug = Cvar_Get( "fs_debug", "0", 0 ); >- fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT|CVAR_PROTECTED ); >+ fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT ); > fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT ); > + fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT ); > homePath = Sys_DefaultHomePath(); > if (!homePath || !homePath[0]) { > homePath = fs_basepath->string; >-@@ -2975,6 +2977,11 @@ >+@@ -2878,6 +2880,11 @@ > if (fs_apppath->string[0]) > FS_AddGameDirectory(fs_apppath->string, gameName); > #endif >@@ -28,9 +28,9 @@ > > // NOTE: same filtering below for mods and basegame > if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) { >---- code/qcommon/qcommon.h.orig 2011-03-10 02:01:27.599036000 +0100 >-+++ code/qcommon/qcommon.h 2011-03-19 22:40:42.000000000 +0100 >-@@ -1104,6 +1104,9 @@ >+--- code/qcommon/qcommon.h.orig 2011-12-24 13:29:32.000000000 +0100 >++++ code/qcommon/qcommon.h 2012-03-07 23:00:53.000000000 +0100 >+@@ -1099,6 +1099,9 @@ > char *Sys_DefaultAppPath(void); > #endif > >@@ -40,8 +40,8 @@ > void Sys_SetDefaultHomePath(const char *path); > char *Sys_DefaultHomePath(void); > const char *Sys_TempPath(void); >---- code/sys/sys_main.c.orig 2011-02-23 17:17:09.009063000 +0100 >-+++ code/sys/sys_main.c 2011-03-19 22:40:42.000000000 +0100 >+--- code/sys/sys_main.c.orig 2011-12-24 13:29:37.000000000 +0100 >++++ code/sys/sys_main.c 2012-03-07 23:00:53.000000000 +0100 > @@ -49,6 +49,7 @@ > > static char binaryPath[ MAX_OSPATH ] = { 0 }; >diff -Nur openarena-data.orig/Makefile openarena-data/Makefile >--- openarena-data.orig/Makefile 2012-03-07 23:20:47.000000000 +0100 >+++ openarena-data/Makefile 2012-03-07 23:14:36.000000000 +0100 >@@ -6,12 +6,12 @@ > # > > PORTNAME= data >-PORTVERSION= 0.8.5 >+PORTVERSION= 0.8.8 > CATEGORIES= games >-MASTER_SITES= http://openarena.ws/request.php?2\\\#/:data \ >- http://openarena.ws/request.php?3\\\#/:patch >-DISTFILES= ${OA_DATA}:data \ >- ${OA_PATCH}:patch >+MASTER_SITES= http://openarena.ws/request.php?4\\\#/:data >+# http://openarena.ws/request.php?5\\\#/:patch >+DISTFILES= ${OA_DATA}:data >+# ${OA_PATCH}:patch > EXTRACT_ONLY= > > MAINTAINER= kamikaze@bsdforen.de >@@ -24,14 +24,14 @@ > FETCH_ARGS= > USE_ZIP= yes > >-OA_DATA= oa081.zip >-OA_DATA_VER= 0.8.1 >-OA_PATCH= oa085p.zip >-OA_PATCH_VER= 0.8.1 >+OA_DATA= oa088.zip >+OA_DATA_VER= 0.8.8 >+OA_PATCH= oa088p.zip >+OA_PATCH_VER= 0.8.8 > > post-extract: > ${UNZIP_CMD} -j ${DISTDIR}/${OA_DATA} ${PKGNAMEPREFIX}${OA_DATA_VER}/${OABASE}/\* -d ${WRKSRC} >- ${UNZIP_CMD} -j ${DISTDIR}/${OA_PATCH} ${PKGNAMEPREFIX}${OA_PATCH_VER}/${OABASE}/\* -d ${WRKSRC} >+# ${UNZIP_CMD} -j ${DISTDIR}/${OA_PATCH} ${PKGNAMEPREFIX}${OA_PATCH_VER}/${OABASE}/\* -d ${WRKSRC} > > do-install: > ${MKDIR} ${DATADIR} >diff -Nur openarena-data.orig/distinfo openarena-data/distinfo >--- openarena-data.orig/distinfo 2012-03-07 23:20:47.000000000 +0100 >+++ openarena-data/distinfo 2012-03-07 23:19:29.000000000 +0100 >@@ -1,4 +1,2 @@ >-SHA256 (oa081.zip) = c96282de8bc2ac5781df58c6adbce4265376e36190af50d7528f51dc739b6d7d >-SIZE (oa081.zip) = 318927645 >-SHA256 (oa085p.zip) = d360c4b095bc3b34d03d9a366b21c12052c3f9e9c57e86b17c8b2c038baa4719 >-SIZE (oa085p.zip) = 42528474 >+SHA256 (oa088.zip) = 5a8faf7f5b51f351b0a1618c06b6b98a5f1a6758f1d39818de2c87df2a0bac4a >+SIZE (oa088.zip) = 425189255 >diff -Nur openarena-data.orig/pkg-plist openarena-data/pkg-plist >--- openarena-data.orig/pkg-plist 2012-03-07 23:20:47.000000000 +0100 >+++ openarena-data/pkg-plist 2012-03-10 09:30:09.000000000 +0100 >@@ -6,5 +6,6 @@ > %%DATADIR%%/pak5-TA.pk3 > %%DATADIR%%/pak6-misc.pk3 > %%DATADIR%%/pak6-patch085.pk3 >+%%DATADIR%%/pak6-patch088.pk3 > @dirrm %%DATADIR%% > @dirrmtry %%OADIR%% >diff -Nur urbanterror-data.orig/Makefile urbanterror-data/Makefile >--- urbanterror-data.orig/Makefile 2012-03-08 00:07:27.000000000 +0100 >+++ urbanterror-data/Makefile 2012-03-08 00:09:58.000000000 +0100 >@@ -21,9 +21,7 @@ > NO_PACKAGE= Package will be 1GB; set FORCE_PACKAGE if you really want it > WRKSRC= ${WRKDIR}/UrbanTerror > >-DATADIR= ${Q3DIR} >- >-.include "../quake3-data/Makefile.include" >+DATADIR= ${PREFIX}/share/quake3 > > post-extract: > @cd ${WRKSRC}/q3ut4 && ${MV} readme${PORTVERSION:S/.//:C/\..*//}.txt ..
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 165842
:
122614
|
122615
|
122616
| 122617 |
122618
|
122619