Index: head/games/open-adventure/Makefile
===================================================================
--- head/games/open-adventure/Makefile	(revision 523847)
+++ head/games/open-adventure/Makefile	(revision 523848)
@@ -1,39 +1,34 @@
 # Created by: Stefan Esser <se@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	open-adventure
 PORTVERSION=	1.4
 CATEGORIES=	games
-MASTER_SITES=	https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/repository/archive${EXTRACT_SUFX}?ref=${GL_COMMIT};/
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Modernized version of the original Colossal Cave Adventure game
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/yaml/__init__.py:devel/py-yaml \
+BUILD_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
 		a2x:textproc/asciidoc
 
-ALL_TARGET=	advent
-MAKE_ENV=	CCFLAGS="${CFLAGS}"
-
 USES=		gmake pkgconfig libedit python:build
-#USE_GITLAB=	yes # When USE_GITLAB has become available, MASTER_SITES and WRKSRC should be obsolete
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${GL_COMMIT}-${GL_COMMIT}
-
+USE_GITLAB=	yes
 GL_ACCOUNT=	esr
 GL_PROJECT=	${PORTNAME}
 GL_COMMIT=	d51238481a6a752adc8ad4d8893209d13bb7ea91
 
+ALL_TARGET=	advent
+MAKE_ENV=	CCFLAGS="${CFLAGS}"
+
 PLIST_FILES=	bin/advent man/man6/advent.6.gz
 
 pre-build:
 		cd ${WRKSRC}; ${PYTHON_CMD} make_dungeon.py; a2x -f manpage advent.adoc
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/advent ${STAGEDIR}${PREFIX}/bin
-		#${MKDIR} ${STAGEDIR}${MANPREFIX}/man/man6
 		${INSTALL_MAN} ${WRKSRC}/advent.6 ${STAGEDIR}${MANPREFIX}/man/man6
 
 .include <bsd.port.mk>
Index: head/games/open-adventure/distinfo
===================================================================
--- head/games/open-adventure/distinfo	(revision 523847)
+++ head/games/open-adventure/distinfo	(revision 523848)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508308584
-SHA256 (open-adventure-1.4.tar.gz) = 1ad9246f6b34c6dc5affff908932eaf8d76e62d60a5b871edaedd1ab4f588eed
-SIZE (open-adventure-1.4.tar.gz) = 421941
+TIMESTAMP = 1530935285
+SHA256 (esr-open-adventure-d51238481a6a752adc8ad4d8893209d13bb7ea91_GL0.tar.gz) = 1ad9246f6b34c6dc5affff908932eaf8d76e62d60a5b871edaedd1ab4f588eed
+SIZE (esr-open-adventure-d51238481a6a752adc8ad4d8893209d13bb7ea91_GL0.tar.gz) = 421941