Fix build with clang 6.0.0.

PR:		226179

3 files changed, 33 insertions, 8 deletions

diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile
index 1b398fb6d457..d8ef0617b9ec 100644
--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	milkytracker
 PORTVERSION=	1.02.00
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -28,13 +29,6 @@ OPTIONS_DEFINE=	DOCS
 BROKEN_powerpc=		Does not build on powerpc
 BROKEN_powerpc64=	Does not build on powerpc64
 
-.include <bsd.port.pre.mk>
-
-# does not compile with clang 6.0.0
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200056
-USE_GCC=	yes
-.endif
-
 post-install:
 .for f in ${ICONS}
 	${INSTALL_DATA} ${WRKSRC}/resources/pictures/${f} \
@@ -46,4 +40,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/milkytracker/files/patch-src_tracker_EQConstants.cpp b/audio/milkytracker/files/patch-src_tracker_EQConstants.cpp
new file mode 100644
index 000000000000..7a10a3158d9c
--- /dev/null
+++ b/audio/milkytracker/files/patch-src_tracker_EQConstants.cpp
@@ -0,0 +1,11 @@
+--- src/tracker/EQConstants.cpp.orig	2018-02-24 17:43:23 UTC
++++ src/tracker/EQConstants.cpp
+@@ -23,7 +23,7 @@
+ #include "EQConstants.h"
+ #include "math.h"
+ 
+-#define p(e) ldexp(0x10558, e-4*4)
++#define p(e) ldexp(66904.0f, e-4*4)
+ 
+ const float EQConstants::EQ3bands[3] = 
+ {
diff --git a/audio/milkytracker/files/patch-src_tracker_sdl_SDL__Main.cpp b/audio/milkytracker/files/patch-src_tracker_sdl_SDL__Main.cpp
new file mode 100644
index 000000000000..a03cf92da4eb
--- /dev/null
+++ b/audio/milkytracker/files/patch-src_tracker_sdl_SDL__Main.cpp
@@ -0,0 +1,20 @@
+--- src/tracker/sdl/SDL_Main.cpp.orig	2018-02-24 17:43:23 UTC
++++ src/tracker/sdl/SDL_Main.cpp
+@@ -609,7 +609,7 @@ void translateKeyDownEvent(const SDL_Eve
+ 	printf ("DEBUG: Key pressed: VK: %d, SC: %d, Scancode: %d\n", toVK(keysym), toSC(keysym), keysym.sym);
+ #endif
+ 
+-	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
++	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), static_cast<pp_uint16> (keysym.sym)};
+ 
+ 	PPEvent myEvent(eKeyDown, &chr, sizeof(chr));
+ 	RaiseEventSerialized(&myEvent);
+@@ -621,7 +621,7 @@ void translateKeyUpEvent(const SDL_Event
+ 
+ 	preTranslateKey(keysym);
+ 
+-	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), keysym.sym};
++	pp_uint16 chr[3] = {toVK(keysym), toSC(keysym), static_cast<pp_uint16> (keysym.sym)};
+ 
+ 	PPEvent myEvent(eKeyUp, &chr, sizeof(chr));
+ 	RaiseEventSerialized(&myEvent);