Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/www/davical/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/www/davical/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.24
retrieving revision 1.33
diff -u -p -r1.24 -r1.33
--- pkgsrc/www/davical/Makefile	2015/11/16 13:13:30	1.24
+++ pkgsrc/www/davical/Makefile	2017/12/07 13:00:33	1.33
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.24 2015/11/16 13:13:30 hauke Exp $
-#
+# $NetBSD: Makefile,v 1.33 2017/12/07 13:00:33 hauke Exp $
 
 DISTNAME=	davical-${DAVICAL_VERSION}
-DAVICAL_VERSION=1.1.3.1
-#PKGREVISION=	1
+PKGNAME=	${PHP_PKG_PREFIX}-davical-${DAVICAL_VERSION}
 CATEGORIES=	www
-MASTER_SITES=	-https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=r${DAVICAL_VERSION}
-
-FETCH_USING=	wget
+MASTER_SITES=	-https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=${GITLAB_TAG}
 
 MAINTAINER=	jym@NetBSD.org
-HOMEPAGE=	http://www.davical.org/
+HOMEPAGE=	https://www.davical.org/
 COMMENT=	Simple CalDAV server using a PostgreSQL backend
-
 LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3
 
+DAVICAL_VERSION=1.1.6
+GITLAB_TAG=	r${DAVICAL_VERSION}
+GITLAB_REV=	3ba605288fb0fc0a4f2abce09874f8dab5ffdfb8
+
 DAVICALDIR=	${PREFIX}/share/davical
 EGDIR=		${PREFIX}/share/examples/davical
 DOCDIR=		${PREFIX}/share/doc/davical
@@ -25,7 +24,7 @@ BUILD_DEFS=	APACHE_USER APACHE_GROUP PGU
 DAVICAL_USER?=	${PGUSER}
 DAVICAL_GROUP?=	${PGGROUP}
 
-USE_TOOLS=	gmake pax msgfmt perl:build
+USE_TOOLS=	gmake pax msgfmt perl
 
 PAXDIRS=	htdocs inc dba po scripts
 
@@ -36,9 +35,11 @@ INSTALLATION_DIRS=	${DOCDIR} ${EGDIR}/co
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2:../../www/ap-php
 DEPENDS+=	${PHP_PKG_PREFIX}-pgsql>=4.3.1:../../databases/php-pgsql
 DEPENDS+=	${PHP_PKG_PREFIX}-pdo_pgsql>=${PHP_BASE_VERS}:../../databases/php-pdo_pgsql
-DEPENDS+=	${PHP_PKG_PREFIX}-libawl>=0.53:../../devel/php-libawl
+DEPENDS+=	${PHP_PKG_PREFIX}-libawl>=0.56:../../devel/php-libawl
 DEPENDS+=	${PHP_PKG_PREFIX}-calendar>=5.3.18:../../time/php-calendar
 DEPENDS+=	${PHP_PKG_PREFIX}-curl>=5.3.18:../../www/php-curl
+DEPENDS+=	p5-DBI>=1.631:../../databases/p5-DBI
+DEPENDS+=	p5-DBD-postgresql>=3.5:../../databases/p5-DBD-postgresql
 DEPENDS+=	p5-YAML>=0.71:../../textproc/p5-YAML
 DEPENDS+=	pwgen>=2.06:../../sysutils/pwgen
 DEPENDS+=	postgresql${PGSQL_VERSION}-client-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-client
@@ -60,7 +61,7 @@ CONF_FILES_PERMS+=	${EGDIR}/config/examp
 			${PKG_SYSCONFDIR}/config.php		\
 			${APACHE_USER} ${APACHE_GROUP} 0640
 
-REPLACE_PERL=		dba/update-davical-database
+REPLACE_PERL=		dba/update-davical-database scripts/davical-cli
 
 REPLACE_INTERPRETER+=	php
 REPLACE.php.old=	.*php
@@ -87,6 +88,7 @@ SUBST_FILES.inc-path=	davical.conf inc/a
 SUBST_FILES.inc-path+=	scripts/po/rebuild-translations.sh
 SUBST_FILES.inc-path+=	dba/create-database.sh
 SUBST_SED.inc-path+=	-e "s|@LIBAWLPATH@|${PREFIX}/${LIBAWLDIR}|g"
+SUBST_SED.inc-path+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.inc-path=	Fixing AWL include path.
 
 SUBST_CLASSES+=		examples
@@ -101,9 +103,8 @@ SUBST_FILES.files=	davical.conf
 SUBST_SED.files+=	-e "s|@DAVICALDIR@|${DAVICALDIR}|g"
 SUBST_MESSAGE.files=	Fixing DAViCal configuration file for Apache.
 
-post-extract:
-	${MV} ${WRKDIR}/davical-r${DAVICAL_VERSION}-* \
-		${WRKDIR}/davical-${DAVICAL_VERSION}
+pre-patch:
+	${MV} ${WRKDIR}/davical-${GITLAB_TAG}-${GITLAB_REV} ${WRKSRC}
 	${CP} ${FILESDIR}/davical.conf ${WRKSRC}/davical.conf
 
 pre-install: