From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 8 19:50:14 2011 Return-Path: Delivered-To: freebsd-ports-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 4CC041065670 for ; Fri, 8 Jul 2011 19:50:14 +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 2901A8FC13 for ; Fri, 8 Jul 2011 19:50:14 +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 p68JoER6095584 for ; Fri, 8 Jul 2011 19:50:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p68JoEdO095583; Fri, 8 Jul 2011 19:50:14 GMT (envelope-from gnats) Resent-Date: Fri, 8 Jul 2011 19:50:14 GMT Resent-Message-Id: <201107081950.p68JoEdO095583@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jesse Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63B5B106564A for ; Fri, 8 Jul 2011 19:47:32 +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 523798FC12 for ; Fri, 8 Jul 2011 19:47:32 +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 p68JlW8R082764 for ; Fri, 8 Jul 2011 19:47:32 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p68JlWtt082763; Fri, 8 Jul 2011 19:47:32 GMT (envelope-from nobody) Message-Id: <201107081947.p68JlWtt082763@red.freebsd.org> Date: Fri, 8 Jul 2011 19:47:32 GMT From: Jesse To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/158741: port update: games/openssn X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jul 2011 19:50:14 -0000 >Number: 158741 >Category: ports >Synopsis: port update: games/openssn >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jul 08 19:50:13 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jesse >Release: 8.1 >Organization: RM >Environment: FreeBSD-8.1 32-bit >Description: Please find attached my patch to bring the games/openssn port up to date with the upstream project. Upstream website: http://openssn.sf.net >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN /usr/ports/games/openssn/Makefile openssn/Makefile --- /usr/ports/games/openssn/Makefile 2011-06-26 04:43:46.000000000 -0300 +++ openssn/Makefile 2011-07-08 16:37:45.000000000 -0300 @@ -2,11 +2,11 @@ # Date created: 30, May 2011 # Whom: Jesse Smith # -# $FreeBSD: ports/games/openssn/Makefile,v 1.1 2011/06/26 07:43:46 miwi Exp $ +# $FreeBSD: $ # PORTNAME= openssn -PORTVERSION= 0.3 +PORTVERSION= 0.6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -15,6 +15,6 @@ USE_SDL= sdl gfx image USE_XORG= x11 xau xdmcp xext xmu xpm xxf86vm -WRKSRC= ${WRKDIR}/${PORTNAME}/src +WRKSRC= ${WRKDIR}/${PORTNAME} .include diff -ruN /usr/ports/games/openssn/distinfo openssn/distinfo --- /usr/ports/games/openssn/distinfo 2011-06-26 04:43:46.000000000 -0300 +++ openssn/distinfo 2011-07-08 16:42:51.000000000 -0300 @@ -1,2 +1,2 @@ -SHA256 (openssn-0.3.tar.gz) = 10a0514a0d99f0a3b7343bba3eb56124c6f992ca030fce4d4ad9a9e018d6be04 -SIZE (openssn-0.3.tar.gz) = 1669161 +SHA256 (openssn-0.6.tar.gz) = c14b134ad96023add83b3b350516860c3755ed6058e7d9d9473ed4f4b0985916 +SIZE (openssn-0.6.tar.gz) = 5910349 diff -ruN /usr/ports/games/openssn/files/patch-sonar.cpp openssn/files/patch-sonar.cpp --- /usr/ports/games/openssn/files/patch-sonar.cpp 2011-06-26 04:43:46.000000000 -0300 +++ openssn/files/patch-sonar.cpp 1969-12-31 20:00:00.000000000 -0400 @@ -1,56 +0,0 @@ ---- ./sonar.cpp.orig 2011-05-29 21:42:19.000000000 -0300 -+++ ./sonar.cpp 2011-05-29 21:42:56.000000000 -0300 -@@ -366,7 +366,7 @@ - int relative_bearing = bearing_to_target - recipbearing; - if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true; - if (!sensordeaf){ -- noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) abs((flowandambientnoise - RandInt(40))) , 0); -+ noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) fabs((flowandambientnoise - RandInt(40))) , 0); - DPixel(sonarscreen, nbp, 0, noisecolor); - } - else{ -@@ -407,7 +407,7 @@ - int relative_bearing = bearing_to_target - recipbearing; - if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true; - if (!sensordeaf){ -- noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) abs((flowandambientnoise - RandInt(40))) , 0); -+ noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) fabs((flowandambientnoise - RandInt(40))) , 0); - DPixel(sonarscreen, nbp, 70, noisecolor); - } - else{ -@@ -448,7 +448,7 @@ - int relative_bearing = bearing_to_target - recipbearing; - if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true; - if (!sensordeaf){ -- noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) abs((flowandambientnoise - RandInt(40))) , 0); -+ noisecolor=SDL_MapRGB(sonarscreen->format, 0,(int) fabs((flowandambientnoise - RandInt(40))) , 0); - DPixel(sonarscreen, nbp, 140, noisecolor); - } - else{ -@@ -507,7 +507,7 @@ - int relative_bearing = bearing_to_target - array_heading; - if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true; - if(!sensordeaf){ -- noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)abs((flowandambientnoise - RandInt(40))), 0); -+ noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)fabs((flowandambientnoise - RandInt(40))), 0); - DPixel(towedarrayscreen, nbp, 0, noisecolor); - } - else{ -@@ -549,7 +549,7 @@ - int relative_bearing = bearing_to_target - array_heading; - if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true; - if(!sensordeaf){ -- noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)abs((flowandambientnoise - RandInt(40))), 0); -+ noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)fabs((flowandambientnoise - RandInt(40))), 0); - DPixel(towedarrayscreen, nbp, 70, noisecolor); - } - else{ -@@ -589,7 +589,7 @@ - int relative_bearing = bearing_to_target - array_heading; - if(relative_bearing > 150 && relative_bearing < 210) sensordeaf = true; - if(!sensordeaf){ -- noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)abs((flowandambientnoise - RandInt(40))), 0); -+ noisecolor=SDL_MapRGB(towedarrayscreen->format, 0,(int)fabs((flowandambientnoise - RandInt(40))), 0); - DPixel(towedarrayscreen, nbp, 140, noisecolor); - } - else{ diff -ruN /usr/ports/games/openssn/pkg-plist openssn/pkg-plist --- /usr/ports/games/openssn/pkg-plist 2011-06-26 04:43:46.000000000 -0300 +++ openssn/pkg-plist 2011-07-08 16:40:51.000000000 -0300 @@ -1,7 +1,16 @@ bin/openssn share/games/openssn/data/font.dat +share/games/openssn/data/information.txt share/games/openssn/data/largefont.dat +share/games/openssn/data/mission0.dat +share/games/openssn/data/mission1.dat +share/games/openssn/data/mission2.dat +share/games/openssn/data/orders0.txt +share/games/openssn/data/orders1.txt +share/games/openssn/data/orders2.txt share/games/openssn/data/ships0.dat +share/games/openssn/data/ships1.dat +share/games/openssn/data/ships2.dat share/games/openssn/images/A13off.png share/games/openssn/images/A13on.png share/games/openssn/images/A23off.png @@ -31,6 +40,7 @@ share/games/openssn/images/blip.png share/games/openssn/images/centerbuttondown.png share/games/openssn/images/centerbuttonup.png +share/games/openssn/images/cutarray.png share/games/openssn/images/depthdownoff.png share/games/openssn/images/depthdownon.png share/games/openssn/images/depthupoff.png @@ -107,6 +117,9 @@ share/games/openssn/images/sonarup.png share/games/openssn/images/sphericaltowed.png share/games/openssn/images/styllus.png +share/games/openssn/images/sub_menu.png +share/games/openssn/images/sub_rising.png +share/games/openssn/images/sub_surfacing.png share/games/openssn/images/sweep0.png share/games/openssn/images/sweep1.png share/games/openssn/images/sweep10.png @@ -163,6 +176,14 @@ share/games/openssn/images/upbuttonup.png share/games/openssn/images/uppercrtoff.png share/games/openssn/images/uppercrton.png +share/games/openssn/ships/class1.shp +share/games/openssn/ships/class2.shp +share/games/openssn/ships/class3.shp +share/games/openssn/ships/class4.shp +share/games/openssn/ships/class5.shp +share/games/openssn/ships/class6.shp +share/games/openssn/ships/information.txt +@dirrm share/games/openssn/ships @dirrm share/games/openssn/images @dirrm share/games/openssn/data @dirrm share/games/openssn >Release-Note: >Audit-Trail: >Unformatted: