svn commit: r440523 - in head/games: openbor openbor/files openbor4432/files

[Jan Beich]

Author: jbeich
Date: Wed May 10 02:32:29 2017
New Revision: 440523
URL: https://svnweb.freebsd.org/changeset/ports/440523

Log:
  games/openbor: oops, make sure patch(1) doesn't confuse context

Modified:
  head/games/openbor/Makefile
  head/games/openbor/files/patch-openbor.c
  head/games/openbor4432/files/patch-openbor.c

Modified: head/games/openbor/Makefile
==============================================================================
--- head/games/openbor/Makefile	Tue May  9 23:57:27 2017	(r440522)
+++ head/games/openbor/Makefile	Wed May 10 02:32:29 2017	(r440523)
@@ -3,6 +3,9 @@
 PORTNAME=	openbor
 # Hint: svn revision is git rev-list --count ${GH_TAGNAME}
 PORTVERSION?=	4505
+.ifndef PKGNAMESUFFIX
+PORTREVISION=	1
+.endif
 CATEGORIES=	games
 
 MAINTAINER=	jbeich at FreeBSD.org

Modified: head/games/openbor/files/patch-openbor.c
==============================================================================
--- head/games/openbor/files/patch-openbor.c	Tue May  9 23:57:27 2017	(r440522)
+++ head/games/openbor/files/patch-openbor.c	Wed May 10 02:32:29 2017	(r440523)
@@ -4,7 +4,12 @@ Avoid accidental rounding from abs()
 
 --- openbor.c.orig	2017-04-22 14:20:08 UTC
 +++ openbor.c
-@@ -5810,7 +5810,7 @@ s_collision_attack **collision_alloc_att
+@@ -5747,17 +5747,17 @@ s_collision_attack *collision_alloc_attack_instance(s_
+ //
+ // Allocate an empty collision attack list.
+ s_collision_attack **collision_alloc_attack_list()
+ {
+     s_collision_attack **result;
      size_t             alloc_size;
  
      // Get amount of memory we'll need.
@@ -13,7 +18,17 @@ Avoid accidental rounding from abs()
  
      // Allocate memory and get pointer.
      result = malloc(alloc_size);
-@@ -5859,7 +5859,7 @@ s_collision_body **collision_alloc_body_
+ 
+     // Make sure the list is blank.
+     memset(result, 0, alloc_size);
+ 
+     // return result.
+@@ -5796,17 +5796,17 @@ s_collision_body *collision_alloc_body_instance(s_coll
+ //
+ // Allocate an empty collision attack list.
+ s_collision_body **collision_alloc_body_list()
+ {
+     s_collision_body **result;
      size_t             alloc_size;
  
      // Get amount of memory we'll need.
@@ -22,6 +37,11 @@ Avoid accidental rounding from abs()
  
      // Allocate memory and get pointer.
      result = malloc(alloc_size);
+ 
+     // Make sure the list is blank.
+     memset(result, 0, alloc_size);
+ 
+     // return result.
 @@ -8204,7 +8204,8 @@ size_t lcmScriptCopyBuffer(ArgList *argl
  
  size_t lcmScriptDeleteMain(char **buf)

Modified: head/games/openbor4432/files/patch-openbor.c
==============================================================================
--- head/games/openbor4432/files/patch-openbor.c	Tue May  9 23:57:27 2017	(r440522)
+++ head/games/openbor4432/files/patch-openbor.c	Wed May 10 02:32:29 2017	(r440523)
@@ -4,7 +4,12 @@ Avoid accidental rounding from abs()
 
 --- openbor.c.orig	2016-12-22 13:02:02 UTC
 +++ openbor.c
-@@ -5810,7 +5810,7 @@ s_collision_attack **collision_alloc_att
+@@ -5821,17 +5821,17 @@ s_collision_attack *collision_alloc_attack_instance(s_
+ //
+ // Allocate an empty collision attack list.
+ s_collision_attack **collision_alloc_attack_list()
+ {
+     s_collision_attack **result;
      size_t             alloc_size;
  
      // Get amount of memory we'll need.
@@ -13,7 +18,17 @@ Avoid accidental rounding from abs()
  
      // Allocate memory and get pointer.
      result = malloc(alloc_size);
-@@ -5859,7 +5859,7 @@ s_collision_body **collision_alloc_body_
+ 
+     // Make sure the list is blank.
+     memset(result, 0, alloc_size);
+ 
+     // return result.
+@@ -5870,17 +5870,17 @@ s_collision_body *collision_alloc_body_instance(s_coll
+ //
+ // Allocate an empty collision attack list.
+ s_collision_body **collision_alloc_body_list()
+ {
+     s_collision_body **result;
      size_t             alloc_size;
  
      // Get amount of memory we'll need.
@@ -22,6 +37,11 @@ Avoid accidental rounding from abs()
  
      // Allocate memory and get pointer.
      result = malloc(alloc_size);
+ 
+     // Make sure the list is blank.
+     memset(result, 0, alloc_size);
+ 
+     // return result.
 @@ -8204,7 +8204,8 @@ size_t lcmScriptCopyBuffer(ArgList *argl
  
  size_t lcmScriptDeleteMain(char **buf)