svn commit: r428975 - in head/games/openbor: . files
Jan Beich
jbeich at FreeBSD.org
Tue Dec 20 02:30:59 UTC 2016
Author: jbeich
Date: Tue Dec 20 02:30:58 2016
New Revision: 428975
URL: https://svnweb.freebsd.org/changeset/ports/428975
Log:
games/openbor: remove svn:eol-style
Subversion insistence on screwing up EOL markers turns patch
maintenance here into misery as USES=dos2unix breaks |make makepatch|.
Modified:
head/games/openbor/Makefile
head/games/openbor/files/patch-openbor.c (contents, props changed)
Modified: head/games/openbor/Makefile
==============================================================================
--- head/games/openbor/Makefile Tue Dec 20 02:22:08 2016 (r428974)
+++ head/games/openbor/Makefile Tue Dec 20 02:30:58 2016 (r428975)
@@ -15,8 +15,7 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libpng.so:graphics/png \
libvpx.so:multimedia/libvpx
-USES= dos2unix gmake pkgconfig tar:xz
-DOS2UNIX_FILES= openbor.c # XXX mixed vs. svn:eol-style
+USES= gmake pkgconfig tar:xz
USE_SDL= gfx2
MAKE_ENV= BUILD_LINUX=1 SDKPATH="${LOCALBASE}" \
GCC_TARGET="${CONFIGURE_TARGET:S/amd64/x86_64/}"
Modified: head/games/openbor/files/patch-openbor.c
==============================================================================
--- head/games/openbor/files/patch-openbor.c Tue Dec 20 02:22:08 2016 (r428974)
+++ head/games/openbor/files/patch-openbor.c Tue Dec 20 02:30:58 2016 (r428975)
@@ -1,23 +1,23 @@
--- openbor.c.orig 2016-12-19 15:29:57 UTC
+++ openbor.c
@@ -5810,7 +5810,7 @@ s_collision_attack **collision_alloc_att
- size_t alloc_size;
-
- // Get amount of memory we'll need.
-- alloc_size = sizeof(*result);
-+ alloc_size = max_collisons * sizeof(*result);
-
- // Allocate memory and get pointer.
- result = malloc(alloc_size);
+ size_t alloc_size;
+
+ // Get amount of memory we'll need.
+- alloc_size = sizeof(*result);
++ alloc_size = max_collisons * sizeof(*result);
+
+ // Allocate memory and get pointer.
+ result = malloc(alloc_size);
@@ -5859,7 +5859,7 @@ s_collision_body **collision_alloc_body_
- size_t alloc_size;
-
- // Get amount of memory we'll need.
-- alloc_size = sizeof(*result);
-+ alloc_size = max_collisons * sizeof(*result);
-
- // Allocate memory and get pointer.
- result = malloc(alloc_size);
+ size_t alloc_size;
+
+ // Get amount of memory we'll need.
+- alloc_size = sizeof(*result);
++ alloc_size = max_collisons * sizeof(*result);
+
+ // Allocate memory and get pointer.
+ result = malloc(alloc_size);
@@ -20480,7 +20480,7 @@ void common_dot()
entity *eOpp; //Owner of dot effect.
s_collision_attack attack; //Attack struct.
@@ -30,7 +30,7 @@
@@ -34617,7 +34617,7 @@ void keyboard_setup(int player)
strncpy(buttonnames[SDID_SPECIAL], "Special", 16);
strncpy(buttonnames[SDID_START], "Start", 16);
- strncpy(buttonnames[SDID_SCREENSHOT], "Screenshot", 16);
+ strncpy(buttonnames[SDID_SCREENSHOT], "Screenshot", 16);
- strncpy(buttonnames[SDID_ESC], "Exit", 16);
+// strncpy(buttonnames[SDID_ESC], "Exit", 16);
More information about the svn-ports-head
mailing list