4 files changed, 9 insertions, 100 deletions

diff --git a/games/ags/Makefile b/games/ags/Makefile
index 4bfb47403ef1..856281033f5a 100644
--- a/games/ags/Makefile
+++ b/games/ags/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ags
-DISTVERSION=	3.4.3.0
+DISTVERSION=	3.4.3.1
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/adventuregamestudio/ags/releases/download/v.${DISTVERSION}/
 DISTNAME=	ags_linux_v.${DISTVERSION}
diff --git a/games/ags/distinfo b/games/ags/distinfo
index 5a2739d8f4f5..9be321e526d3 100644
--- a/games/ags/distinfo
+++ b/games/ags/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549378770
-SHA256 (ags_linux_v.3.4.3.0.tar.xz) = 7dae922a94efbe31f70a212b7788d8f8e7073f115e040b1869032b469068912c
-SIZE (ags_linux_v.3.4.3.0.tar.xz) = 864832
+TIMESTAMP = 1549983279
+SHA256 (ags_linux_v.3.4.3.1.tar.xz) = 9f8cbc19acaa95ca841eb02adcca2bb3ba64ec777ac00ba3c50a44fb8c081620
+SIZE (ags_linux_v.3.4.3.1.tar.xz) = 864688
diff --git a/games/ags/files/patch-Engine_Makefile-defs.linux b/games/ags/files/patch-Engine_Makefile-defs.linux
index 325d9f0a29b4..441f5a06260d 100644
--- a/games/ags/files/patch-Engine_Makefile-defs.linux
+++ b/games/ags/files/patch-Engine_Makefile-defs.linux
@@ -1,24 +1,13 @@
---- Engine/Makefile-defs.linux.orig	2017-02-07 22:37:22 UTC
+--- Engine/Makefile-defs.linux.orig	2019-02-12 12:39:10 UTC
 +++ Engine/Makefile-defs.linux
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
  INCDIR = ../Engine ../Common ../Common/libinclude ../Plugins
  LIBDIR =
--CFLAGS := -O2 -g -fsigned-char -Wfatal-errors -DNDEBUG -DAGS_RUNTIME_PATCH_ALLEGRO -DAGS_HAS_CD_AUDIO -DAGS_CASE_SENSITIVE_FILESYSTEM -DALLEGRO_STATICLINK -DLINUX_VERSION -DDISABLE_MPEG_AUDIO -DBUILTIN_PLUGINS -DRTLD_NEXT $(shell pkg-config --cflags freetype2) $(CFLAGS)
--CXXFLAGS := -fno-rtti -Wno-write-strings $(CXXFLAGS)
-+CFLAGS += -fsigned-char -Wfatal-errors -DNDEBUG -DAGS_RUNTIME_PATCH_ALLEGRO -DAGS_CASE_SENSITIVE_FILESYSTEM -DALLEGRO_STATICLINK -DLINUX_VERSION -DDISABLE_MPEG_AUDIO -DBUILTIN_PLUGINS -DRTLD_NEXT $(shell pkg-config --cflags freetype2)
-+CXXFLAGS += -std=c++11 -fno-rtti -Wno-write-strings
+-CFLAGS := -O2 -g -fsigned-char -Wfatal-errors -DNDEBUG -DALLEGRO_NO_FIX_ALIASES -DAGS_RUNTIME_PATCH_ALLEGRO -DAGS_HAS_CD_AUDIO -DAGS_CASE_SENSITIVE_FILESYSTEM -DALLEGRO_STATICLINK -DLINUX_VERSION -DDISABLE_MPEG_AUDIO -DBUILTIN_PLUGINS -DRTLD_NEXT $(shell pkg-config --cflags freetype2) $(CFLAGS)
++CFLAGS := -O2 -fsigned-char -Wfatal-errors -DNDEBUG -DALLEGRO_NO_FIX_ALIASES -DAGS_RUNTIME_PATCH_ALLEGRO -DAGS_CASE_SENSITIVE_FILESYSTEM -DALLEGRO_STATICLINK -DLINUX_VERSION -DDISABLE_MPEG_AUDIO -DBUILTIN_PLUGINS -DRTLD_NEXT $(shell pkg-config --cflags freetype2) $(CFLAGS)
+ CXXFLAGS := -fno-rtti -Wno-write-strings $(CXXFLAGS)
  LIBS := -rdynamic -laldmb -ldumb -Wl,-Bdynamic
  LIBS += $(shell pkg-config --libs allegro)
- LIBS += $(shell pkg-config --libs x11)
-@@ -16,7 +16,7 @@ else
- endif
- LIBS += $(shell pkg-config --libs vorbisfile)
- LIBS += $(shell pkg-config --libs freetype2)
--LIBS += -ldl -lpthread -lc -lm -lstdc++
-+LIBS += -lpthread -lc -lm -lstdc++
- 
- ifeq ($(ALLEGRO_MAGIC_DRV), 1)
-   CFLAGS += -DALLEGRO_MAGIC_DRV
 @@ -44,4 +44,4 @@ platform/linux/acpllnx.cpp \
  platform/util/pe.c \
  platform/util/libc.c
