Index: head/devel/gitlab-runner/Makefile
===================================================================
--- head/devel/gitlab-runner/Makefile	(revision 467542)
+++ head/devel/gitlab-runner/Makefile	(revision 467543)
@@ -1,76 +1,74 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-runner
-PORTVERSION=	10.4.0
+PORTVERSION=	10.6.0
 CATEGORIES=	devel
 MASTER_SITES=	\
-		https://gitlab.com/gitlab-org/gitlab-runner/repository/archive.tar.bz2?ref=v${PORTVERSION}&dummy=/ \
 		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
 		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm
 DISTFILES=	\
-		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		prebuilt-x86_64.tar.xz:dockerx64 \
 		prebuilt-arm.tar.xz:dockerarm
 DIST_SUBDIR=	gitlab-runner
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Official GitLab Runner written in Go
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	go:lang/go \
 		go-bindata:devel/go-bindata
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		bash:shells/bash \
 		git:devel/git
 
-USES=		tar:bz2
-GITHASH=	857480b64b013d8edffaf70e4b7ea43ee1c66a9e
-GITREV=		857480b6
-GITBRANCH=	10-4-stable
-BUILT=		2018-01-22T09:48:29-00:00
+USE_GITLAB=	yes
+GL_ACCOUNT=	gitlab-org
+GL_COMMIT=	a3543a275e3f9555da06041c501429d1f4aeef2d
+GITREV=		a3543a27
+GITBRANCH=	10-6-stable
+BUILT=		2018-03-22T08:33:57+00:00
 
-WRKSRC=		${WRKDIR}/gitlab-runner-v${PORTVERSION}-${GITHASH}
 GO_LDFLAGS=	-X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=${PORTVERSION} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.REVISION=${GITREV} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.BUILT=${BUILT} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.BRANCH=${GITBRANCH} \
 		-s -w
 
 PLIST_FILES=	bin/gitlab-runner
 
 USE_RC_SUBR=	gitlab_runner
 
 USERS=		gitlab-runner
 GROUPS=		gitlab-runner
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/
 
 do-build:
 	@cd ${WRKSRC} && go-bindata \
 		-pkg docker \
 		-nocompress \
 		-nomemcopy \
 		-nometadata \
 		-prefix out/docker/ \
 		-o executors/docker/bindata.go \
 		out/docker/prebuilt-x86_64.tar.xz \
 		out/docker/prebuilt-arm.tar.xz
 	@cd ${WRKSRC} && go fmt executors/docker/bindata.go
 	@${MV} ${WRKSRC}/vendor ${WRKSRC}/src
 	@${MKDIR} ${WRKSRC}/src/gitlab.com/gitlab-org
 	@${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-runner
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build \
 			-ldflags="${GO_LDFLAGS}" \
 			-o gitlab-runner
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gitlab-runner ${STAGEDIR}${PREFIX}/bin/gitlab-runner
 
 .include <bsd.port.mk>
Index: head/devel/gitlab-runner/distinfo
===================================================================
--- head/devel/gitlab-runner/distinfo	(revision 467542)
+++ head/devel/gitlab-runner/distinfo	(revision 467543)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1516848052
-SHA256 (gitlab-runner/gitlab-runner-10.4.0.tar.bz2) = c90cd974c228455b27cabd140c22fa67017f14f420d5e432d1db07b36f4acc14
-SIZE (gitlab-runner/gitlab-runner-10.4.0.tar.bz2) = 2649565
-SHA256 (gitlab-runner/prebuilt-x86_64.tar.xz) = aef8c07f2632bc9973e643658613d1b781508c7a98f6ae9ba5a55eaa786b3724
-SIZE (gitlab-runner/prebuilt-x86_64.tar.xz) = 10479600
-SHA256 (gitlab-runner/prebuilt-arm.tar.xz) = 7a9d57b10e85202fef978c4bcba8f157f25123d5da481a765a87590a35b91c4d
-SIZE (gitlab-runner/prebuilt-arm.tar.xz) = 8558028
+TIMESTAMP = 1523913375
+SHA256 (gitlab-runner/prebuilt-x86_64.tar.xz) = 2825b08a152e933188233471ecdc4f10a2e106c2675ebdd2def46966e78431f8
+SIZE (gitlab-runner/prebuilt-x86_64.tar.xz) = 9694232
+SHA256 (gitlab-runner/prebuilt-arm.tar.xz) = b081746b1574e992db0fada9202b0ef7cedec6357b2afbec0f2a5fee635dcf66
+SIZE (gitlab-runner/prebuilt-arm.tar.xz) = 9091192
+SHA256 (gitlab-runner/gitlab-org-gitlab-runner-a3543a275e3f9555da06041c501429d1f4aeef2d_GL0.tar.gz) = 61bce5fe1e482b1af0484049cc5f318cea9fc58dae89d63f7881ba2aa013b593
+SIZE (gitlab-runner/gitlab-org-gitlab-runner-a3543a275e3f9555da06041c501429d1f4aeef2d_GL0.tar.gz) = 29296651