From owner-svn-ports-head@FreeBSD.ORG Sat Oct 12 04:17:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EF6CFE07; Sat, 12 Oct 2013 04:17:00 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DCDC927E4; Sat, 12 Oct 2013 04:17:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9C4H0nk041174; Sat, 12 Oct 2013 04:17:00 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9C4H01D041168; Sat, 12 Oct 2013 04:17:00 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201310120417.r9C4H01D041168@svn.freebsd.org> From: Edwin Groothuis Date: Sat, 12 Oct 2013 04:17:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330118 - in head/games/xrobots: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 04:17:01 -0000 Author: edwin Date: Sat Oct 12 04:16:59 2013 New Revision: 330118 URL: http://svnweb.freebsd.org/changeset/ports/330118 Log: Build on 10.0 Added: head/games/xrobots/files/patch-actions.c (contents, props changed) Modified: head/games/xrobots/Makefile head/games/xrobots/files/patch-main.c Modified: head/games/xrobots/Makefile ============================================================================== --- head/games/xrobots/Makefile Sat Oct 12 04:11:20 2013 (r330117) +++ head/games/xrobots/Makefile Sat Oct 12 04:16:59 2013 (r330118) @@ -3,7 +3,7 @@ PORTNAME= xrobots PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.mavetju.org/download/adopted/ DISTNAME= ${PORTNAME}-${PORTVERSION}-ss-10.20 Added: head/games/xrobots/files/patch-actions.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xrobots/files/patch-actions.c Sat Oct 12 04:16:59 2013 (r330118) @@ -0,0 +1,51 @@ +--- actions.c.orig 2013-10-13 01:20:18.000000000 +1100 ++++ actions.c 2013-10-13 01:26:21.000000000 +1100 +@@ -66,6 +66,7 @@ + Cardinal *num_params; + { + /* do nothing */ ++ return NULL; + } + + +@@ -169,11 +170,11 @@ + int diff_x, diff_y; + int num_wasted; + +- if(!game_active) return; ++ if(!game_active) return NULL; + + if(get_next_position(&diff_x, &diff_y, event->x, event->y, + params, *num_params)) +- return; ++ return NULL; + + last_human_x = human_x; + last_human_y = human_y; +@@ -210,14 +211,14 @@ + int diff_x, diff_y; + int num_wasted; + +- if(!game_active) return; ++ if(!game_active) return NULL; + + if(get_next_position(&diff_x, &diff_y, event->x, event->y, + params, *num_params)) +- return; ++ return NULL; + + if(! can_go(human_x+diff_x,human_y+diff_y) ) +- return; ++ return NULL; + + while( can_go(human_x+diff_x,human_y+diff_y) ) { + last_human_x = human_x; +@@ -261,7 +262,7 @@ + int tmp_human_x, tmp_human_y; + int num_wasted; + +- if(!game_active) return; ++ if(!game_active) return NULL; + + while(direction = determine_direction(event->x,event->y)) { + if(direction == STILL) break; Modified: head/games/xrobots/files/patch-main.c ============================================================================== --- head/games/xrobots/files/patch-main.c Sat Oct 12 04:11:20 2013 (r330117) +++ head/games/xrobots/files/patch-main.c Sat Oct 12 04:16:59 2013 (r330118) @@ -1,6 +1,6 @@ ---- main.c.orig Thu Jan 22 06:34:05 1998 -+++ main.c Sat Feb 28 03:53:04 2004 -@@ -170,25 +170,25 @@ +--- main.c.orig 1998-01-23 01:34:05.000000000 +1100 ++++ main.c 2013-10-13 01:30:59.000000000 +1100 +@@ -170,31 +170,31 @@ {"-scorefile","scorefile",XrmoptionSepArg, NULL }, }; @@ -36,11 +36,17 @@ }; /*----------------------------------------------------------------------*/ -@@ -205,6 +205,16 @@ - new_game_command; + + main(argc, argv) +- unsigned int argc; ++ int argc; + char **argv; + { + Arg args[1]; +@@ -206,6 +206,16 @@ srandom(getpid()); -+ + + application_resources[0].resource_offset=(Cardinal)&fg; + application_resources[1].resource_offset=(Cardinal)&bg; + application_resources[2].resource_offset=(Cardinal)&spiffy; @@ -50,6 +56,7 @@ + application_resources[6].resource_offset=(Cardinal)&diewaiting; + application_resources[7].resource_offset=(Cardinal)&translations; + application_resources[8].resource_offset=(Cardinal)&score_filename; - ++ top_shell = XtInitialize(argv[0], "xrobots", options, XtNumber(options), (int *)&argc, argv); + XtSetValues(top_shell, arglisttop_shell, XtNumber(arglisttop_shell));