diff --git a/games/ags/files/patch-allegro-4.4.3 b/games/ags/files/patch-allegro-4.4.3
deleted file mode 100644
index 8bd45b462cdd..000000000000
--- a/games/ags/files/patch-allegro-4.4.3
+++ /dev/null
@@ -1,80 +0,0 @@
-Fix build with Allegro 4.4.3 which remove the f* function aliases
-
-https://github.com/adventuregamestudio/ags/commit/44d954493bb5f3e95a11a4eddbb62bd6110b1b63.patch
-https://github.com/adventuregamestudio/ags/commit/575db9426239d37e3e6692c7e1848554cb9902f9.patch
-
---- Common/gfx/allegrobitmap.h.orig	2018-09-10 19:17:48 UTC
-+++ Common/gfx/allegrobitmap.h
-@@ -20,6 +20,7 @@
- //=============================================================================
- #ifndef __AGS_CN_GFX__ALLEGROBITMAP_H
- #define __AGS_CN_GFX__ALLEGROBITMAP_H
-+#define ALLEGRO_NO_FIX_ALIASES
- 
- #include <allegro.h>
- #include "core/types.h"
---- Common/libsrc/aastr-0.1.1/AAROT.c.orig	2018-09-10 19:17:48 UTC
-+++ Common/libsrc/aastr-0.1.1/AAROT.c
-@@ -71,8 +71,8 @@ _aa_rotate_bitmap (BITMAP *_src, BITMAP *_dst, int _x,
-   /* Width and height of source and destination.  */
-   sw = _src->w;
-   sh = _src->h;
--  fdw = fmul (ABS (_scalex), itofix (sw));
--  fdh = fmul (ABS (_scaley), itofix (sh));
-+  fdw = fixmul (ABS (_scalex), itofix (sw));
-+  fdh = fixmul (ABS (_scaley), itofix (sh));
-   dw = fixtoi (fdw);
-   dh = fixtoi (fdh);
-   if ((dw <= 0) || (dh <= 0))
-@@ -85,14 +85,14 @@ _aa_rotate_bitmap (BITMAP *_src, BITMAP *_dst, int _x,
-   fx0 = itofix (_x);
-   fy0 = itofix (_y);
- 
--  fsinangle = fsin (_angle);
--  fcosangle = fcos (_angle);
-+  fsinangle = fixsin (_angle);
-+  fcosangle = fixcos (_angle);
- 
-   /* Map source (half) edges onto destination.  */
--  fux = fmul (fdw, fcosangle);
--  fuy = fmul (fdw, fsinangle);
--  fvx = -fmul (fdh, fsinangle);
--  fvy = fmul (fdh, fcosangle);
-+  fux = fixmul (fdw, fcosangle);
-+  fuy = fixmul (fdw, fsinangle);
-+  fvx = -fixmul (fdh, fsinangle);
-+  fvy = fixmul (fdh, fcosangle);
- 
-   /* Coordinates of corners in destination.  */
-   point[0].dx = fixtoi (fx0 - fux - fvx);
---- Common/util/wgt2allg.h.orig	2018-09-10 19:17:48 UTC
-+++ Common/util/wgt2allg.h
-@@ -26,6 +26,7 @@
- #ifdef USE_ALLEGRO3
- #include <allegro3.h>
- #else
-+#define ALLEGRO_NO_FIX_ALIASES
- #include "allegro.h"
- #endif
- 
---- Engine/ac/route_finder.cpp.orig	2018-09-10 19:17:48 UTC
-+++ Engine/ac/route_finder.cpp
-@@ -683,15 +683,15 @@ void calculate_move_stage(MoveList * mlsp, int aaa)
-     }
-   }
- 
--  fixed angl = fatan(fdiv(ydist, xdist));
-+  fixed angl = fixatan(fixdiv(ydist, xdist));
- 
-   // now, since new opp=hyp*sin, work out the Y step size
-   //fixed newymove = useMoveSpeed * fsin(angl);
--  fixed newymove = fixmul(useMoveSpeed, fsin(angl));
-+  fixed newymove = fixmul(useMoveSpeed, fixsin(angl));
- 
-   // since adj=hyp*cos, work out X step size
-   //fixed newxmove = useMoveSpeed * fcos(angl);
--  fixed newxmove = fixmul(useMoveSpeed, fcos(angl));
-+  fixed newxmove = fixmul(useMoveSpeed, fixcos(angl));
- 
-   if (destx < ourx)
-     newxmove = -newxmove;