4 files changed, 50 insertions, 35 deletions

diff --git a/www/davical/Makefile b/www/davical/Makefile
index 67d57ab9210b..a3e97cd97a76 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -2,51 +2,55 @@
 # $FreeBSD$
 
 PORTNAME=	davical
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES?=	www
-MASTER_SITES=	http://debian.mcmillan.net.nz/packages/davical/ \
-		SF/rscds/${PORTNAME}/${PORTVERSION}
-DISTNAME=	davical-${PORTVERSION}
 
 MAINTAINER=	maurice@castro.aus.net
 COMMENT=	A simple CalDAV server using a postgres backend
 
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
 		p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
 		${LOCALBASE}/bin/pwgen:${PORTSDIR}/sysutils/pwgen \
-		php-libawl>=0.53:${PORTSDIR}/devel/php-libawl
+		php-libawl>=0.54:${PORTSDIR}/devel/php-libawl
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	DAViCal
+GH_TAGNAME=	r${DISTVERSION}
+GH_COMMIT=	cc8e6a0
 NO_BUILD=	yes
 USE_PGSQL=	yes
 USE_PHP=	gettext iconv pcre pdo pdo_pgsql pgsql xml calendar
+USES=		shebangfix
+SHEBANG_FILES=	scripts/sync-remote-caldav.php
 
 SUB_FILES=	pkg-message httpd-davical.conf
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
+post-extract:
+	@${FIND} ${WRKSRC} -name .gitignore -delete
+
 do-install:
 .for dirs in htdocs inc config
-	${MKDIR} ${WWWDIR}/${dirs}
+	${MKDIR} ${STAGEDIR}${WWWDIR}/${dirs}
 .endfor
-	cd ${WRKSRC}/htdocs && ${COPYTREE_SHARE} . ${WWWDIR}/htdocs
-	cd ${WRKSRC}/inc && ${COPYTREE_SHARE} . ${WWWDIR}/inc "! -name *.in"
-	${CP} -pv ${WRKSRC}/config/example-config.php ${WWWDIR}/config/
-
-.include <bsd.port.options.mk>
+	cd ${WRKSRC}/htdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/htdocs
+	cd ${WRKSRC}/inc && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/inc "! -name always.php.in"
+	${CP} -p ${WRKSRC}/config/example-config.php ${STAGEDIR}${WWWDIR}/config/config.php.sample
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 .for docdirs in config docs scripts dba
-	${MKDIR} ${DOCSDIR}/${docdirs}
-	cd ${WRKSRC}/${docdirs} && ${COPYTREE_SHARE} . ${DOCSDIR}/${docdirs}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/${docdirs}
+	cd ${WRKSRC}/${docdirs} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${docdirs}
 .endfor
-	${INSTALL_DATA} ${WRKDIR}/httpd-davical.conf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
-	${CHMOD} a+x ${DOCSDIR}/dba/update-davical-database
-
-.endif
-
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKDIR}/httpd-davical.conf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
+	${CHMOD} a+x ${STAGEDIR}${DOCSDIR}/dba/update-davical-database
 
 .include <bsd.port.mk>
diff --git a/www/davical/distinfo b/www/davical/distinfo
index 39ab3fb45f73..f2a1123d3d2f 100644
--- a/www/davical/distinfo
+++ b/www/davical/distinfo
@@ -1,2 +1,2 @@
-SHA256 (davical-1.1.1.tar.gz) = 09bd92a35d2730fe687f6801796d8da1090cb8e36c2910c056a01b00cb73cafc
-SIZE (davical-1.1.1.tar.gz) = 2979425
+SHA256 (davical-1.1.2.tar.gz) = b2ed7f552dde4abbd4a47911c291d77359a71547743a2577df4bbfdc359d80b1
+SIZE (davical-1.1.2.tar.gz) = 2986181
diff --git a/www/davical/files/pkg-message.in b/www/davical/files/pkg-message.in
index c23927ea8a5e..438b2b5f5b23 100644
--- a/www/davical/files/pkg-message.in
+++ b/www/davical/files/pkg-message.in
@@ -9,9 +9,9 @@ top of the accounts
 
 	local   davical     davical_app   trust
 
-3. Copy and edit your config file
+3. Edit your config file in:
 
-       cp %%WWWDIR%%/config/example-config.php %%WWWDIR%%/config/config.php
+       %%WWWDIR%%/config/config.php
 
 4. Enable in apache by copying the httpd-davical.conf from the
 documentation directory to the Apache Include directory and restart
