Index: head/www/davical/Makefile
===================================================================
--- head/www/davical/Makefile
+++ head/www/davical/Makefile
@@ -5,7 +5,6 @@
 DISTVERSIONPREFIX=	r
 DISTVERSION=	1.1.7
 CATEGORIES?=	www
-MASTER_SITES=	https://gitlab.com/${PORTNAME}-project/${PORTNAME}/repository/archive.tar.gz?ref=${DISTVERSIONPREFIX}${PORTVERSION}&dummy=/
 
 MAINTAINER=	lbdm@privacychain.ch
 COMMENT=	Simple CalDAV server using a postgres backend
@@ -18,17 +17,19 @@
 		p5-DBI>=0:databases/p5-DBI \
 		p5-YAML>=0:textproc/p5-YAML \
 		php-libawl>=0.54:devel/php-libawl \
-		${LOCALBASE}/bin/pwgen:sysutils/pwgen
+		pwgen:sysutils/pwgen
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}-05397d635c3f218b850775223aa5dd705da9f91c
-
 USES=		pgsql php shebangfix
+USE_GITLAB=	yes
+GL_ACCOUNT=	davical-project
+GL_COMMIT=	05397d635c3f218b850775223aa5dd705da9f91c
 USE_PHP=	calendar curl gettext iconv pcre pdo pdo_pgsql pgsql xml
 SHEBANG_FILES=	scripts/sync-remote-caldav.php
 SUB_FILES=	pkg-message httpd-davical.conf
 PORTDOCS=	README INSTALL davical_en_user_guide.odt phpdoc.ini \
 		translation.rst
 PORTEXAMPLES=	config
+NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
@@ -40,9 +41,7 @@
 	${MKDIR} ${STAGEDIR}${WWWDIR}/htdocs \
 		${STAGEDIR}${WWWDIR}/inc \
 		${STAGEDIR}${WWWDIR}/config \
-		${STAGEDIR}${EXAMPLESDIR} \
-		${STAGEDIR}${DATADIR} \
-		${STAGEDIR}${DOCSDIR}
+		${STAGEDIR}${DATADIR}
 	# WWWDIR
 	(cd ${WRKSRC}/htdocs && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/htdocs)
@@ -57,12 +56,16 @@
 	${INSTALL_DATA} ${WRKDIR}/httpd-davical.conf ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/dba/update-davical-database \
 		${STAGEDIR}${DATADIR}/dba
-	# DOCSDIR
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
-	# EXAMPLESDIR
+
+do-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} config ${STAGEDIR}${EXAMPLESDIR})
 
Index: head/www/davical/distinfo
===================================================================
--- head/www/davical/distinfo
+++ head/www/davical/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517689282
-SHA256 (davical-r1.1.7.tar.gz) = 7edcefc27df923bc92713a2b955d5c1507b9271afa630c6b1c4ad295cdd9ba18
-SIZE (davical-r1.1.7.tar.gz) = 1818904
+TIMESTAMP = 1520958401
+SHA256 (davical-project-davical-05397d635c3f218b850775223aa5dd705da9f91c_GL0.tar.gz) = 6fa4f141c44cdd2753ab01687f4ba51004603fd9456587593601b645b8411f06
+SIZE (davical-project-davical-05397d635c3f218b850775223aa5dd705da9f91c_GL0.tar.gz) = 1817957