diff options
author | danfe <danfe@FreeBSD.org> | 2011-02-07 18:59:53 +0800 |
---|---|---|
committer | danfe <danfe@FreeBSD.org> | 2011-02-07 18:59:53 +0800 |
commit | db568264815d36d8f4b9fa93d441a66872560cf3 (patch) | |
tree | 9c4efb31d0a8a206feba64df8fb3025b8b6083ae /games | |
parent | d7d0be5ee93c83385f3d5b20a9c09f14b7bcdb2b (diff) | |
download | freebsd-ports-gnome-db568264815d36d8f4b9fa93d441a66872560cf3.tar.gz freebsd-ports-gnome-db568264815d36d8f4b9fa93d441a66872560cf3.tar.zst freebsd-ports-gnome-db568264815d36d8f4b9fa93d441a66872560cf3.zip |
- Update Warsow game and data ports to version 0.6
- Clean up distfile mirror list (via distilator)
- Add LICENSE (GPLv2, applies to game engine only)
- Add NO_PACKAGE to data port as its size is 550MB now
Feature safe: yes
Diffstat (limited to 'games')
-rw-r--r-- | games/warsow-data/Makefile | 17 | ||||
-rw-r--r-- | games/warsow-data/distinfo | 6 | ||||
-rw-r--r-- | games/warsow-data/pkg-descr | 2 | ||||
-rw-r--r-- | games/warsow-data/pkg-plist | 36 | ||||
-rw-r--r-- | games/warsow/Makefile | 26 | ||||
-rw-r--r-- | games/warsow/distinfo | 5 | ||||
-rw-r--r-- | games/warsow/files/patch-Makefile | 31 | ||||
-rw-r--r-- | games/warsow/files/patch-snd_openal_snd_main.c | 11 |
8 files changed, 63 insertions, 71 deletions
diff --git a/games/warsow-data/Makefile b/games/warsow-data/Makefile index 5dc579250d13..499d40918c11 100644 --- a/games/warsow-data/Makefile +++ b/games/warsow-data/Makefile @@ -6,14 +6,14 @@ # PORTNAME= data -PORTVERSION= 0.5 +PORTVERSION= 0.6 CATEGORIES= games -MASTER_SITES= http://woe.crying-wolves.net/ \ +MASTER_SITES= http://www.zcdn.org/dl/ \ http://www.derchris.eu/warsow/ \ - http://warsow.hangy.de/ \ - http://static.warsow.net/release/ \ - http://rewq.de/scratch/wsw05/ \ - http://weseo.de/downloads/ + http://www.derchris.eu/warsow/:mappack \ + http://static.warsow.net/release/:mappack \ + http://rewq.de/scratch/wsw05/:mappack \ + http://weseo.de/downloads/:mappack PKGNAMEPREFIX= warsow- DISTNAME= ${PKGNAMEPREFIX:S/-//}_${PORTVERSION}_unified DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -22,6 +22,9 @@ DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//} MAINTAINER= acm@FreeBSD.org COMMENT= Warsow data files +# Package size below is for default set of OPTIONS +NO_PACKAGE= Package will be 550MB, set FORCE_PACKAGE if you really want it + ONLY_FOR_ARCHS= i386 amd64 USE_ZIP= yes @@ -40,7 +43,7 @@ OPTIONS= MAPPACK "Install community map pack" on .include <bsd.port.options.mk> .if defined(WITH_MAPPACK) -DISTFILES+= warsow_comunity_map_pack_01${EXTRACT_SUFX} +DISTFILES+= warsow_comunity_map_pack_01${EXTRACT_SUFX}:mappack PLIST_SUB+= MAPPACK="" .else PLIST_SUB+= MAPPACK="@comment " diff --git a/games/warsow-data/distinfo b/games/warsow-data/distinfo index 5c332487e449..5e4e7a5de173 100644 --- a/games/warsow-data/distinfo +++ b/games/warsow-data/distinfo @@ -1,6 +1,4 @@ -MD5 (warsow/warsow_0.5_unified.zip) = d0cb961256bbc1b93bf240b8bcf8eff5 -SHA256 (warsow/warsow_0.5_unified.zip) = 66ac784277def8d90a8368d44e7ca72cd1d3a50b63cee4ad7c3e102cf16f5100 -SIZE (warsow/warsow_0.5_unified.zip) = 256768515 -MD5 (warsow/warsow_comunity_map_pack_01.zip) = acee1ef5da9dec69ec87d45f3d73a6eb +SHA256 (warsow/warsow_0.6_unified.zip) = 43f389e97df976f3dd13832922537bb3f1735f0335b51602c9db1bc4e7018428 +SIZE (warsow/warsow_0.6_unified.zip) = 450797008 SHA256 (warsow/warsow_comunity_map_pack_01.zip) = 58b84b10d5fbaa22e29d59194b8c5ebbc633356fbc6545a715e44a73bdd3c7e7 SIZE (warsow/warsow_comunity_map_pack_01.zip) = 130057143 diff --git a/games/warsow-data/pkg-descr b/games/warsow-data/pkg-descr index bab52a0bfbef..e512e606e012 100644 --- a/games/warsow-data/pkg-descr +++ b/games/warsow-data/pkg-descr @@ -1,5 +1,3 @@ -Warsow game data files. - This port installs data files needed to run Warsow, a free multiplayer first person shooter with cartoonish graphics based on Qfusion (a cool improvement over the Quake II engine). diff --git a/games/warsow-data/pkg-plist b/games/warsow-data/pkg-plist index ab706471f612..9dc501fc85f7 100644 --- a/games/warsow-data/pkg-plist +++ b/games/warsow-data/pkg-plist @@ -2,6 +2,7 @@ %%DATADIR%%/basewsw/configs/server/gametypes/bomb.cfg %%DATADIR%%/basewsw/configs/server/gametypes/ca.cfg %%DATADIR%%/basewsw/configs/server/gametypes/ctf.cfg +%%DATADIR%%/basewsw/configs/server/gametypes/ctftactics.cfg %%DATADIR%%/basewsw/configs/server/gametypes/da.cfg %%DATADIR%%/basewsw/configs/server/gametypes/dm.cfg %%DATADIR%%/basewsw/configs/server/gametypes/duel.cfg @@ -42,15 +43,17 @@ %%DATADIR%%/basewsw/configs/timer/ya2/3x.cfg %%DATADIR%%/basewsw/configs/timer/ya2/4x.cfg %%DATADIR%%/basewsw/configs/timer/ya2/5x.cfg -%%DATADIR%%/basewsw/custominfoparms.txt -%%DATADIR%%/basewsw/data0_05.pk3 -%%DATADIR%%/basewsw/data0_05pure.pk3 +%%DATADIR%%/basewsw/data0_06.pk3 +%%DATADIR%%/basewsw/data0_06pure.pk3 %%DATADIR%%/basewsw/dedicated_autoexec.cfg %%DATADIR%%/basewsw/editortextures.pk3 %%DATADIR%%/basewsw/map_wamphi1.pk3 %%DATADIR%%/basewsw/map_wamphi2.pk3 %%DATADIR%%/basewsw/map_wbomb1.pk3 %%DATADIR%%/basewsw/map_wbomb2.pk3 +%%DATADIR%%/basewsw/map_wbomb3.pk3 +%%DATADIR%%/basewsw/map_wbomb4.pk3 +%%DATADIR%%/basewsw/map_wbomb5.pk3 %%DATADIR%%/basewsw/map_wca1.pk3 %%DATADIR%%/basewsw/map_wca2.pk3 %%DATADIR%%/basewsw/map_wca3.pk3 @@ -60,6 +63,10 @@ %%DATADIR%%/basewsw/map_wctf4.pk3 %%DATADIR%%/basewsw/map_wctf5.pk3 %%DATADIR%%/basewsw/map_wctf6.pk3 +%%DATADIR%%/basewsw/map_wda1.pk3 +%%DATADIR%%/basewsw/map_wda2.pk3 +%%DATADIR%%/basewsw/map_wda3.pk3 +%%DATADIR%%/basewsw/map_wda4.pk3 %%DATADIR%%/basewsw/map_wdm1.pk3 %%DATADIR%%/basewsw/map_wdm10.pk3 %%DATADIR%%/basewsw/map_wdm11.pk3 @@ -67,8 +74,6 @@ %%DATADIR%%/basewsw/map_wdm13.pk3 %%DATADIR%%/basewsw/map_wdm14.pk3 %%DATADIR%%/basewsw/map_wdm15.pk3 -%%DATADIR%%/basewsw/map_wdm16.pk3 -%%DATADIR%%/basewsw/map_wdm17.pk3 %%DATADIR%%/basewsw/map_wdm18.pk3 %%DATADIR%%/basewsw/map_wdm19.pk3 %%DATADIR%%/basewsw/map_wdm2.pk3 @@ -80,32 +85,43 @@ %%DATADIR%%/basewsw/map_wdm7.pk3 %%DATADIR%%/basewsw/map_wdm8.pk3 %%DATADIR%%/basewsw/map_wdm9.pk3 -%%DATADIR%%/basewsw/mm_pubkey.txt %%DATADIR%%/basewsw/models_nate.pk3 -%%DATADIR%%/basewsw/modules_05.pk3 +%%DATADIR%%/basewsw/modules_06.pk3 %%DATADIR%%/basewsw/tex_36.pk3 %%DATADIR%%/basewsw/tex_baxandall.pk3 %%DATADIR%%/basewsw/tex_billboard.pk3 %%DATADIR%%/basewsw/tex_blx.pk3 %%DATADIR%%/basewsw/tex_blxbis.pk3 +%%DATADIR%%/basewsw/tex_bricks.pk3 %%DATADIR%%/basewsw/tex_cha0swsw.pk3 -%%DATADIR%%/basewsw/tex_ecel.pk3 +%%DATADIR%%/basewsw/tex_cleansurface.pk3 +%%DATADIR%%/basewsw/tex_concrete.pk3 +%%DATADIR%%/basewsw/tex_decals.pk3 +%%DATADIR%%/basewsw/tex_env1.pk3 %%DATADIR%%/basewsw/tex_etr.pk3 %%DATADIR%%/basewsw/tex_exwsw.pk3 %%DATADIR%%/basewsw/tex_factory.pk3 -%%DATADIR%%/basewsw/tex_fakeads.pk3 %%DATADIR%%/basewsw/tex_format.pk3 +%%DATADIR%%/basewsw/tex_glass.pk3 +%%DATADIR%%/basewsw/tex_grates.pk3 %%DATADIR%%/basewsw/tex_hazelh.pk3 %%DATADIR%%/basewsw/tex_hexagons.pk3 %%DATADIR%%/basewsw/tex_jewels.pk3 +%%DATADIR%%/basewsw/tex_lights.pk3 %%DATADIR%%/basewsw/tex_melee.pk3 +%%DATADIR%%/basewsw/tex_metal.pk3 %%DATADIR%%/basewsw/tex_nature.pk3 +%%DATADIR%%/basewsw/tex_neon.pk3 +%%DATADIR%%/basewsw/tex_plastic.pk3 %%DATADIR%%/basewsw/tex_refly.pk3 %%DATADIR%%/basewsw/tex_russus.pk3 +%%DATADIR%%/basewsw/tex_sky.pk3 %%DATADIR%%/basewsw/tex_solidfake.pk3 %%DATADIR%%/basewsw/tex_supersymmetry.pk3 %%DATADIR%%/basewsw/tex_terrain.pk3 -%%DATADIR%%/basewsw/tex_wsw_adverts.pk3 +%%DATADIR%%/basewsw/tex_tiles.pk3 +%%DATADIR%%/basewsw/tex_window.pk3 +%%DATADIR%%/basewsw/tex_wood.pk3 %%DATADIR%%/basewsw/tex_wsw_cave1.pk3 %%DATADIR%%/basewsw/tex_wsw_city1.pk3 %%DATADIR%%/basewsw/tex_wsw_flareshalos.pk3 diff --git a/games/warsow/Makefile b/games/warsow/Makefile index f3637c205631..8972e8ffc32f 100644 --- a/games/warsow/Makefile +++ b/games/warsow/Makefile @@ -6,23 +6,20 @@ # PORTNAME= warsow -PORTVERSION= 0.5 -PORTREVISION= 4 +PORTVERSION= 0.6 CATEGORIES= games -MASTER_SITES= http://woe.crying-wolves.net/ \ - http://www.derchris.eu/warsow/ \ - http://warsow.hangy.de/ \ - http://static.warsow.net/release/ \ - http://rewq.de/scratch/wsw05/ \ - http://weseo.de/downloads/ +MASTER_SITES= http://www.zcdn.org/dl/ \ + http://www.derchris.eu/warsow/ DISTNAME= ${PORTNAME}_${PORTVERSION}_sdk DIST_SUBDIR= ${PORTNAME} MAINTAINER= danfe@FreeBSD.org COMMENT= A fast paced first person shooter game +LICENSE= GPLv2 + LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl -RUN_DEPENDS= ${DATADIR}/basewsw/data0_05.pk3:${PORTSDIR}/games/warsow-data +RUN_DEPENDS= ${DATADIR}/basewsw/data0_06.pk3:${PORTSDIR}/games/warsow-data ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes @@ -30,7 +27,6 @@ USE_ZIP= yes WRKSRC= ${WRKDIR}/source ALL_TARGET= game -MAKE_ARGS= PTHREAD_LIBS="${PTHREAD_LIBS}" RELEASEDIR= ${WRKSRC}/release WSWSUBDIR= basewsw @@ -117,17 +113,17 @@ post-patch: .SILENT # so allows us not to install any wrapper scripts. ${REINPLACE_CMD} -e 's|path", "\.|path", "${DATADIR}|' \ ${WRKSRC}/qcommon/files.c -# FreeBSD does not use stupid `64' suffix for 64-bit readdir(3) - ${REINPLACE_CMD} -e 's/FILE64_SOURCE)/& || defined(__FreeBSD__)/' \ - ${WRKSRC}/unix/unix_fs.c # Adjust architecture names, get rid of ``freebsd_'' prefix ${REINPLACE_CMD} -e 's/x86_64/amd64/ ; s/freebsd_//' \ ${WRKSRC}/gameshared/q_arch.h # Resolve name collision with jpeg-8 ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \ ${WRKSRC}/ref_gl/r_image.c - - +# Add missing #include's + ${REINPLACE_CMD} -e '24s|^|#include <sys/socket.h>|' \ + ${WRKSRC}/qcommon/net.c + ${REINPLACE_CMD} -e '19s|^|#include <stdint.h>|' \ + ${WRKSRC}/unix/unix_xpm.c do-install: .for b in ${WSWBIN} diff --git a/games/warsow/distinfo b/games/warsow/distinfo index 86ea789ccf48..542ddf178b1d 100644 --- a/games/warsow/distinfo +++ b/games/warsow/distinfo @@ -1,3 +1,2 @@ -MD5 (warsow/warsow_0.5_sdk.zip) = acd0244435cc63967b0eb3468c21c454 -SHA256 (warsow/warsow_0.5_sdk.zip) = 35cc937b4b38659df803d84f6b3fd6e9d5a5480ecadb4b642d991b99e3401f05 -SIZE (warsow/warsow_0.5_sdk.zip) = 34213675 +SHA256 (warsow/warsow_0.6_sdk.zip) = d88e5ee2dc1b2bd81fd1f5787b6f09aae76348cec638c1a8262072e214c93ad7 +SIZE (warsow/warsow_0.6_sdk.zip) = 36597211 diff --git a/games/warsow/files/patch-Makefile b/games/warsow/files/patch-Makefile index 1df4f1a2be90..90573fbbb6dc 100644 --- a/games/warsow/files/patch-Makefile +++ b/games/warsow/files/patch-Makefile @@ -1,38 +1,28 @@ --- Makefile.orig +++ Makefile -@@ -51,19 +51,12 @@ - #CC=gcc - #LD=gcc +@@ -48,20 +48,12 @@ else --CC?=gcc + CC?=gcc + CXX?=g++ -LD=gcc -+CC?=cc +LD=$(CC) + AR=ar + RANLIB=ranlib -# this nice line comes from the linux kernel makefile -BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/) -+ARCH=$(shell uname -m) OS=$(shell uname) -ifeq ($(OS),FreeBSD) --ARCH=freebsd_$(BASE_ARCH) +-ARCH?=freebsd_$(BASE_ARCH) -else --ARCH=$(BASE_ARCH) +-ARCH?=$(BASE_ARCH) -endif - SHARED_LIBRARY_EXTENSION=so endif -@@ -161,7 +154,7 @@ - LIB=lib - endif - --LDFLAGS_CLIENT=-ljpeg -lz -L$(X11BASE)/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lXinerama $(shell curl-config --libs) -+LDFLAGS_CLIENT=-ljpeg -lz -L$(X11BASE)/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lXinerama $(shell curl-config --libs) $(PTHREAD_LIBS) - LDFLAGS_DED=-lz $(shell curl-config --libs) - LDFLAGS_MODULE=-shared - LDFLAGS_TV_SERVER=-lz -@@ -217,10 +210,8 @@ +@@ -252,12 +244,9 @@ ###################################################################################################### # Helper functions ###################################################################################################### @@ -40,8 +30,11 @@ - $(CC) $(CFLAGS_COMMON) -c $< -o $@ -DO_CXX=echo " > Compiling (c++) $<" && \ - $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ +-DO_RES=echo " > Compiling resource $<" && \ +- $(RES) $(RESFLAGS_COMMON) -i $< -o $@ +DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@ +DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@ - ++DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@ DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT) + DO_CC_DED=$(DO_CC) $(CFLAGS_DED) diff --git a/games/warsow/files/patch-snd_openal_snd_main.c b/games/warsow/files/patch-snd_openal_snd_main.c deleted file mode 100644 index 84c1d6ed71b6..000000000000 --- a/games/warsow/files/patch-snd_openal_snd_main.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ./snd_openal/snd_main.c.orig 2009-12-26 19:07:05.000000000 +0100 -+++ ./snd_openal/snd_main.c 2009-12-26 19:07:13.000000000 +0100 -@@ -231,7 +231,7 @@ - #define ALDRIVER "/System/Library/Frameworks/OpenAL.framework/OpenAL" - #define ALDEVICE_DEFAULT NULL - #else --#define ALDRIVER "libopenal.so.0" -+#define ALDRIVER "libopenal.so" - #define ALDEVICE_DEFAULT NULL - #endif - |