diff --git a/www/davical/pkg-plist b/www/davical/pkg-plist
index 13cd0be0a600..be7cb927d4d9 100644
--- a/www/davical/pkg-plist
+++ b/www/davical/pkg-plist
@@ -47,7 +47,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/dba/update-davical-database
 %%PORTDOCS%%%%DOCSDIR%%/dba/views/dav_principal.sql
 %%PORTDOCS%%%%DOCSDIR%%/dba/windows/create-database.bat
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/CalDAVSyncCalendar.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/_inc---CalDAVSyncCalendar.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/CalDAVClient.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/CalDAVSyncClient.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/CalendarInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RRule.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRule.html
@@ -55,6 +58,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleDateTime.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleTimeZone.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/Rfc5545Duration.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---CalDAVSyncClient.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---RRule-v2.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---RRule.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---caldav-client-v2.php.html
@@ -66,6 +70,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/AtomEntry.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/AtomFeed.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/AtomXHTMLContent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/CalDAVSyncCache.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/CalDAVSyncState.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/CheckResult.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAVTicket/DAVTicket.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html
@@ -73,6 +79,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalSession/Tools.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalSession/_htdocs---tools.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/FakeSession.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/Principal/DAVPrincipal.html
@@ -106,6 +113,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---upgrade.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---well-known.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---AtomFeed.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---CalDAVSyncCache.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---CalDAVSyncState.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---FakeSession.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---WritableCollection.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---autodiscover-handler.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-LOCK.php.html
@@ -126,12 +136,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---pubsub.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---test-RRULE-v2.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---test-RRULE.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---vtimezone.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---collection-edit.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---external-browse.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---principal-browse.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---ui---principal-edit.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---vcard.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---vtimezone.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---well-known.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/authentication/_inc---auth-functions.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_htdocs---caldav.php.html
@@ -140,8 +150,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-BIND.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-DELETE.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-GET.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-GET-functions.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-GET.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-MOVE.php.html
@@ -157,10 +167,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---schedule-functions.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/external-bind/_inc---external-fetch.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule-POST/FakeSession.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule-POST/_inc---iSchedule-POST.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule/_inc---iSchedule.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule/iSchedule.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule-POST/_inc---iSchedule-POST.php.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule-POST/FakeSession.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/_inc---drivers_ldap.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/_inc---drivers_rimap.php.html
@@ -293,6 +303,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/website/style.css
 %%PORTDOCS%%%%DOCSDIR%%/docs/website/wikiheader.css
 %%PORTDOCS%%%%DOCSDIR%%/httpd-davical.conf
+%%PORTDOCS%%%%DOCSDIR%%/scripts/archive-old-events.php
 %%PORTDOCS%%%%DOCSDIR%%/scripts/build-always.sh
 %%PORTDOCS%%%%DOCSDIR%%/scripts/cron-sync-ldap.php
 %%PORTDOCS%%%%DOCSDIR%%/scripts/export_calendar.php
@@ -301,7 +312,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/scripts/refresh-alarms.php
 %%PORTDOCS%%%%DOCSDIR%%/scripts/sync-remote-caldav.php
 %%PORTDOCS%%%%DOCSDIR%%/scripts/tz-update.php
-%%WWWDIR%%/config/example-config.php
+@unexec if cmp -s %D/%%WWWDIR%%/config/config.php.sample %D/%%WWWDIR%%/config/config.php; then rm -f %D/%%WWWDIR%%/config/config.php; fi
+%%WWWDIR%%/config/config.php.sample
+@exec if [ ! -f %D/%%WWWDIR%%/config/config.conf ] ; then cp -p %D/%F %B/config.php; fi
 %%WWWDIR%%/htdocs/.htaccess
 %%WWWDIR%%/htdocs/admin.php
 %%WWWDIR%%/htdocs/always.php
@@ -399,7 +412,7 @@
 %%WWWDIR%%/inc/well-known.php
 @dirrm %%WWWDIR%%/inc/ui
 @dirrm %%WWWDIR%%/inc/tz
-@dirrm %%WWWDIR%%/inc
+@dirrmtry %%WWWDIR%%/inc
 @dirrm %%WWWDIR%%/htdocs/js
 @dirrm %%WWWDIR%%/htdocs/images
 @dirrm %%WWWDIR%%/htdocs/css
@@ -443,5 +456,3 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/dba
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/config
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec touch %D/%%WWWDIR%%/inc/config.php;chown www %D/%%WWWDIR%%/inc/config.php
-@unexec if [ ! -s %D/%%WWWDIR%%/inc/config.php ];then rm -f %D/%%WWWDIR%%/inc/config.php;fi