svn commit: r550155 - in head/games/netwalk: . files

[Stefan Eßer]

Author: se
Date: Sat Sep 26 10:18:32 2020
New Revision: 550155
URL: https://svnweb.freebsd.org/changeset/ports/550155

Log:
  Fix build with -fno-common
  
  While here fix complaints from portlint and portclippy

Added:
  head/games/netwalk/files/patch-main.c   (contents, props changed)
Modified:
  head/games/netwalk/Makefile
  head/games/netwalk/files/patch-Makefile

Modified: head/games/netwalk/Makefile
==============================================================================
--- head/games/netwalk/Makefile	Sat Sep 26 10:16:24 2020	(r550154)
+++ head/games/netwalk/Makefile	Sat Sep 26 10:18:32 2020	(r550155)
@@ -3,7 +3,7 @@
 
 PORTNAME=	netwalk
 PORTVERSION=	0.4.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	ports at FreeBSD.org
@@ -12,26 +12,25 @@ COMMENT=	Game where the object is to connect every ter
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		gmake gnome iconv sdl xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	blynn
 GH_TAGNAME=	cb6b089
-
-USES=		gmake gnome iconv sdl xorg
+INSTALLS_ICONS=	yes
 USE_SDL=	sdl ttf
 USE_XORG=	x11 xau xdmcp
+
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 ALL_TARGET=
 
+DESKTOP_ENTRIES="NetWalk" "" "${PORTNAME}" "${PORTNAME}" "Game;LogicGame;" ""
+
 PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
 
-INSTALLS_ICONS=	yes
 ICON_SIZES=	32x32 48x48 64x64 96x96 128x128
 
-DESKTOP_ENTRIES="NetWalk" "" "${PORTNAME}" \
-		"${PORTNAME}" "Game;LogicGame;" ""
-
-post-patch:
+pre-build:
 	@${REINPLACE_CMD} -e \
 	's|CC = gcc|CC = ${CC}|; \
 	 s|CFLAGS=-Wall -O2 -fomit-frame-pointer|CFLAGS+= -fomit-frame-pointer|; \

Modified: head/games/netwalk/files/patch-Makefile
==============================================================================
--- head/games/netwalk/files/patch-Makefile	Sat Sep 26 10:16:24 2020	(r550154)
+++ head/games/netwalk/files/patch-Makefile	Sat Sep 26 10:18:32 2020	(r550155)
@@ -1,6 +1,6 @@
---- ./Makefile.orig	2013-09-24 07:25:27.000000000 +0200
-+++ ./Makefile	2014-05-12 21:10:05.000000000 +0200
-@@ -24,7 +24,7 @@
+--- Makefile.orig	2013-09-24 05:25:27 UTC
++++ Makefile
+@@ -24,7 +24,7 @@ sharedir.h : ./Makefile
  ifeq ("$(OS)", "win32")
  	echo '#define NETWALK_SHARE_DIR "."' > sharedir.h
  else

Added: head/games/netwalk/files/patch-main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/netwalk/files/patch-main.c	Sat Sep 26 10:18:32 2020	(r550155)
@@ -0,0 +1,11 @@
+--- main.c.orig	2013-09-24 05:25:27 UTC
++++ main.c
+@@ -107,7 +107,7 @@ SDL_Surface *screen;
+ TTF_Font *font;
+ int lastmousex, lastmousey;
+ char *player_name;
+-int game_won;
++extern int game_won;
+ int state;
+ 
+ struct button_s {