Date: Sat, 5 Aug 2006 13:59:01 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/101407: PATCH] games/warsow: integrate with games/warsow-data Message-ID: <200608051359.k75Dx1Xa050022@www.freebsd.org> Resent-Message-ID: <200608051400.k75E0Xxq051664@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101407 >Category: ports >Synopsis: PATCH] games/warsow: integrate with games/warsow-data >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 05 14:00:33 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jose Alonso Cardenas Marquez >Release: FreeBSD 6.1-STABLE i386 >Organization: BSDPeru ( http://www.bsd.org.pe ) >Environment: FreeBSD HellFire.BSD.org.pe 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed Jun 21 19:12:29 PET 2006 >Description: - Integrate with games/warsow-data. This is shared with games/linux-warsow Added file(s): - files/warsow-wrapper.in - files/wsw_server-wrapper.in >How-To-Repeat: >Fix: --- warsow-0.12_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/games/warsow/Makefile /usr/ports/games/warsow-new/Makefile --- /usr/ports/games/warsow/Makefile Thu Jun 29 17:06:42 2006 ++ + /usr/ports/games/warsow-new/Makefile Fri Aug 4 05:44:28 2006 @@ -7,29 +7,29 @@ PORTNAME= warsow PORTVERSION= 0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://warsow.aditsystems.com/ \ http://ftp.club-internet.fr/pub/games/nofrag/warsow/ \ http://wsw.surreal-xenotronic.com/ DISTNAME= ${PORTNAME}_${PORTVERSION}_sdk -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${PORTNAME}_${PORTVERSION}_linux.tar.gz DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= danfe@FreeBSD.org COMMENT= A fast paced first person shooter game +RUN_DEPENDS= ${DATADIR}/basewsw/data0.pk3: ${PORTSDIR}/games/warsow-data + +ONLY_FOR_ARCHS= i386 am64 USE_GMAKE= yes USE_GCC= 3.3+ USE_ZIP= yes USE_DOS2UNIX= linux/in_x11.c linux/sys_linux.c -ALL_TARGET= game +SUB_FILES= warsow-wrapper wsw_server-wrapper WRKSRC= ${WRKDIR}/source/source012 +ALL_TARGET= game RELEASEDIR= ${WRKSRC}/release -DATADIR= ${PREFIX}/lib/${PORTNAME} OPTIONS= CLIENT "Build client executable" on \ SERVER "Build dedicated server executable" on @@ -40,6 +40,14 @@ IGNORE= requires at least one of CLIENT and SERVER options .endif +.if ${ARCH} == "i386" +ARCHSUFFIX= "_i386" +PLIST_SUB+= ARCHSUFFIX=${ARCHSUFFIX} +.elif ${ARCH} == "amd64" +ARCHSUFFIX= "_x86_64" +PLIST_SUB+= ARCHSUFFIX=${ARCHSUFFIX} +.endif + .if !defined(WITHOUT_CLIENT) LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \ jpeg.9:${PORTSDIR}/graphics/jpeg @@ -62,26 +70,19 @@ post-patch: .SILENT ${REINPLACE_CMD} -e 's#@$$(DO_CC#$$(DO_CC#; \ - s#_$$(ARCH)##; s#-O2 ##' ${WRKSRC}/Makefile + s#-O2 ##' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's#path", "\.#path", "${DATADIR}#; \ s#dir", "0#dir", "1#' ${WRKSRC}/qcommon/files.c ${REINPLACE_CMD} -e 's#Linux#FreeBSD#' ${WRKSRC}/game/q_shared.h do-install: + @${MKDIR} ${PREFIX}/lib/${PORTNAME} .for bin in ${WSBIN} - ${INSTALL_PROGRAM} ${RELEASEDIR}/${bin} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${RELEASEDIR}/${bin} ${PREFIX}/lib/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/${bin}-wrapper ${PREFIX}/bin/${bin} .endfor @${MKDIR} ${DATADIR}/basewsw ${INSTALL_PROGRAM} ${RELEASEDIR}/basewsw/*.so ${DATADIR}/basewsw - @${TAR} xzvf ${_DISTDIR}/${PORTNAME}_${PORTVERSION} _linux.tar.gz \ - -C ${PREFIX}/lib warsow/basewsw/cfgs warsow/basewsw/huds \ - warsow/basewsw/dedicated_autoexec.cfg \ - warsow/basewsw/\*.pk3 && ${CHOWN} -R root:wheel ${DATADIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${TAR} xzvf ${_DISTDIR}/${PORTNAME}_${PORTVERSION} _linux.tar.gz \ - -C ${WRKDIR} warsow/docs && ${CP} -R ${WRKDIR}/warsow/docs/ \ - ${DOCSDIR} && ${CHMOD} -R 777 ${WRKDIR}/warsow -.endif + ${LN} -s ${DATADIR}/* ${PREFIX}/lib/${PORTNAME} .include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/games/warsow/files/patch-Makefile /usr/ports/games/warsow-new/files/patch-Makefile --- /usr/ports/games/warsow/files/patch-Makefile Thu Jun 29 17:06:42 2006 ++ + /usr/ports/games/warsow-new/files/patch-Makefile Fri Aug 4 05:21:24 2006 @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Jun 27 21:28:20 2006 -+++ Makefile Tue Jun 27 21:32:49 2006 +--- Makefile Thu Jun 8 22:44:02 2006 ++++ Makefile Fri Aug 4 05:20:47 2006 @@ -26,7 +26,7 @@ CFLAGS_DED=-DDEDICATED_ONLY -DC_ONLY CFLAGS_MODULE=-fPIC @@ -9,18 +9,49 @@ ifeq ($(ARCH),x86_64) LIB=lib64 -@@ -53,8 +53,8 @@ +@@ -53,8 +53,14 @@ ARCH=$(BASE_ARCH) endif -SERVER_EXE=wsw_server.$(ARCH) -CLIENT_EXE=warsow.$(ARCH) ++ifeq ($(BASE_ARCH),i386) ++ARCHSUFFIX=i386 ++else ++ARCHSUFFIX=x86_64 ++endif ++ +SERVER_EXE=wsw_server +CLIENT_EXE=warsow ###################################################################################################### # Helper functions -@@ -220,29 +220,29 @@ +@@ -196,21 +202,21 @@ + @echo "> * Building cgame" + @echo "> *********************************************************" + compile-cgame: $(OBJS_CGAME) +-link-cgame: $(BINDIR)/basewsw $(BINDIR)/basewsw/cgame_$(ARCH).so ++link-cgame: $(BINDIR)/basewsw $(BINDIR)/basewsw/cgame_$(ARCHSUFFIX).so + + message-game: + @echo "> *********************************************************" + @echo "> * Building game" + @echo "> *********************************************************" + compile-game: $(OBJS_GAME) +-link-game: $(BINDIR)/basewsw $(BINDIR)/basewsw/game_$(ARCH).so ++link-game: $(BINDIR)/basewsw $(BINDIR)/basewsw/game_$(ARCHSUFFIX).so + + message-ui: + @echo "> *********************************************************" + @echo "> * Building ui" + @echo "> *********************************************************" + compile-ui: $(OBJS_UI) +-link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).so ++link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCHSUFFIX).so + + + ###################################################################################################### +@@ -220,29 +226,29 @@ # DED ######## $(BINDIR)/$(SERVER_EXE): $(OBJS_DED) @@ -39,18 +70,21 @@ ######## # .SO ######## - $(BINDIR)/basewsw/cgame_$(ARCH).so: $(OBJS_CGAME) +-$(BINDIR)/basewsw/cgame_$(ARCH).so: $(OBJS_CGAME) - @echo " > Linking $@" && \ ++$(BINDIR)/basewsw/cgame_$(ARCHSUFFIX).so: $(OBJS_CGAME) + echo " > Linking $@" && \ $(CC) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) - $(BINDIR)/basewsw/game_$(ARCH).so: $(OBJS_GAME) +-$(BINDIR)/basewsw/game_$(ARCH).so: $(OBJS_GAME) - @echo " > Linking $@" && \ ++$(BINDIR)/basewsw/game_$(ARCHSUFFIX).so: $(OBJS_GAME) + echo " > Linking $@" && \ $(CC) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) - $(BINDIR)/basewsw/ui_$(ARCH).so: $(OBJS_UI) +-$(BINDIR)/basewsw/ui_$(ARCH).so: $(OBJS_UI) - @echo " > Linking $@" && \ ++$(BINDIR)/basewsw/ui_$(ARCHSUFFIX).so: $(OBJS_UI) + echo " > Linking $@" && \ $(CC) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) diff -ruN --exclude=CVS /usr/ports/games/warsow/files/warsow-wrapper.in /usr/ports/games/warsow-new/files/warsow-wrapper.in --- /usr/ports/games/warsow/files/warsow-wrapper.in Wed Dec 31 19:00:00 1969 ++ + /usr/ports/games/warsow-new/files/warsow-wrapper.in Fri Aug 4 05:40:05 2006 @@ -0,0 +1,4 @@ +#!/bin/sh + +cd %%PREFIX%%/lib/warsow || exit 1 +exec ./warsow "$@" diff -ruN --exclude=CVS /usr/ports/games/warsow/files/wsw_server-wrapper.in /usr/ports/games/warsow-new/files/wsw_server-wrapper.in --- /usr/ports/games/warsow/files/wsw_server-wrapper.in Wed Dec 31 19:00:00 1969 ++ + /usr/ports/games/warsow-new/files/wsw_server-wrapper.in Fri Aug 4 05:40:23 2006 @@ -0,0 +1,4 @@ +#!/bin/sh + +cd %%PREFIX%%/lib/warsow || exit 1 +exec ./wsw_server "$@" diff -ruN --exclude=CVS /usr/ports/games/warsow/pkg-plist /usr/ports/games/warsow-new/pkg-plist --- /usr/ports/games/warsow/pkg-plist Thu Jun 29 17:06:42 2006 ++ + /usr/ports/games/warsow-new/pkg-plist Fri Aug 4 05:47:53 2006 @@ -1,131 +1,11 @@ %%CLIENT%%bin/warsow %%SERVER%%bin/wsw_server -%%CLIENT%%%%DATADIR%%/basewsw/cgame.so -%%DATADIR%%/basewsw/game.so -%%CLIENT%%%%DATADIR%%/basewsw/ui.so -%%DATADIR%%/basewsw/data0.pk3 -%%DATADIR%%/basewsw/data0fix1.pk3 -%%DATADIR%%/basewsw/data0fix2.pk3 -%%DATADIR%%/basewsw/map_wctf1.pk3 -%%DATADIR%%/basewsw/map_wdm1.pk3 -%%DATADIR%%/basewsw/map_wdm2.pk3 -%%DATADIR%%/basewsw/map_wdm5.pk3 -%%DATADIR%%/basewsw/map_wmid1.pk3 -%%DATADIR%%/basewsw/map_wmid2.pk3 -%%DATADIR%%/basewsw/map_wmid3.pk3 -%%DATADIR%%/basewsw/map_wtest1.pk3 -%%DATADIR%%/basewsw/map_wtest3.pk3 -%%DATADIR%%/basewsw/map_wtest4.pk3 -%%DATADIR%%/basewsw/cfgs/Medar.cfg -%%DATADIR%%/basewsw/cfgs/pb.cfg -%%DATADIR%%/basewsw/cfgs/nip.cfg -%%DATADIR%%/basewsw/cfgs/jal.cfg -%%DATADIR%%/basewsw/cfgs/dedicated_ffa.cfg -%%DATADIR%%/basewsw/cfgs/dedicated_ctf.cfg -%%DATADIR%%/basewsw/cfgs/ekse.cfg -%%DATADIR%%/basewsw/cfgs/ETR.cfg -%%DATADIR%%/basewsw/cfgs/dedicated_tdm_ctf.cfg -%%DATADIR%%/basewsw/cfgs/dedicated_allaround.cfg -%%DATADIR%%/basewsw/cfgs/dedicated_duel_quad.cfg -%%DATADIR%%/basewsw/cfgs/chas.cfg -%%DATADIR%%/basewsw/cfgs/dedicated_tdm.cfg -%%DATADIR%%/basewsw/cfgs/dedicated_duel.cfg -%%DATADIR%%/basewsw/cfgs/dedicated_quad.cfg -@dirrm %%DATADIR%%/basewsw/cfgs -%%DATADIR%%/basewsw/huds/inc/nip/speed_right_small.hud -%%DATADIR%%/basewsw/huds/inc/nip/health_numbers.hud -%%DATADIR%%/basewsw/huds/inc/nip/team_info.hud -%%DATADIR%%/basewsw/huds/inc/nip/selected_weapon.hud -%%DATADIR%%/basewsw/huds/inc/nip/pointing_middle.hud -%%DATADIR%%/basewsw/huds/inc/nip/selected_item.hud -%%DATADIR%%/basewsw/huds/inc/nip/race_timer.hud -%%DATADIR%%/basewsw/huds/inc/nip/armor_numbers.hud -%%DATADIR%%/basewsw/huds/inc/nip/fps_right_small.hud -%%DATADIR%%/basewsw/huds/inc/nip/frag_counter.hud -%%DATADIR%%/basewsw/huds/inc/nip/powerup_item.hud -%%DATADIR%%/basewsw/huds/inc/nip/picked_up_item.hud -%%DATADIR%%/basewsw/huds/inc/nip/clock_right_mid.hud -%%DATADIR%%/basewsw/huds/inc/nip/ammo.hud -%%DATADIR%%/basewsw/huds/inc/nip/help_message_center.hud -%%DATADIR%%/basewsw/huds/inc/nip/weaponlist_up.hud -%%DATADIR%%/basewsw/huds/inc/nip/crosshair.hud -%%DATADIR%%/basewsw/huds/inc/nip/chasing_top.hud -@dirrm %%DATADIR%%/basewsw/huds/inc/nip -%%DATADIR%%/basewsw/huds/inc/1oooK/speed_right_small.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/health_numbers.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/clock_right_mid.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/team_info.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/armor_bar.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/selected_item.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/chasing_left.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/armor_numbers.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/health_bar.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/weaponlist_down.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/crosshair.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/fps_right_small.hud -%%DATADIR%%/basewsw/huds/inc/1oooK/frag_counter.hud -@dirrm %%DATADIR%%/basewsw/huds/inc/1oooK -%%DATADIR%%/basewsw/huds/inc/health_numbers.hud -%%DATADIR%%/basewsw/huds/inc/selected_weapon.hud -%%DATADIR%%/basewsw/huds/inc/team_info.hud -%%DATADIR%%/basewsw/huds/inc/pointing_middle.hud -%%DATADIR%%/basewsw/huds/inc/health_pic_bar2.hud -%%DATADIR%%/basewsw/huds/inc/selected_item.hud -%%DATADIR%%/basewsw/huds/inc/ETR/health_numbers.hud -%%DATADIR%%/basewsw/huds/inc/ETR/picked_up_item.hud -%%DATADIR%%/basewsw/huds/inc/ETR/team_info.hud -%%DATADIR%%/basewsw/huds/inc/ETR/speed_mid_mid.hud -%%DATADIR%%/basewsw/huds/inc/ETR/clock_mid_big.hud -%%DATADIR%%/basewsw/huds/inc/ETR/pointing_middle.hud -%%DATADIR%%/basewsw/huds/inc/ETR/chasing_left.hud -%%DATADIR%%/basewsw/huds/inc/ETR/armor_numbers.hud -%%DATADIR%%/basewsw/huds/inc/ETR/weaponlist_down.hud -%%DATADIR%%/basewsw/huds/inc/ETR/fps_right_small.hud -%%DATADIR%%/basewsw/huds/inc/ETR/crosshair.hud -%%DATADIR%%/basewsw/huds/inc/ETR/frag_counter.hud -%%DATADIR%%/basewsw/huds/inc/ETR/scores.hud -@dirrm %%DATADIR%%/basewsw/huds/inc/ETR -%%DATADIR%%/basewsw/huds/inc/net.hud -%%DATADIR%%/basewsw/huds/inc/race_timer.hud -%%DATADIR%%/basewsw/huds/inc/clock_right_small.hud -%%DATADIR%%/basewsw/huds/inc/armor_numbers.hud -%%DATADIR%%/basewsw/huds/inc/weaponlist_down.hud -%%DATADIR%%/basewsw/huds/inc/fps_right_small.hud -%%DATADIR%%/basewsw/huds/inc/powerup_item.hud -%%DATADIR%%/basewsw/huds/inc/speed_right_small.hud -%%DATADIR%%/basewsw/huds/inc/picked_up_item.hud -%%DATADIR%%/basewsw/huds/inc/clock_right_mid.hud -%%DATADIR%%/basewsw/huds/inc/armor_pic_bar2.hud -%%DATADIR%%/basewsw/huds/inc/weaponlist_right.hud -%%DATADIR%%/basewsw/huds/inc/health_pic_bar.hud -%%DATADIR%%/basewsw/huds/inc/armor_pic_bar.hud -%%DATADIR%%/basewsw/huds/inc/chasing_left.hud -%%DATADIR%%/basewsw/huds/inc/ammo.hud -%%DATADIR%%/basewsw/huds/inc/crosshair.hud -%%DATADIR%%/basewsw/huds/inc/help_message_center.hud -%%DATADIR%%/basewsw/huds/inc/scores.hud -%%DATADIR%%/basewsw/huds/inc/weaponlist_left.hud -@dirrm %%DATADIR%%/basewsw/huds/inc -%%DATADIR%%/basewsw/huds/default.hud -%%DATADIR%%/basewsw/huds/nip.hud -%%DATADIR%%/basewsw/huds/1oooK.hud -%%DATADIR%%/basewsw/huds/hud_left.hud -%%DATADIR%%/basewsw/huds/ETR.hud -%%DATADIR%%/basewsw/huds/hud_right.hud -@dirrm %%DATADIR%%/basewsw/huds -%%DATADIR%%/basewsw/dedicated_autoexec.cfg -@dirrm %%DATADIR%%/basewsw -@dirrm %%DATADIR%% -%%PORTDOCS%%%%DOCSDIR%%/Shader_Manual.rtf -%%PORTDOCS%%%%DOCSDIR%%/bots_navigation.txt -%%PORTDOCS%%%%DOCSDIR%%/changelog.txt -%%PORTDOCS%%%%DOCSDIR%%/contact.txt -%%PORTDOCS%%%%DOCSDIR%%/dedicated_server_quide.txt -%%PORTDOCS%%%%DOCSDIR%%/demoavi.txt -%%PORTDOCS%%%%DOCSDIR%%/gnu.txt -%%PORTDOCS%%%%DOCSDIR%%/huds.txt -%%PORTDOCS%%%%DOCSDIR%%/linux_sound_sdl.txt -%%PORTDOCS%%%%DOCSDIR%%/new_features.txt -%%PORTDOCS%%%%DOCSDIR%%/old_changelog.txt -%%PORTDOCS%%%%DOCSDIR%%/query_protocols.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%CLIENT%%lib/warsow/warsow +%%SERVER%%lib/warsow/wsw_server +%%CLIENT%%%%DATADIR%%/basewsw/cgame%%ARCHSUFFIX%%.so +%%DATADIR%%/basewsw/game%%ARCHSUFFIX%%.so +%%CLIENT%%%%DATADIR%%/basewsw/ui%%ARCHSUFFIX%%.so +lib/warsow/basewsw +@dirrm lib/warsow +@dirrmtry %%DATADIR%%/basewsw +@dirrmtry %%DATADIR%% --- warsow-0.12_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608051359.k75Dx1Xa050022>