Index: branches/2017Q2/games/openbor/Makefile
===================================================================
--- branches/2017Q2/games/openbor/Makefile	(revision 438829)
+++ branches/2017Q2/games/openbor/Makefile	(revision 438830)
@@ -1,114 +1,82 @@
 # $FreeBSD$
 
 PORTNAME=	openbor
 PORTVERSION=	3.0.r4432
 CATEGORIES=	games
-MASTER_SITES=	LOCAL/jbeich \
-		https://svn.code.sf.net/p/${PORTNAME}/engine/engine/:svn
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Moddable fighting game engine (aka Beats of Rage)
 
 LICENSE=	BSD3CLAUSE GPLv2+ ISCL
 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 \
 		libvpx.so:multimedia/libvpx
 
-USES=		gmake pkgconfig tar:xz
+USE_GITHUB=	yes
+GH_ACCOUNT=	DCurrent
+GH_TAGNAME=	ba1eb4f # git v4432 is actually svn r4437
+
+USES=		gmake pkgconfig
 USE_CSTD=	gnu89
 USE_SDL=	gfx2
+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
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
 PORTDOCS=	README
 
 DESKTOP_ENTRIES="OpenBOR" \
 		"" \
 		"${PORTNAME}" \
 		"${PORTNAME}" \
 		"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
 
-.include <bsd.port.options.mk>
-
-#
-# To update snapshot: make makesum BOOTSTRAP=
-# Specific snapshot:  make makesum SVN_FETCH= PORTVERSION=1.0.r1234
-#
-.if defined(BOOTSTRAP)
-SVN_REV!=	svn info ${MASTER_SITES:M*\:svn:S/:svn//} | \
-		${SED} -n 's/^Last Changed Rev: //p'
-PORTVERSION:=	${PORTVERSION:R}.r${SVN_REV}
-.else
-SVN_REV?=	${PORTVERSION:E:S/r//}
-.endif
-
-.if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+=	svn:devel/subversion
-
-NO_CHECKSUM=	yes
-
-do-fetch:
-	${MKDIR} ${WRKDIR}
-	svn export -r${SVN_REV} ${_MASTER_SITES_svn} ${WRKSRC}
-	(cd ${WRKDIR} && ${TAR} cJvf \
-		${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		--uid 0 --gid 0 ${DISTNAME})
-. ifmake makesum
-	${REINPLACE_CMD} -i '' '/^PORTVERSION=/s/r.*/r${SVN_REV}/' \
-		${MASTERDIR}/Makefile
-. endif
-. if ${USER} == ${MAINTAINER:C/@.*//}
-	-scp ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		freefall.freebsd.org:public_distfiles/
-. endif
-.endif
-
 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
 	@${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=${SVN_REV}/' \
+		-e 's/^get_revnum$$/VERSION_BUILD=${PORTVERSION:E:S/^r//}/' \
 		${WRKSRC}/version.sh
 
 do-configure:
 	(cd ${WRKSRC} && ${SH} ./version.sh)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/OpenBOR.elf \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/resources/OpenBOR_Icon_128x128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: branches/2017Q2/games/openbor/distinfo
===================================================================
--- branches/2017Q2/games/openbor/distinfo	(revision 438829)
+++ branches/2017Q2/games/openbor/distinfo	(revision 438830)
@@ -1,3 +1,3 @@
 TIMESTAMP = 1485387608
-SHA256 (openbor-3.0.r4432.tar.xz) = 14215dca007f0300c281aa020bf8d79f65d58155b4e9705319d26bc5a9027199
-SIZE (openbor-3.0.r4432.tar.xz) = 3944096
+SHA256 (DCurrent-openbor-3.0.r4432-ba1eb4f_GH0.tar.gz) = 0c26130127d1ec1d98c6c5e68b38a11df3e405ed7e43b7c61762f6ae862538c5
+SIZE (DCurrent-openbor-3.0.r4432-ba1eb4f_GH0.tar.gz) = 6087650
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 438829)
+++ branches/2017Q2	(revision 438830)

Property changes on: branches/2017Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r438658