From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 28 07:10:02 2009 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 0B4EF1065693 for ; Mon, 28 Sep 2009 07:10:02 +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 DC09C8FC17 for ; Mon, 28 Sep 2009 07:10:01 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n8S7A1mh083475 for ; Mon, 28 Sep 2009 07:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n8S7A1Gq083474; Mon, 28 Sep 2009 07:10:01 GMT (envelope-from gnats) Resent-Date: Mon, 28 Sep 2009 07:10:01 GMT Resent-Message-Id: <200909280710.n8S7A1Gq083474@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, Stas Timokhin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B45D106566C for ; Mon, 28 Sep 2009 07:07:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 798A78FC1A for ; Mon, 28 Sep 2009 07:07:19 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n8S77Ir2077202 for ; Mon, 28 Sep 2009 07:07:18 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n8S77Itd077201; Mon, 28 Sep 2009 07:07:18 GMT (envelope-from nobody) Message-Id: <200909280707.n8S77Itd077201@www.freebsd.org> Date: Mon, 28 Sep 2009 07:07:18 GMT From: Stas Timokhin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/139201: Update port: games/scorched3d to 0.42.1 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: Mon, 28 Sep 2009 07:10:02 -0000 >Number: 139201 >Category: ports >Synopsis: Update port: games/scorched3d to 0.42.1 >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: Mon Sep 28 07:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Stas Timokhin >Release: 9.0-CURRENT >Organization: >Environment: >Description: Update of port games/scorched3d (unmaintained now) to version 0.42.1 >How-To-Repeat: >Fix: Patch attached with submission follows: --- distinfo.orig 2008-05-05 13:51:09.000000000 +0700 +++ distinfo 2009-09-28 11:10:15.000000000 +0700 @@ -1,3 +1,3 @@ -MD5 (Scorched3D-41.3-src.tar.gz) = 6bb47045abccaca1f775ff4cde8b3b5d -SHA256 (Scorched3D-41.3-src.tar.gz) = a606cc93674cb2acd55389e7c54b5389408c288369077d4270bd785e430b2b03 -SIZE (Scorched3D-41.3-src.tar.gz) = 60672892 +MD5 (Scorched3D-42.1-src.tar.gz) = e24867615568ef541a291a4813fcbdae +SHA256 (Scorched3D-42.1-src.tar.gz) = 884eccfed5fda58c140c4a593806c0c366a695660c47cdd4ea8d96189189106e +SIZE (Scorched3D-42.1-src.tar.gz) = 64491145 --- Makefile.orig 2009-08-22 07:22:29.000000000 +0700 +++ Makefile 2009-09-28 11:10:10.000000000 +0700 @@ -3,13 +3,12 @@ # Date created: Jan 5, 2003 # Whom: mdodd # -# $FreeBSD: ports/games/scorched3d/Makefile,v 1.43 2009/08/22 00:22:29 amdmi3 Exp $ +# $FreeBSD$ PORTNAME= scorched3d PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION} -PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Build%2041.3 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION}/ DISTNAME= Scorched3D-${SCORCH_VERSION}-src MAINTAINER= ports@FreeBSD.org @@ -23,7 +22,7 @@ jpeg:${PORTSDIR}/graphics/jpeg \ png:${PORTSDIR}/graphics/png -SCORCH_VERSION= 41.3 +SCORCH_VERSION= 42.1 .if defined(WITH_MYSQL) USE_MYSQL= yes @@ -36,6 +35,7 @@ USE_PERL5= yes USE_WX= 2.4+ WX_CONF_ARGS= absolute +USE_DOS2UNIX= mkinstalldirs WRKSRC= ${WRKDIR}/scorched AUTOMAKE_ARGS= --foreign --- pkg-plist.orig 2008-05-05 13:51:09.000000000 +0700 +++ pkg-plist 2009-09-28 11:10:21.000000000 +0700 @@ -136,10 +136,9 @@ games/scorched3d/data/avatars/yoda.png games/scorched3d/data/custominfo.xml games/scorched3d/data/fastestdisplay.xml -games/scorched3d/data/fonts/VERA-COPYRIGHT.TXT -games/scorched3d/data/fonts/test.ttf -games/scorched3d/data/fonts/vera.ttf -games/scorched3d/data/fonts/veramobd.ttf +games/scorched3d/data/fonts/dejavusans.ttf +games/scorched3d/data/fonts/dejavusconbd.ttf +games/scorched3d/data/fonts/dejavusmobd.ttf games/scorched3d/data/globalmods/apoc/authors.txt games/scorched3d/data/globalmods/apoc/data/accessories.xml games/scorched3d/data/globalmods/apoc/data/accessories/black.bmp @@ -623,6 +622,8 @@ games/scorched3d/data/globalmods/apoc/readme-nexus.txt games/scorched3d/data/globalmods/apoc/readme.txt games/scorched3d/data/globalmods/globalmods.txt +games/scorched3d/data/html/server/account.html +games/scorched3d/data/html/server/adminmenu.html games/scorched3d/data/html/server/applet.html games/scorched3d/data/html/server/banned.html games/scorched3d/data/html/server/binary/Applet.jar @@ -660,20 +661,30 @@ games/scorched3d/data/landscapes/ambientsoundwaves.xml games/scorched3d/data/landscapes/ascencion-pic.bmp games/scorched3d/data/landscapes/ascencion.bmp +games/scorched3d/data/landscapes/ascencion2.bmp games/scorched3d/data/landscapes/boidsah64.xml games/scorched3d/data/landscapes/boidsbats.xml games/scorched3d/data/landscapes/boidsf16.xml games/scorched3d/data/landscapes/boidsf18.xml games/scorched3d/data/landscapes/boidsgulls.xml +games/scorched3d/data/landscapes/boidslargenumber.xml games/scorched3d/data/landscapes/boidsparrot.xml games/scorched3d/data/landscapes/canyon-pic.bmp games/scorched3d/data/landscapes/canyon.bmp games/scorched3d/data/landscapes/cavern-pic.bmp +games/scorched3d/data/landscapes/circle.bmp games/scorched3d/data/landscapes/defnascencion.xml +games/scorched3d/data/landscapes/defnascencion2.xml games/scorched3d/data/landscapes/defncanyon.xml +games/scorched3d/data/landscapes/defncanyon2.xml games/scorched3d/data/landscapes/defncavern.xml +games/scorched3d/data/landscapes/defncavern2.xml games/scorched3d/data/landscapes/defndenali.xml +games/scorched3d/data/landscapes/defndenali2.xml +games/scorched3d/data/landscapes/defndenali3.xml games/scorched3d/data/landscapes/defnglaciation.xml +games/scorched3d/data/landscapes/defnglaciation2.xml +games/scorched3d/data/landscapes/defnglaciation3.xml games/scorched3d/data/landscapes/defnhalfed.xml games/scorched3d/data/landscapes/defnhilly.xml games/scorched3d/data/landscapes/defnicebergs2.xml @@ -681,17 +692,23 @@ games/scorched3d/data/landscapes/defnislands.xml games/scorched3d/data/landscapes/defnlowlands.xml games/scorched3d/data/landscapes/defnoldstyle.xml +games/scorched3d/data/landscapes/defnoldstyleerrosion.xml games/scorched3d/data/landscapes/defnridge.xml games/scorched3d/data/landscapes/defnspike.xml games/scorched3d/data/landscapes/defntest.xml games/scorched3d/data/landscapes/defnvalley.xml games/scorched3d/data/landscapes/denali-pic.bmp games/scorched3d/data/landscapes/denali.bmp +games/scorched3d/data/landscapes/denali2.bmp +games/scorched3d/data/landscapes/denali3.bmp games/scorched3d/data/landscapes/eventslightning.xml games/scorched3d/data/landscapes/eventsmeteor.xml games/scorched3d/data/landscapes/eventstest.xml +games/scorched3d/data/landscapes/fjords.bmp games/scorched3d/data/landscapes/glaciation-pic.bmp games/scorched3d/data/landscapes/glaciation.bmp +games/scorched3d/data/landscapes/glaciation2.bmp +games/scorched3d/data/landscapes/glaciation3.bmp games/scorched3d/data/landscapes/half-mask-start.bmp games/scorched3d/data/landscapes/half-mask.bmp games/scorched3d/data/landscapes/halfed-pic.bmp @@ -720,6 +737,7 @@ games/scorched3d/data/landscapes/placepalm2.xml games/scorched3d/data/landscapes/placepine.xml games/scorched3d/data/landscapes/placepine2.xml +games/scorched3d/data/landscapes/placepinelargenumber.xml games/scorched3d/data/landscapes/placepingu.xml games/scorched3d/data/landscapes/placesnowpine.xml games/scorched3d/data/landscapes/placetest.xml @@ -744,6 +762,7 @@ games/scorched3d/data/landscapes/texchina.xml games/scorched3d/data/landscapes/texdefault.xml games/scorched3d/data/landscapes/texdenali.xml +games/scorched3d/data/landscapes/texdenalilandperf.xml games/scorched3d/data/landscapes/texhell.xml games/scorched3d/data/landscapes/texice.xml games/scorched3d/data/landscapes/texnight.xml @@ -757,6 +776,8 @@ games/scorched3d/data/landscapes/texvulcano.xml games/scorched3d/data/landscapes/valley-mask.bmp games/scorched3d/data/landscapes/valley-pic.bmp +games/scorched3d/data/lang/lang.resource +games/scorched3d/data/lua/accessories/test.lua games/scorched3d/data/mediumdisplay.xml games/scorched3d/data/meshes/ah64d/ah64.bmp games/scorched3d/data/meshes/ah64d/ah64d.txt @@ -809,11 +830,14 @@ games/scorched3d/data/random.no games/scorched3d/data/safedisplay.xml games/scorched3d/data/server.xml +games/scorched3d/data/shaders/land-splat.fshader games/scorched3d/data/shaders/land.fshader games/scorched3d/data/shaders/land.vshader games/scorched3d/data/shaders/water.fshader games/scorched3d/data/shaders/water.license games/scorched3d/data/shaders/water.vshader +games/scorched3d/data/shaders/watersimple.fshader +games/scorched3d/data/shaders/watersimple.vshader games/scorched3d/data/singlecustom.xml games/scorched3d/data/singleeasy.xml games/scorched3d/data/singlehard.xml @@ -832,8 +856,6 @@ games/scorched3d/data/tankais.xml games/scorched3d/data/tankaiweaponsets.xml games/scorched3d/data/tanks.xml -games/scorched3d/data/tanks/CF-104/104.bmp -games/scorched3d/data/tanks/CF-104/104.txt games/scorched3d/data/tanks/a7v.ase games/scorched3d/data/tanks/a7v.bmp games/scorched3d/data/tanks/aat.ase @@ -871,6 +893,8 @@ games/scorched3d/data/tanks/cannont/side.bmp games/scorched3d/data/tanks/cannont/side2.bmp games/scorched3d/data/tanks/cannont/top.bmp +games/scorched3d/data/tanks/cf-104/104.bmp +games/scorched3d/data/tanks/cf-104/104.txt games/scorched3d/data/tanks/death/black.bmp games/scorched3d/data/tanks/death/chrome.bmp games/scorched3d/data/tanks/death/death.txt @@ -1066,6 +1090,9 @@ games/scorched3d/data/textures/bordershield/grid2.bmp games/scorched3d/data/textures/bordershield/grid22.bmp games/scorched3d/data/textures/bordershield/hit.bmp +games/scorched3d/data/textures/circle.bmp +games/scorched3d/data/textures/circlem.bmp +games/scorched3d/data/textures/circlew.bmp games/scorched3d/data/textures/clearsky.bmp games/scorched3d/data/textures/explode/explosion0/exp0004.bmp games/scorched3d/data/textures/explode/explosion0/exp0008.bmp @@ -1248,7 +1275,6 @@ games/scorched3d/data/textures/landscape/china/texture0.bmp games/scorched3d/data/textures/landscape/china/texture1.bmp games/scorched3d/data/textures/landscape/china/texture2.bmp -games/scorched3d/data/textures/landscape/china/texture2.jpg games/scorched3d/data/textures/landscape/china/texture3.bmp games/scorched3d/data/textures/landscape/china/texture4.bmp games/scorched3d/data/textures/landscape/china/water.bmp @@ -1590,6 +1616,8 @@ games/scorched3d/data/windows/move.bmp games/scorched3d/data/windows/noentry.bmp games/scorched3d/data/windows/ok.bmp +games/scorched3d/data/windows/perf.bmp +games/scorched3d/data/windows/perfa.bmp games/scorched3d/data/windows/plan.bmp games/scorched3d/data/windows/plana.bmp games/scorched3d/data/windows/planaa.bmp @@ -1709,13 +1737,13 @@ @dirrm games/scorched3d/data/tanks/guntower @dirrm games/scorched3d/data/tanks/gorilla @dirrm games/scorched3d/data/tanks/death +@dirrm games/scorched3d/data/tanks/cf-104 @dirrm games/scorched3d/data/tanks/cannont @dirrm games/scorched3d/data/tanks/cannon @dirrm games/scorched3d/data/tanks/bradley2 @dirrm games/scorched3d/data/tanks/bm13 @dirrm games/scorched3d/data/tanks/bender @dirrm games/scorched3d/data/tanks/battleship -@dirrm games/scorched3d/data/tanks/CF-104 @dirrm games/scorched3d/data/tanks @dirrm games/scorched3d/data/talk/polish @dirrm games/scorched3d/data/talk/german @@ -1737,6 +1765,9 @@ @dirrm games/scorched3d/data/meshes/arara @dirrm games/scorched3d/data/meshes/ah64d @dirrm games/scorched3d/data/meshes +@dirrm games/scorched3d/data/lua/accessories +@dirrm games/scorched3d/data/lua +@dirrm games/scorched3d/data/lang @dirrm games/scorched3d/data/landscapes @dirrm games/scorched3d/data/html/server/binary @dirrm games/scorched3d/data/html/server --- files/patch-src-client-client-SecureID.cpp.orig 1970-01-01 07:00:00.000000000 +0700 +++ files/patch-src-client-client-SecureID.cpp 2009-09-28 11:10:27.000000000 +0700 @@ -0,0 +1,51 @@ +--- src/client/client/SecureID.cpp.orig 2008-03-03 00:47:36.000000000 +0600 ++++ src/client/client/SecureID.cpp 2009-09-26 20:05:52.000000000 +0700 +@@ -33,6 +33,48 @@ + { + return "0:0:0:0:0:0"; + } ++#elif defined(__FreeBSD__) ++ ++#include ++#include ++#include ++#include ++ ++std::string SecureID::GetPrivateKey(void) ++{ ++ std::string Key; ++ struct ifaddrs* ifaphead; ++ ++ if (getifaddrs(&ifaphead) != 0) ++ { ++ return ""; ++ } ++ ++ for (struct ifaddrs* ifap = ifaphead; ifap; ifap = ifap->ifa_next) ++ { ++ if (ifap->ifa_addr->sa_family == AF_LINK) ++ { ++ if (strncmp(ifap->ifa_name, "lo", 2) != 0) ++ { ++ struct sockaddr_dl* sdl = ++ (struct sockaddr_dl *)ifap->ifa_addr; ++ unsigned char* if_mac = (unsigned char*)LLADDR(sdl); ++ char buf[18]; ++ snprintf(buf, 18, ++ "%02x:%02x:%02x:%02x:%02x:%02x", ++ if_mac[0], if_mac[1], if_mac[2], ++ if_mac[3], if_mac[4], if_mac[5]); ++ Key = buf; ++ break; ++ } ++ } ++ } ++ ++ freeifaddrs(ifaphead); ++ return Key; ++} ++ ++ + + #else + --- files/patch-src-net-SecureID.cpp.orig 2009-09-28 14:04:50.000000000 +0700 +++ files/patch-src-net-SecureID.cpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,50 +0,0 @@ ---- src/net/SecureID.cpp.orig 2008-03-31 00:52:26.000000000 -0600 -+++ src/net/SecureID.cpp 2008-03-31 22:04:44.000000000 -0600 -@@ -34,6 +34,47 @@ - return "0:0:0:0:0:0"; - } - -+#elif defined(__FreeBSD__) -+ -+#include -+#include -+#include -+#include -+ -+std::string SecureID::GetPrivateKey(void) -+{ -+ std::string Key; -+ struct ifaddrs* ifaphead; -+ -+ if (getifaddrs(&ifaphead) != 0) -+ { -+ return ""; -+ } -+ -+ for (struct ifaddrs* ifap = ifaphead; ifap; ifap = ifap->ifa_next) -+ { -+ if (ifap->ifa_addr->sa_family == AF_LINK) -+ { -+ if (strncmp(ifap->ifa_name, "lo", 2) != 0) -+ { -+ struct sockaddr_dl* sdl = -+ (struct sockaddr_dl *)ifap->ifa_addr; -+ unsigned char* if_mac = (unsigned char*)LLADDR(sdl); -+ char buf[18]; -+ snprintf(buf, 18, -+ "%02x:%02x:%02x:%02x:%02x:%02x", -+ if_mac[0], if_mac[1], if_mac[2], -+ if_mac[3], if_mac[4], if_mac[5]); -+ Key = buf; -+ break; -+ } -+ } -+ } -+ -+ freeifaddrs(ifaphead); -+ return Key; -+} -+ - #else - - #include >Release-Note: >Audit-Trail: >Unformatted: