From owner-freebsd-bugs@FreeBSD.ORG Sun Feb 13 17:30:07 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77C72106564A for ; Sun, 13 Feb 2011 17:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 352ED8FC14 for ; Sun, 13 Feb 2011 17:30:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p1DHU7ng090428 for ; Sun, 13 Feb 2011 17:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1DHU7v7090426; Sun, 13 Feb 2011 17:30:07 GMT (envelope-from gnats) Resent-Date: Sun, 13 Feb 2011 17:30:07 GMT Resent-Message-Id: <201102131730.p1DHU7v7090426@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Aldis Berjoza Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD29E1065670 for ; Sun, 13 Feb 2011 17:22:05 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 823628FC14 for ; Sun, 13 Feb 2011 17:22:05 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p1DHM4Bu091355 for ; Sun, 13 Feb 2011 17:22:04 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p1DHM4t0091349; Sun, 13 Feb 2011 17:22:04 GMT (envelope-from nobody) Message-Id: <201102131722.p1DHM4t0091349@red.freebsd.org> Date: Sun, 13 Feb 2011 17:22:04 GMT From: Aldis Berjoza To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/154743: [PATCH] games/odamex v0.5.1 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Feb 2011 17:30:07 -0000 >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 .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: