Date: Sun, 13 Feb 2011 17:22:04 GMT From: Aldis Berjoza <aldis@bsdroot.lv> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/154743: [PATCH] games/odamex v0.5.1 Message-ID: <201102131722.p1DHM4t0091349@red.freebsd.org> Resent-Message-ID: <201102131730.p1DHU7v7090426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154743 >Category: misc >Synopsis: [PATCH] games/odamex v0.5.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Feb 13 17:30:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Aldis Berjoza >Release: >Organization: >Environment: >Description: Update games/odamex to v0.5.1 odalaunch builds, but it doesn't launch odamex with proper command line arguments (WAD related) (not sure yet where to fix it) For this reason I marked it broken >How-To-Repeat: >Fix: Patch attached with submission follows: diff -u odamex.bak/Makefile odamex/Makefile --- odamex.bak/Makefile 2011-02-13 16:42:04.000000000 +0200 +++ odamex/Makefile 2011-02-13 19:18:25.047706337 +0200 @@ -2,12 +2,11 @@ # Date created: 2007-12-06 # Whom: alepulver # -# $FreeBSD: ports/games/odamex/Makefile,v 1.10 2011/02/13 14:42:04 linimon Exp $ +# $FreeBSD: ports/games/odamex/Makefile,v 1.9 2011/02/13 07:29:39 miwi Exp $ # PORTNAME= odamex -PORTVERSION= 0.4.3 -PORTREVISION= 2 +PORTVERSION= 0.5.1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION} DISTNAME= odamex-src-${PORTVERSION} @@ -19,12 +18,13 @@ USE_GMAKE= yes USE_SDL= sdl mixer -OPTIONS= LAUNCHER "Enable GUI launcher program" off \ +OPTIONS= LAUNCHER "Enable GUI launcher program (Broken)" off \ MIDI "Enable MIDI support (timidity)" off .include <bsd.port.pre.mk> .if defined(WITH_LAUNCHER) +BROKEN= Doesn\'t launch odamex with propper commandline arguments USE_WX= 2.6+ MAKE_ENV+= WXRC_CMD="${WXRC_CMD}" WITH_LAUNCHER=yes PLIST_SUB+= LAUNCHER="" @@ -42,13 +42,8 @@ ${WRKSRC}/client/src/d_main.cpp \ ${WRKSRC}/server/src/d_main.cpp -.if defined(WITH_LAUNCHER) - @${REINPLACE_CMD} -e 's|\./odamex|odamex|' \ - ${WRKSRC}/odalaunch/src/misc.cpp -.endif - do-install: -.for f in odamaster odamex odasrv +.for f in odamex odasrv ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin .endfor .if defined(WITH_LAUNCHER) diff -u odamex.bak/distinfo odamex/distinfo --- odamex.bak/distinfo 2009-05-31 21:34:04.000000000 +0300 +++ odamex/distinfo 2011-02-13 19:08:07.763514352 +0200 @@ -1,3 +1,2 @@ -MD5 (odamex-src-0.4.3.tar.bz2) = 4f1caf8208ff6c2978337446b38ab649 -SHA256 (odamex-src-0.4.3.tar.bz2) = a958b5e34acd57bdc4a0131c939161d64042bf9efcd71560cd970014c1eb0430 -SIZE (odamex-src-0.4.3.tar.bz2) = 1299002 +SHA256 (odamex-src-0.5.1.tar.bz2) = 9cfb9cc920cfbe6e77e417775dd61e25c71e9f92dbeb3fc116d0b1ba022f6dfd +SIZE (odamex-src-0.5.1.tar.bz2) = 2580732 Common subdirectories: odamex.bak/files and odamex/files diff -u odamex.bak/pkg-plist odamex/pkg-plist --- odamex.bak/pkg-plist 2008-02-05 18:42:35.000000000 +0200 +++ odamex/pkg-plist 2011-02-13 19:08:07.763514352 +0200 @@ -1,5 +1,4 @@ %%LAUNCHER%%bin/odalaunch -bin/odamaster bin/odamex bin/odasrv %%DATADIR%%/odamex.wad >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102131722.p1DHM4t0091349>