Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 10 Dec 2020 00:09:09 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r557391 - in head/games/hedgewars: . files
Message-ID:  <202012100009.0BA099Ym031430@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: amdmi3
Date: Thu Dec 10 00:09:09 2020
New Revision: 557391
URL: https://svnweb.freebsd.org/changeset/ports/557391

Log:
  Fix multiple build issues after fpc update to 3.2.0
  
  - Fix compiler crash
  - Fix incorrect linker path used by fpc
  - Fix linking with incorrect lua library

Added:
  head/games/hedgewars/files/patch-hedgewars_uWorld.pas   (contents, props changed)
Modified:
  head/games/hedgewars/Makefile

Modified: head/games/hedgewars/Makefile
==============================================================================
--- head/games/hedgewars/Makefile	Wed Dec  9 23:32:37 2020	(r557390)
+++ head/games/hedgewars/Makefile	Thu Dec 10 00:09:09 2020	(r557391)
@@ -39,6 +39,8 @@ PLIST_FILES=	bin/${PORTNAME} bin/hwengine \
 PORTDATA=	*
 
 USE_LOCALE=	en_US.UTF-8
+MAKE_ENV=	LOCALBASE="${LOCALBASE}"  # fpc issue https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=251712
+CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"  # fpc issue https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=251712
 
 OPTIONS_DEFINE=	VIDEOREC
 OPTIONS_DEFAULT=VIDEOREC
@@ -59,6 +61,8 @@ BUILD_DEPENDS+=	ghc:lang/ghc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/cmake_modules/*.cmake
+	@${REINPLACE_CMD} -e "s|'liblua'|'liblua-${LUA_VER}'|" ${WRKSRC}/hedgewars/LuaPas.pas
+	@${REINPLACE_CMD} -e "/linklib/ s|lua|&-${LUA_VER}|" ${WRKSRC}/hedgewars/LuaPas.pas
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*

Added: head/games/hedgewars/files/patch-hedgewars_uWorld.pas
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/hedgewars/files/patch-hedgewars_uWorld.pas	Thu Dec 10 00:09:09 2020	(r557391)
@@ -0,0 +1,19 @@
+--- hedgewars/uWorld.pas.orig	2019-10-07 12:29:22 UTC
++++ hedgewars/uWorld.pas
+@@ -1126,11 +1126,13 @@ end;
+ 
+ var preShiftWorldDx: LongInt;
+ 
+-procedure ShiftWorld(Dir: LongInt); inline;
++procedure ShiftWorld(Dir: LongInt);
++var
++    tmp: LongInt;
+ begin
+     preShiftWorldDx:= WorldDx;
+-    WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth));
+-
++    tmp := LongInt(Dir * LongInt(playWidth));
++    WorldDx := WorldDx + tmp;
+ end;
+ 
+ procedure UnshiftWorld(); inline;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012100009.0BA099Ym031430>