Date: Wed, 12 Sep 2007 01:39:33 -0300 From: "Alejandro Pulver" <alepulver@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/116299: [NEW PORT] games/iourbanterror: Quake 3 engine modified for Urban Terror (based on ioquake3) Message-ID: <1189571973.91222@deimos.mars.bsd> Resent-Message-ID: <200709120440.l8C4e2IN072044@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116299 >Category: ports >Synopsis: [NEW PORT] games/iourbanterror: Quake 3 engine modified for Urban Terror (based on ioquake3) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Sep 12 04:40:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 6.2-RELEASE i386 >Organization: >Environment: System: FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007 root@dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP >Description: Please repocopy games/ioquake3 to games/iourbanterror, since they are almost the same (see the diff, but note that the comment section of the port won't be changed when merging the changes with the repocopied port, as I realized later about the repocopy). >How-To-Repeat: >Fix: --- iourbanterror.diff begins here --- diff -urNd ioquake3/Makefile ../new/iourbanterror/Makefile --- ioquake3/Makefile Wed Sep 12 01:18:55 2007 +++ ../new/iourbanterror/Makefile Wed Sep 12 01:14:44 2007 @@ -1,24 +1,28 @@ -# New ports collection makefile for: ioquake3 -# Date created: 3 Jun 2006 +# New ports collection makefile for: iourbanterror +# Date created: 2007-09-10 # Whom: alepulver # -# $FreeBSD: ports/games/ioquake3/Makefile,v 1.8 2007/07/28 12:27:22 miwi Exp $ +# $FreeBSD$ # -PORTNAME= ioquake3 -DISTVERSION= 1.34-rc3 -PORTREVISION= 3 +PORTNAME= iourbanterror +DISTVERSION= 2007_04_02 CATEGORIES= games -MASTER_SITES= http://ioquake3.org/files/ -DISTNAME= ${PORTNAME}_${DISTVERSION} +MASTER_SITES= http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ +DISTNAME= ioUrbanTerrorSource_${DISTVERSION} MAINTAINER= alepulver@FreeBSD.org -COMMENT= Cleaned-up and enhaced version of Quake 3 +COMMENT= Quake 3 engine modified for Urban Terror (based on ioquake3) -USE_BZIP2= yes +RUN_DEPENDS= ${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror + +USE_ZIP= yes USE_GMAKE= yes +WRKSRC= ${WRKDIR}/${DISTNAME:C/_.*//} OPTIONS= CLIENT "Build client" on \ + CURL "Enable curl support" on \ + CURL_DLOPEN "Enable dynamic loading of curl" on \ GAMELIBS "Build game libraries (when not mandatory)" off \ DEDICATED "Build dedicated server" on \ OPENAL "Enable OpenAL (3D sound) support" off \ @@ -54,6 +58,14 @@ .endif .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP) +# curl +. if defined(WITH_CURL) +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl +MAKE_ENV+= USE_CURL=1 +. if defined(WITH_CURL_DLOPEN) +MAKE_ENV+= USE_CURL_DLOPEN=1 +. endif +. endif # OpenAL . if defined(WITH_OPENAL) LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal @@ -84,7 +96,7 @@ .if !defined(WITHOUT_CLIENT) MAKE_ENV+= BUILD_CLIENT=1 PLIST_SUB+= CLIENT="" -Q3BIN+= ioquake3 +Q3BIN+= ioUrbanTerror .else PLIST_SUB+= CLIENT="@comment " .endif @@ -92,7 +104,7 @@ .if !defined(WITHOUT_DEDICATED) MAKE_ENV+= BUILD_SERVER=1 PLIST_SUB+= DEDICATED="" -Q3BIN+= ioq3ded +Q3BIN+= ioUrTded .else PLIST_SUB+= DEDICATED="@comment " .endif @@ -111,15 +123,19 @@ .if !defined(WITHOUT_SMP) MAKE_ENV+= BUILD_CLIENT_SMP=1 PLIST_SUB+= SMP="" -Q3BIN+= ioquake3-smp +Q3BIN+= ioUrbanTerror-smp .else PLIST_SUB+= SMP="@comment " .endif post-patch: # There are new variables in the config files, so keep them in another dir. - @${REINPLACE_CMD} -E 's|/\.q3a|/.${PORTNAME}|' \ + @${REINPLACE_CMD} -E 's|/\.q3a|/.ioUrbanTerror|' \ ${WRKSRC}/code/unix/unix_shared.c +# BattlEye development has stopped, and UT website recommends to disable it, +# also it's binary only, so it won't work anyways. + @${REINPLACE_CMD} -Ee 's|("sv_battleye",) "1"|\1 "0"|' \ + ${WRKSRC}/code/server/sv_init.c do-install: .for bin in ${Q3BIN} @@ -133,7 +149,8 @@ .endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/ioUrbanTerror_README.txt \ + ${WRKSRC}/README ${DOCSDIR} .endif post-install: diff -urNd ioquake3/distinfo ../new/iourbanterror/distinfo --- ioquake3/distinfo Tue Dec 19 12:56:44 2006 +++ ../new/iourbanterror/distinfo Mon Sep 10 14:02:32 2007 @@ -1,3 +1,3 @@ -MD5 (ioquake3_1.34-rc3.tar.bz2) = ed06d79afcb026f58763a89483733823 -SHA256 (ioquake3_1.34-rc3.tar.bz2) = fb43f63178c6700f20b83634b816f77e390e375e7d9c717180c9820f0c541b01 -SIZE (ioquake3_1.34-rc3.tar.bz2) = 3147694 +MD5 (ioUrbanTerrorSource_2007_04_02.zip) = 225988ec27f498d4752a999f48b8dc15 +SHA256 (ioUrbanTerrorSource_2007_04_02.zip) = 4148834471d1dc0e15b895e7323cda9b7f21995a0d3e8928aa9236cfe7784d95 +SIZE (ioUrbanTerrorSource_2007_04_02.zip) = 8691615 diff -urNd ioquake3/files/patch-Makefile ../new/iourbanterror/files/patch-Makefile --- ioquake3/files/patch-Makefile Tue Dec 26 00:23:12 2006 +++ ../new/iourbanterror/files/patch-Makefile Tue Sep 11 17:29:55 2007 @@ -1,14 +1,19 @@ ---- Makefile.orig Tue Nov 28 19:05:39 2006 -+++ Makefile Tue Dec 26 00:19:11 2006 -@@ -26,11 +26,19 @@ +--- Makefile.orig Sun Apr 1 19:55:18 2007 ++++ Makefile Tue Sep 11 17:29:50 2007 +@@ -27,16 +27,21 @@ endif endif --BUILD_CLIENT = --BUILD_CLIENT_SMP = --BUILD_SERVER = --BUILD_GAME_SO = --BUILD_GAME_QVM = +-BUILD_CLIENT =1 +-BUILD_CLIENT_SMP =0 +-BUILD_SERVER =1 +-BUILD_GAME_SO =0 +-BUILD_GAME_QVM =0 +-OPTIMIZE =1 +-USE_SDL =1 +-USE_OPENAL =0 +-USE_CURL =1 +-USE_CODEC_VORBIS =0 +BUILD_CLIENT?=0 +BUILD_CLIENT_SMP?=0 +BUILD_GAME_QVM?=0 @@ -16,6 +21,8 @@ +BUILD_SERVER?=0 +HAVE_VM_COMPILED?=false +USE_CODEC_VORBIS?=0 ++USE_CURL?=0 ++USE_CURL_DLOPEN?=0 +USE_LOCAL_HEADERS?=0 +USE_OPENAL?=0 +USE_OPENAL_DLOPEN?=0 @@ -25,14 +32,10 @@ ############################################################################# # -@@ -88,30 +96,10 @@ +@@ -98,38 +103,10 @@ + USE_SDL=1 endif - export USE_CCACHE --ifndef USE_SDL --USE_SDL=1 --endif -- -ifndef USE_OPENAL -USE_OPENAL=1 -endif @@ -41,6 +44,18 @@ -USE_OPENAL_DLOPEN=0 -endif - +-ifndef USE_CURL +-USE_CURL=1 +-endif +- +-ifndef USE_CURL_DLOPEN +- ifeq ($(PLATFORM),mingw32) +- USE_CURL_DLOPEN=0 +- else +- USE_CURL_DLOPEN=1 +- endif +-endif +- -ifndef USE_CODEC_VORBIS -USE_CODEC_VORBIS=0 -endif @@ -57,7 +72,7 @@ CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer -@@ -444,18 +432,12 @@ +@@ -504,18 +481,12 @@ ifeq ($(PLATFORM),freebsd) @@ -79,7 +94,7 @@ ifeq ($(USE_OPENAL),1) BASE_CFLAGS += -DUSE_OPENAL=1 -@@ -468,47 +450,61 @@ +@@ -528,47 +499,61 @@ BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 endif @@ -110,7 +125,7 @@ - BASE_CFLAGS += -DNO_VM_COMPILED + ifeq ($(USE_SDL_AUDIO),1) + BASE_CFLAGS += -DUSE_SDL_SOUND=1 -+ endif + endif + + ifeq ($(USE_SDL_VIDEO),1) + BASE_CFLAGS += -DUSE_SDL_VIDEO=1 @@ -123,7 +138,7 @@ + RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \ + -fstrength-reduce + endif - endif ++ endif + + ifneq ($(HAVE_VM_COMPILED),true) + BASE_CFLAGS += -DNO_VM_COMPILED @@ -164,7 +179,7 @@ endif endif -@@ -516,7 +512,6 @@ +@@ -576,7 +561,6 @@ CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg endif @@ -172,24 +187,24 @@ else # ifeq freebsd ############################################################################# -@@ -670,24 +665,25 @@ +@@ -731,24 +715,25 @@ TARGETS = ifneq ($(BUILD_SERVER),0) -- TARGETS += $(B)/ioq3ded.$(ARCH)$(BINEXT) -+ TARGETS += $(B)/ioq3ded$(BINEXT) +- TARGETS += $(B)/ioUrTded.$(ARCH)$(BINEXT) ++ TARGETS += $(B)/ioUrTded$(BINEXT) endif ifneq ($(BUILD_CLIENT),0) -- TARGETS += $(B)/ioquake3.$(ARCH)$(BINEXT) +- TARGETS += $(B)/ioUrbanTerror.$(ARCH)$(BINEXT) - ifneq ($(BUILD_CLIENT_SMP),0) -- TARGETS += $(B)/ioquake3-smp.$(ARCH)$(BINEXT) +- TARGETS += $(B)/ioUrbanTerror-smp.$(ARCH)$(BINEXT) - endif -+ TARGETS += $(B)/ioquake3$(BINEXT) ++ TARGETS += $(B)/ioUrbanTerror$(BINEXT) +endif + +ifneq ($(BUILD_CLIENT_SMP),0) -+ TARGETS += $(B)/ioquake3-smp$(BINEXT) ++ TARGETS += $(B)/ioUrbanTerror-smp$(BINEXT) endif ifneq ($(BUILD_GAME_SO),0) @@ -209,7 +224,7 @@ endif ifneq ($(BUILD_GAME_QVM),0) -@@ -749,11 +745,11 @@ +@@ -810,11 +795,11 @@ $(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS) $(DEPEND_CFLAGS)" build_release: B=$(BR) @@ -223,13 +238,18 @@ targets: $(TARGETS) -@@ -964,13 +960,10 @@ - ifeq ($(ARCH),i386) +@@ -1026,16 +1011,16 @@ + endif + + ifeq ($(HAVE_VM_COMPILED),true) +- ifeq ($(ARCH),i386) ++ ifeq ($(ARCH),x86) Q3OBJ += $(B)/client/vm_x86.o endif - ifeq ($(ARCH),x86) -- Q3OBJ += $(B)/client/vm_x86.o -- endif ++ ifeq ($(ARCH),i386) + Q3OBJ += $(B)/client/vm_x86.o + endif - ifeq ($(ARCH),x86_64) + ifeq ($(ARCH),amd64) Q3OBJ += $(B)/client/vm_x86_64.o @@ -239,26 +259,40 @@ Q3OBJ += $(B)/client/$(VM_PPC).o endif endif -@@ -1017,10 +1010,10 @@ +@@ -1071,7 +1056,7 @@ + + ifeq ($(USE_SDL),1) + ifneq ($(PLATFORM),darwin) +- BUILD_CLIENT_SMP = 0 ++ #BUILD_CLIENT_SMP = 0 + endif + endif + +@@ -1084,10 +1069,10 @@ $(B)/client/sdl_glimp_smp.o endif --$(B)/ioquake3.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) -+$(B)/ioquake3$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) +-$(B)/ioUrbanTerror.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) ++$(B)/ioUrbanTerror$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) --$(B)/ioquake3-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) -+$(B)/ioquake3-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) +-$(B)/ioUrbanTerror-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) ++$(B)/ioUrbanTerror-smp$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) -@@ -1317,18 +1310,15 @@ - ifeq ($(ARCH),i386) +@@ -1389,21 +1374,21 @@ + endif + + ifeq ($(HAVE_VM_COMPILED),true) +- ifeq ($(ARCH),i386) ++ ifeq ($(ARCH),x86) Q3DOBJ += $(B)/ded/vm_x86.o endif - ifeq ($(ARCH),x86) -- Q3DOBJ += $(B)/ded/vm_x86.o -- endif ++ ifeq ($(ARCH),i386) + Q3DOBJ += $(B)/ded/vm_x86.o + endif - ifeq ($(ARCH),x86_64) + ifeq ($(ARCH),amd64) Q3DOBJ += $(B)/ded/vm_x86_64.o @@ -269,12 +303,12 @@ endif endif --$(B)/ioq3ded.$(ARCH)$(BINEXT): $(Q3DOBJ) -+$(B)/ioq3ded$(BINEXT): $(Q3DOBJ) +-$(B)/ioUrTded.$(ARCH)$(BINEXT): $(Q3DOBJ) ++$(B)/ioUrTded$(BINEXT): $(Q3DOBJ) $(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) - $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) -@@ -1445,7 +1435,7 @@ + $(B)/ded/sv_battleye.o : $(SDIR)/sv_battleye.c; $(DO_DED_CC) +@@ -1522,7 +1507,7 @@ Q3CGOBJ = $(Q3CGOBJ_) $(B)/baseq3/cgame/cg_syscalls.o Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm @@ -283,7 +317,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(B)/baseq3/vm/cgame.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm -@@ -1486,7 +1476,7 @@ +@@ -1563,7 +1548,7 @@ MPCGOBJ = $(MPCGOBJ_) $(B)/missionpack/cgame/cg_syscalls.o MPCGVMOBJ = $(MPCGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm @@ -292,7 +326,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) $(B)/missionpack/vm/cgame.qvm: $(MPCGVMOBJ) $(CGDIR)/cg_syscalls.asm -@@ -1536,7 +1526,7 @@ +@@ -1613,7 +1598,7 @@ Q3GOBJ = $(Q3GOBJ_) $(B)/baseq3/game/g_syscalls.o Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm @@ -301,7 +335,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(B)/baseq3/vm/qagame.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm -@@ -1584,7 +1574,7 @@ +@@ -1661,7 +1646,7 @@ MPGOBJ = $(MPGOBJ_) $(B)/missionpack/game/g_syscalls.o MPGVMOBJ = $(MPGOBJ_:%.o=%.asm) $(B)/missionpack/game/bg_lib.asm @@ -310,7 +344,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) $(B)/missionpack/vm/qagame.qvm: $(MPGVMOBJ) $(GDIR)/g_syscalls.asm -@@ -1644,7 +1634,7 @@ +@@ -1721,7 +1706,7 @@ Q3UIOBJ = $(Q3UIOBJ_) $(B)/missionpack/ui/ui_syscalls.o Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm @@ -319,7 +353,7 @@ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(B)/baseq3/vm/ui.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm -@@ -1669,7 +1659,7 @@ +@@ -1746,7 +1731,7 @@ MPUIOBJ = $(MPUIOBJ_) $(B)/missionpack/ui/ui_syscalls.o MPUIVMOBJ = $(MPUIOBJ_:%.o=%.asm) $(B)/baseq3/game/bg_lib.asm diff -urNd ioquake3/pkg-descr ../new/iourbanterror/pkg-descr --- ioquake3/pkg-descr Tue Nov 21 17:13:15 2006 +++ ../new/iourbanterror/pkg-descr Wed Sep 12 00:15:37 2007 @@ -1,11 +1,12 @@ -This project, icculus.org/quake3 (sometimes referred to ioquake3, or ioq3 for -short) aims to build upon id Software's Quake 3 source code release. The -source code was released on August 20, 2005 under the GPL. Since then, we have -been cleaning up, fixing bugs, and adding features. Our permanent goal is to -create the open source Quake 3 distribution upon which people base their games -and projects. We also seek to have the perfect version of the engine for -playing Quake 3: Arena, Team Arena, and all popular mods. This distribution of -the engine has been ported to many new platforms and has had a slew of new -features added, along with massive bug extermination. +Urban Terror is a realism based total conversion mod for Quake III Arena which +no longer requires this game to be played. It only uses its engine, which is +open sourced through the GPL and may be distributed freely. Urban Terror plays +in about the same setting as Counter Strike, but is less focused on realism +and plays much faster, which among other things, is caused by the ability to +strafe jump, which combined with wall jumping can lead to very quick movement +and nice jumps. Urban Terror has 7 game modes, 25 maps and 15 weapons. -WWW: http://ioquake3.org/ +This port installs the modified ioquake3 engine for Urban Terror called +ioUrbanTerror, and depends on the data, resulting in a playable game. + +WWW: http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/ diff -urNd ioquake3/pkg-message ../new/iourbanterror/pkg-message --- ioquake3/pkg-message Wed Sep 12 00:07:45 2007 +++ ../new/iourbanterror/pkg-message Wed Sep 12 00:07:01 2007 @@ -7,8 +7,8 @@ option causes the program to omit restoring gamma and mouse sensivity after exitting. -The configuration files are saved to ~/.ioquake3 instead of ~/.q3a because -they have additional variables which would be removed if other engines +The configuration files are saved to ~/.ioUrbanTerror instead of ~/.q3a +because 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. diff -urNd ioquake3/pkg-plist ../new/iourbanterror/pkg-plist --- ioquake3/pkg-plist Tue Sep 11 16:34:53 2007 +++ ../new/iourbanterror/pkg-plist Tue Sep 11 18:30:35 2007 @@ -1,6 +1,6 @@ -%%DEDICATED%%bin/ioq3ded -%%CLIENT%%bin/ioquake3 -%%SMP%%bin/ioquake3-smp +%%DEDICATED%%bin/ioUrTded +%%CLIENT%%bin/ioUrbanTerror +%%SMP%%bin/ioUrbanTerror-smp %%GAMELIBS%%%%LIBDIR%%/baseq3/cgame.so %%GAMELIBS%%%%LIBDIR%%/baseq3/qagame.so %%GAMELIBS%%%%LIBDIR%%/baseq3/ui.so @@ -8,6 +8,7 @@ %%GAMELIBS%%%%LIBDIR%%/missionpack/qagame.so %%GAMELIBS%%%%LIBDIR%%/missionpack/ui.so %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/ioUrbanTerror_README.txt %%GAMELIBS%%@dirrm %%LIBDIR%%/missionpack %%GAMELIBS%%@dirrm %%LIBDIR%%/baseq3 %%GAMELIBS%%@dirrm %%LIBDIR%% --- iourbanterror.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1189571973.91222>