Index: branches/2018Q3/games/openbor/Makefile
===================================================================
--- branches/2018Q3/games/openbor/Makefile	(revision 473786)
+++ branches/2018Q3/games/openbor/Makefile	(revision 473787)
@@ -1,106 +1,106 @@
 # $FreeBSD$
 
 PORTNAME=	openbor
 # Hint: svn revision is git rev-list --count ${GH_TAGNAME}
-PORTVERSION?=	6219
+PORTVERSION?=	6235
 .ifndef PKGNAMESUFFIX
 PORTREVISION=	0
 .endif
 CATEGORIES=	games
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Moddable fighting game engine (aka Beats of Rage)
 
 LICENSE=	BSD3CLAUSE GPLv2+
 .if ${PORTVERSION} >= 4134
 LICENSE+=	ISCL
 .endif
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE
 LICENSE_FILE_GPLv2+ =	${_LICENSE_STORE}/GPLv2 # source/gfxlib/hq2x.c
 LICENSE_FILE_ISCL=	${WRKSRC}/source/webmlib/nestegg/LICENSE
 
 LIB_DEPENDS=	libpng.so:graphics/png
 .if ${PORTVERSION} >= 4134
 LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
 .endif
 
 .ifdef PKGNAMESUFFIX
 PORTSCOUT=	ignore:1
 .endif
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DCurrent
-GH_TAGNAME?=	5005b966
+GH_TAGNAME?=	66ce9c7b
 
 USES+=		gmake pkgconfig
 .if ${PORTVERSION} < 4433
 USE_CSTD=	gnu89
 .endif
 .if ${PORTVERSION} < 4108
 USE_SDL=	gfx
 .else
 USE_SDL=	gfx2
 .endif
 WRKSRC_SUBDIR=	engine
 MAKE_ENV=	BUILD_LINUX=1 SDKPATH="${LOCALBASE}" \
 		GCC_TARGET="${CONFIGURE_TARGET:S/amd64/x86_64/}"
 MAKE_ARGS=	CC="${CC}" LIBRARIES="${LOCALBASE}/lib" \
 		TARGET_ARCH=${ARCH:S/i386/x86/} ARCHFLAGS="" \
 		TARGET_FINAL='${TARGET}' BUILD_MMX="" ECHO="${ECHO}"
 LDFLAGS+=	-Wl,--as-needed # ogg, pthread, zlib
 SUB_FILES=	pkg-message
 SUB_LIST=	PKGBASE=${PKGBASE}
 PLIST_FILES=	bin/${PKGBASE} \
 		share/pixmaps/${PKGBASE}.png
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 PORTDOCS=	README
 
 DESKTOP_ENTRIES="OpenBOR v3.0 Build ${PORTVERSION}" \
 		"" \
 		"${PKGBASE}" \
 		"${PKGBASE}" \
 		"Game;ArcadeGame;" \
 		""
 
 OPTIONS_DEFINE=		TREMOR
 OPTIONS_DEFAULT=	${MACHINE_CPU:Msoftfp:C/.+/TREMOR/}
 OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT_i386=	MMX # runtime detection
 
 MMX_BUILD_DEPENDS=	yasm:devel/yasm
 MMX_MAKE_ARGS=		BUILD_MMX=1
 
 TREMOR_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor
 TREMOR_MAKE_ARGS=	BUILD_TREMOR=1 BUILD_VORBIS=""
 TREMOR_LIB_DEPENDS_OFF=	libvorbisfile.so:audio/libvorbis
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/ -O[0-9]//; s/ -g//; s/ -Werror//' \
 		-e 's/ -fomit-frame-pointer//' \
 		-e 's/ -freorder-blocks//' \
 		-e 's/ -Wl,-rpath,$$(LIBRARIES)//' \
 		-e '/echo/!s/	@/	/' \
 		-e 's/@echo/@$$(ECHO)/' \
 		-e 's/$$(LIBS)/$$(LDFLAGS) &/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's/\.openbor/.${PKGBASE}/' \
 		${WRKSRC}/sdl/sdlport.c
 	@${GREP} -Flr 'malloc.h' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
 		's,malloc\.h,stdlib.h,'
 	@${REINPLACE_CMD} -e 's/^function \(.*\) {/\1() {/' \
 		-e 's/^get_revnum$$/VERSION_BUILD=${PORTVERSION}/' \
 		${WRKSRC}/version.sh
 
 do-configure:
 	(cd ${WRKSRC} && ${SH} ./version.sh)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/OpenBOR.elf \
 		${STAGEDIR}${PREFIX}/bin/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/resources/OpenBOR_Icon_128x128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PKGBASE}.png
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: branches/2018Q3/games/openbor/distinfo
===================================================================
--- branches/2018Q3/games/openbor/distinfo	(revision 473786)
+++ branches/2018Q3/games/openbor/distinfo	(revision 473787)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530229500
-SHA256 (DCurrent-openbor-6219-5005b966_GH0.tar.gz) = 8393eb2678a320fa38275363443a082a88992e515465df190caf6d72edb2185b
-SIZE (DCurrent-openbor-6219-5005b966_GH0.tar.gz) = 154353589
+TIMESTAMP = 1530539213
+SHA256 (DCurrent-openbor-6235-66ce9c7b_GH0.tar.gz) = 8e1b896e0e3c24fd44fb6a13a0e7c9c5ba8060a06257757f204bde18498309b4
+SIZE (DCurrent-openbor-6235-66ce9c7b_GH0.tar.gz) = 154356541
Index: branches/2018Q3/games/openbor/files/patch-sdl_video.c
===================================================================
--- branches/2018Q3/games/openbor/files/patch-sdl_video.c	(nonexistent)
+++ branches/2018Q3/games/openbor/files/patch-sdl_video.c	(revision 473787)
@@ -0,0 +1,17 @@
+Haptic isn't implemented on BSDs thus disabled by default
+
+--- sdl/video.c.orig	2018-07-02 13:46:53 UTC
++++ sdl/video.c
+@@ -46,7 +46,11 @@ int brightness = 0;
+ void initSDL()
+ {
+ 	SDL_DisplayMode video_info;
+-	int init_flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC;
++	int init_flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK;
++
++#ifndef SDL_HAPTIC_DISABLED
++	init_flags |= SDL_INIT_HAPTIC;
++#endif
+ 
+     /*#if EE_CURRENT_PLATFORM == EE_PLATFORM_WINDOWS
+        SDL_setenv("SDL_AUDIODRIVER", "directsound", true);

Property changes on: branches/2018Q3/games/openbor/files/patch-sdl_video.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 473786)
+++ branches/2018Q3	(revision 473787)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r473783