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.20
retrieving revision 1.28
diff -u -p -r1.20 -r1.28
--- pkgsrc/www/davical/Makefile	2014/05/29 23:37:57	1.20
+++ pkgsrc/www/davical/Makefile	2016/07/09 06:39:11	1.28
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2014/05/29 23:37:57 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2016/07/09 06:39:11 wiz Exp $
 #
 
 DISTNAME=	davical-${DAVICAL_VERSION}
-DAVICAL_VERSION=1.1.1
-PKGREVISION=	5
+DAVICAL_VERSION=1.1.3.1
+PKGREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	http://debian.mcmillan.net.nz/packages/davical/
+MASTER_SITES=	-https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=r${DAVICAL_VERSION}
 
 MAINTAINER=	jym@NetBSD.org
 HOMEPAGE=	http://www.davical.org/
@@ -34,9 +34,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
@@ -63,7 +65,8 @@ REPLACE_PERL=		dba/update-davical-databa
 REPLACE_INTERPRETER+=	php
 REPLACE.php.old=	.*php
 REPLACE.php.new=	${PREFIX}/bin/php
-REPLACE_FILES.php=	scripts/cron-sync-ldap.php
+REPLACE_FILES.php=	scripts/archive-old-events.php
+REPLACE_FILES.php+=	scripts/cron-sync-ldap.php
 REPLACE_FILES.php+=	scripts/export_calendar.php
 REPLACE_FILES.php+=	scripts/load_calendar.php
 REPLACE_FILES.php+=	scripts/refresh-alarms.php
@@ -99,10 +102,13 @@ SUBST_SED.files+=	-e "s|@DAVICALDIR@|${D
 SUBST_MESSAGE.files=	Fixing DAViCal configuration file for Apache.
 
 post-extract:
+	${MV} ${WRKDIR}/davical-r${DAVICAL_VERSION}-* \
+		${WRKDIR}/davical-${DAVICAL_VERSION}
 	${CP} ${FILESDIR}/davical.conf ${WRKSRC}/davical.conf
 
 pre-install:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+	${FIND} ${WRKSRC} -name ".gitignore" -print | ${XARGS} ${RM} -f
 	${FIND} ${WRKSRC}/po -name "*~" -print | ${XARGS} ${RM} -f
 
 do-install: