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.14
retrieving revision 1.37
diff -u -p -r1.14 -r1.37
--- pkgsrc/www/davical/Makefile	2012/08/15 20:23:08	1.14
+++ pkgsrc/www/davical/Makefile	2019/08/11 13:24:18	1.37
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.14 2012/08/15 20:23:08 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.37 2019/08/11 13:24:18 wiz Exp $
 
 DISTNAME=	davical-${DAVICAL_VERSION}
-DAVICAL_VERSION=1.1.1
+PKGNAME=	${PHP_PKG_PREFIX}-davical-${DAVICAL_VERSION}
+PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://debian.mcmillan.net.nz/packages/davical/
+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
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+DAVICAL_VERSION=1.1.8
+GITLAB_TAG=	r${DAVICAL_VERSION}
+GITLAB_REV=	4af9595f4d0530268ac1289ba4ab2adb4890802e
 
 DAVICALDIR=	${PREFIX}/share/davical
 EGDIR=		${PREFIX}/share/examples/davical
@@ -24,7 +26,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
 
@@ -35,7 +37,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
@@ -57,12 +63,13 @@ 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
 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
@@ -71,14 +78,15 @@ REPLACE_FILES.php+=	scripts/tz-update.ph
 
 SUBST_CLASSES+=		conf-path
 SUBST_STAGE.conf-path=	pre-configure
+SUBST_VARS.conf-path+=	PKG_SYSCONFDIR
 SUBST_FILES.conf-path=	inc/always.php.in dba/update-davical-database
 SUBST_FILES.conf-path+=	inc/davical_configuration_missing.php
-SUBST_SED.conf-path+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.conf-path=Fixing configuration path.
 
 # See ../../devel/php-libawl/Makefile.common for the LIBAWLDIR value
 SUBST_CLASSES+=		inc-path
 SUBST_STAGE.inc-path=	pre-configure
+SUBST_VARS.inc-path+=	PKG_SYSCONFDIR
 SUBST_FILES.inc-path=	davical.conf inc/always.php.in
 SUBST_FILES.inc-path+=	scripts/po/rebuild-translations.sh
 SUBST_FILES.inc-path+=	dba/create-database.sh
@@ -93,15 +101,17 @@ SUBST_MESSAGE.examples=	Fixing config ex
 
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	pre-configure
+SUBST_VARS.files+=	DAVICALDIR
 SUBST_FILES.files=	davical.conf
-SUBST_SED.files+=	-e "s|@DAVICALDIR@|${DAVICALDIR}|g"
 SUBST_MESSAGE.files=	Fixing DAViCal configuration file for Apache.
 
-post-extract:
+pre-patch:
+	${MV} ${WRKDIR}/davical-${GITLAB_TAG}-${GITLAB_REV} ${WRKSRC}
 	${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: