From nobody@FreeBSD.org  Mon Jan  9 23:13:37 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3EE241065670
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  9 Jan 2012 23:13:37 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 29F678FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  9 Jan 2012 23:13:37 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q09NDbRD078514
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 9 Jan 2012 23:13:37 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q09NDa2P078495;
	Mon, 9 Jan 2012 23:13:36 GMT
	(envelope-from nobody)
Message-Id: <201201092313.q09NDa2P078495@red.freebsd.org>
Date: Mon, 9 Jan 2012 23:13:36 GMT
From: Matthias Fechner <idefix@fechner.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update www/davical
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: maurice@castro.aus.net

>Number:         163977
>Category:       ports
>Synopsis:       Update www/davical
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 09 23:20:12 UTC 2012
>Closed-Date:    Mon Jan 30 04:51:55 UTC 2012
>Last-Modified:  Mon Jan 30 05:00:23 UTC 2012
>Originator:     Matthias Fechner
>Release:        8.2
>Organization:
>Environment:
FreeBSD server.idefix.lan 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Dec 31 10:24:03 CET 2011     root@server.idefix.lan:/usr/obj/usr/src/sys/SERVER2_I4B  amd64

>Description:
Please apply the attached patch to update davical to version 1.0.1.
It is required to commit the update for the port devel/php-libawl first.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ur davical.old/Makefile davical/Makefile
--- davical.old/Makefile	2012-01-09 23:48:35.738065648 +0100
+++ davical/Makefile	2012-01-09 23:48:54.190991090 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	davical
-PORTVERSION=	0.9.9.7
+PORTVERSION=	1.0.1
 CATEGORIES?=	www
 MASTER_SITES=	http://debian.mcmillan.net.nz/packages/davical/ \
 		SF/rscds/${PORTNAME}/${PORTVERSION}
@@ -19,7 +19,7 @@
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
 		${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \
 		${LOCALBASE}/bin/pwgen:${PORTSDIR}/sysutils/pwgen \
-		php-libawl>=0.49:${PORTSDIR}/devel/php-libawl
+		php-libawl>=0.50:${PORTSDIR}/devel/php-libawl
 
 NO_BUILD=	yes
 USE_PGSQL=	yes
diff -ur davical.old/distinfo davical/distinfo
--- davical.old/distinfo	2012-01-09 23:48:35.737063899 +0100
+++ davical/distinfo	2012-01-09 23:51:55.010655773 +0100
@@ -1,2 +1,2 @@
-SHA256 (davical-0.9.9.7.tar.gz) = 954649b61cadacd5647f14790fd31f79d59ce351196afa183ceee2ed51e8e1ef
-SIZE (davical-0.9.9.7.tar.gz) = 2696161
+SHA256 (davical-1.0.1.tar.gz) = 253c6681e54e89dfdf1b25a764023aed64d171d27ea0c1c6b27aa6f787b338ca
+SIZE (davical-1.0.1.tar.gz) = 2737899
diff -ur davical.old/pkg-plist davical/pkg-plist
--- davical.old/pkg-plist	2012-01-09 23:48:35.745068112 +0100
+++ davical/pkg-plist	2012-01-10 00:01:51.366985268 +0100
@@ -51,6 +51,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/CalendarInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RRule.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRule.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleDateRange.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleDateTime.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleTimeZone.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/Rfc5545Duration.html
@@ -104,6 +105,7 @@
 %%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---WritableCollection.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---autodiscover-handler.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-LOCK.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-calquery.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html
@@ -123,9 +125,11 @@
 %%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---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---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
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_htdocs---public.php.html
@@ -147,6 +151,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html
 %%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/_inc---iSchedule.php.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule/iSchedule.html
@@ -368,6 +373,7 @@
 %%WWWDIR%%/inc/page-footer.php
 %%WWWDIR%%/inc/page-header.php
 %%WWWDIR%%/inc/pubsub.php
+%%WWWDIR%%/inc/schedule-functions.php
 %%WWWDIR%%/inc/test-RRULE.php
 %%WWWDIR%%/inc/tz/capabilities.php
 %%WWWDIR%%/inc/tz/expand.php


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Jan 9 23:20:28 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163977 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: maurice@castro.aus.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/163977: Update www/davical
Date: Mon, 9 Jan 2012 23:20:26 UT

 Maintainer of www/davical,
 
 Please note that PR ports/163977 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/163977
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Maurice Castro <maurice@castro.aus.net>
To: bug-followup@FreeBSD.org, idefix@fechner.net
Cc:  
Subject: Re: ports/163977: Update www/davical
Date: Mon, 16 Jan 2012 10:01:45 +1100

 Awaiting php-libawl update to 0.50 in ports collection before testing
State-Changed-From-To: feedback->suspended 
State-Changed-By: linimon 
State-Changed-When: Mon Jan 16 01:10:51 UTC 2012 
State-Changed-Why:  
depends on ports/163976. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163977 
State-Changed-From-To: suspended->feedback 
State-Changed-By: rm 
State-Changed-When: Wed Jan 25 14:00:27 UTC 2012 
State-Changed-Why:  
ports/163976 is committed. You can now test. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163977 

From: Maurice Castro <maurice@castro.aus.net>
To: bug-followup@FreeBSD.org, idefix@fechner.net
Cc:  
Subject: Re: ports/163977: Update www/davical
Date: Fri, 27 Jan 2012 10:13:44 +1100

 Port approved
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Thu Jan 26 23:43:23 UTC 2012 
Responsible-Changed-Why:  
I'll take this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163977 

From: Jason Helfman <jgh@FreeBSD.org>
To: maurice@castro.aus.net
Cc: Matthias Fechner <idefix@fechner.net>, bug-followup@freebsd.org
Subject: Re: ports/163977: Update www/davical
Date: Thu, 26 Jan 2012 16:40:36 -0800

 --jI8keyz6grp/JLjh
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Disposition: inline
 
 I've updated the patch slightly. Can you please have a look at this?
 Updated pkg-descr WWW site. (seemed more official for the software)
 moved to loops in Makefile for similar lines
 
 Thanks!
 -jgh
 
 -- 
 Jason Helfman         | FreeBSD Committer
 jgh@FreeBSD.org       | http://people.freebsd.org/~jgh
 
 --jI8keyz6grp/JLjh
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/davical/Makefile,v
 retrieving revision 1.15
 diff -u -r1.15 Makefile
 --- Makefile	16 Nov 2011 08:10:32 -0000	1.15
 +++ Makefile	27 Jan 2012 00:33:42 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	davical
 -PORTVERSION=	0.9.9.7
 +PORTVERSION=	1.0.1
  CATEGORIES?=	www
  MASTER_SITES=	http://debian.mcmillan.net.nz/packages/davical/ \
  		SF/rscds/${PORTNAME}/${PORTVERSION}
 @@ -19,7 +19,7 @@
  		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
  		${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \
  		${LOCALBASE}/bin/pwgen:${PORTSDIR}/sysutils/pwgen \
 -		php-libawl>=0.49:${PORTSDIR}/devel/php-libawl
 +		php-libawl>=0.50:${PORTSDIR}/devel/php-libawl
  
  NO_BUILD=	yes
  USE_PGSQL=	yes
 @@ -28,18 +28,21 @@
  SUB_FILES=	pkg-message httpd-davical.conf
  
  do-install:
 -	${MKDIR} ${WWWDIR} ${WWWDIR}/htdocs ${WWWDIR}/inc ${WWWDIR}/config
 +	${MKDIR} ${WWWDIR}
 +.for dirs in htdocs inc config
 +	${MKDIR} ${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/
  
  post-install:
  .if !defined(NOPORTDOCS)
 -	${MKDIR} ${DOCSDIR} ${DOCSDIR}/config ${DOCSDIR}/docs ${DOCSDIR}/scripts ${DOCSDIR}/dba
 -	cd ${WRKSRC}/config && ${COPYTREE_SHARE} . ${DOCSDIR}/config
 -	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}/docs
 -	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${DOCSDIR}/scripts
 -	cd ${WRKSRC}/dba && ${COPYTREE_SHARE} . ${DOCSDIR}/dba
 +	${MKDIR} ${DOCSDIR}
 +.for docdirs in config docs scripts dba
 +	${MKDIR} ${DOCSDIR}/${docdirs}
 +	cd ${WRKSRC}/${docdirs} && ${COPYTREE_SHARE} . ${DOCSDIR}/${docdirs}
 +.endfor
  	${CP} -pv ${WRKDIR}/httpd-davical.conf ${DOCSDIR}
  	${CP} -pv ${WRKSRC}/README ${DOCSDIR}
  	${CP} -pv ${WRKSRC}/INSTALL ${DOCSDIR}
 Index: distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/www/davical/distinfo,v
 retrieving revision 1.11
 diff -u -r1.11 distinfo
 --- distinfo	16 Nov 2011 08:10:32 -0000	1.11
 +++ distinfo	27 Jan 2012 00:33:42 -0000
 @@ -1,2 +1,2 @@
 -SHA256 (davical-0.9.9.7.tar.gz) = 954649b61cadacd5647f14790fd31f79d59ce351196afa183ceee2ed51e8e1ef
 -SIZE (davical-0.9.9.7.tar.gz) = 2696161
 +SHA256 (davical-1.0.1.tar.gz) = 253c6681e54e89dfdf1b25a764023aed64d171d27ea0c1c6b27aa6f787b338ca
 +SIZE (davical-1.0.1.tar.gz) = 2737899
 Index: pkg-descr
 ===================================================================
 RCS file: /home/pcvs/ports/www/davical/pkg-descr,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-descr
 --- pkg-descr	18 Jun 2008 06:38:40 -0000	1.1
 +++ pkg-descr	27 Jan 2012 00:33:42 -0000
 @@ -1,4 +1,4 @@
  DAViCal is a PHP based CalDAV server which uses a Postgres backend. 
  It is administered using a Web interface.
  
 -WWW: http://rscds.sourceforge.net/
 +WWW: http://sourceforge.net/projects/davical
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/www/davical/pkg-plist,v
 retrieving revision 1.11
 diff -u -r1.11 pkg-plist
 --- pkg-plist	16 Nov 2011 08:10:32 -0000	1.11
 +++ pkg-plist	27 Jan 2012 00:33:42 -0000
 @@ -51,6 +51,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/CalendarInfo.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RRule.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRule.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleDateRange.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleDateTime.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleTimeZone.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/Rfc5545Duration.html
 @@ -104,6 +105,7 @@
  %%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---WritableCollection.php.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---autodiscover-handler.php.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-LOCK.php.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-calquery.php.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html
 @@ -123,9 +125,11 @@
  %%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---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---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
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_htdocs---public.php.html
 @@ -147,6 +151,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html
  %%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/_inc---iSchedule.php.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule/iSchedule.html
 @@ -368,6 +373,7 @@
  %%WWWDIR%%/inc/page-footer.php
  %%WWWDIR%%/inc/page-header.php
  %%WWWDIR%%/inc/pubsub.php
 +%%WWWDIR%%/inc/schedule-functions.php
  %%WWWDIR%%/inc/test-RRULE.php
  %%WWWDIR%%/inc/tz/capabilities.php
  %%WWWDIR%%/inc/tz/expand.php
 
 --jI8keyz6grp/JLjh--

From: Maurice Castro <maurice@castro.aus.net>
To: Jason Helfman <jgh@FreeBSD.org>
Cc: Matthias Fechner <idefix@fechner.net>, bug-followup@FreeBSD.org
Subject: Re: ports/163977: Update www/davical
Date: Fri, 27 Jan 2012 11:49:27 +1100

 Looks Ok.
 	Maurice
 
 On 27/01/2012, at 11:40 AM, Jason Helfman wrote:
 
 > I've updated the patch slightly. Can you please have a look at this?
 > Updated pkg-descr WWW site. (seemed more official for the software)
 > moved to loops in Makefile for similar lines
 > 
 > Thanks!
 > -jgh
 > 
 > -- 
 > Jason Helfman         | FreeBSD Committer
 > jgh@FreeBSD.org       | http://people.freebsd.org/~jgh
 > <patch.txt>
 

From: Matthias Fechner <idefix@fechner.net>
To: Jason Helfman <jgh@FreeBSD.org>
Cc: maurice@castro.aus.net, bug-followup@FreeBSD.org
Subject: Re: ports/163977: Update www/davical
Date: Fri, 27 Jan 2012 07:40:08 +0100

 Am 27.01.12 01:40, schrieb Jason Helfman:
 > -WWW:http://rscds.sourceforge.net/
 > +WWW:http://sourceforge.net/projects/davical
 
 if you want to put in the actual homepage here I suggest to use:
 http://www.davical.org/
 
 On this site you can find everything, including the documentation.
 
 Bye
 Matthias
 
 -- 
 "Programming today is a race between software engineers striving to 
 build bigger and better idiot-proof programs, and the universe trying to 
 produce bigger and better idiots. So far, the universe is winning." -- 
 Rich Cook

From: Jason Helfman <jgh@FreeBSD.org>
To: Matthias Fechner <idefix@fechner.net>
Cc: maurice@castro.aus.net, bug-followup@FreeBSD.org
Subject: Re: ports/163977: Update www/davical
Date: Sun, 29 Jan 2012 16:59:22 -0800

 I was just about to send in this update, but noticed there is a newer
 version. Would you mind testing the latest version, and sending in a diff?
 
 v1.0.2
 
 Thanks,
 Jason
 
 -- 
 Jason Helfman         | FreeBSD Committer
 jgh@FreeBSD.org       | http://people.freebsd.org/~jgh

From: Maurice Castro <maurice@castro.aus.net>
To: Jason Helfman <jgh@FreeBSD.org>
Cc: Matthias Fechner <idefix@fechner.net>, bug-followup@FreeBSD.org
Subject: Re: ports/163977: Update www/davical
Date: Mon, 30 Jan 2012 12:39:01 +1100

 --Apple-Mail=_24E25E14-0E01-42BC-BE97-551FA14C6C18
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
 	charset=us-ascii
 
 Hi Jason,
 	I have built the new version and I am attaching a patch file ... =
 however ... the port devel/php-libawl will also require updating before =
 this patch will work. I used the current version - 0.50 of libawl for =
 testing and it worked but there is no guarantee of correct operation =
 until 0.51 is updated in the ports collection. As a result I have made =
 the patch test for version 0.51.
 
 	Maurice
 
 On 30/01/2012, at 11:59 AM, Jason Helfman wrote:
 
 > I was just about to send in this update, but noticed there is a newer
 > version. Would you mind testing the latest version, and sending in a =
 diff?
 >=20
 > v1.0.2
 >=20
 > Thanks,
 > Jason
 >=20
 > --=20
 > Jason Helfman         | FreeBSD Committer
 > jgh@FreeBSD.org       | http://people.freebsd.org/~jgh
 
 
 --Apple-Mail=_24E25E14-0E01-42BC-BE97-551FA14C6C18
 Content-Disposition: attachment;
 	filename=patch.txt
 Content-Type: text/plain;
 	x-unix-mode=0644;
 	name="patch.txt"
 Content-Transfer-Encoding: quoted-printable
 
 diff -u davical.orig/Makefile davical/Makefile
 --- davical.orig/Makefile	2012-01-27 09:55:22.000000000 +1100
 +++ davical/Makefile	2012-01-30 12:35:01.000000000 +1100
 @@ -6,7 +6,7 @@
  #
 =20
  PORTNAME=3D	davical
 -PORTVERSION=3D	0.9.9.7
 +PORTVERSION=3D	1.0.2
  CATEGORIES?=3D	www
  MASTER_SITES=3D	http://debian.mcmillan.net.nz/packages/davical/ =
 \
  		SF/rscds/${PORTNAME}/${PORTVERSION}
 @@ -19,7 +19,7 @@
  		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
  		=
 ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \
  		${LOCALBASE}/bin/pwgen:${PORTSDIR}/sysutils/pwgen \
 -		php-libawl>=3D0.49:${PORTSDIR}/devel/php-libawl
 +		php-libawl>=3D0.51:${PORTSDIR}/devel/php-libawl
 =20
  NO_BUILD=3D	yes
  USE_PGSQL=3D	yes
 @@ -28,18 +28,21 @@
  SUB_FILES=3D	pkg-message httpd-davical.conf
 =20
  do-install:
 -	${MKDIR} ${WWWDIR} ${WWWDIR}/htdocs ${WWWDIR}/inc =
 ${WWWDIR}/config
 +	${MKDIR} ${WWWDIR}
 +.for dirs in htdocs inc config
 +	${MKDIR} ${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/
 =20
  post-install:
  .if !defined(NOPORTDOCS)
 -	${MKDIR} ${DOCSDIR} ${DOCSDIR}/config ${DOCSDIR}/docs =
 ${DOCSDIR}/scripts ${DOCSDIR}/dba
 -	cd ${WRKSRC}/config && ${COPYTREE_SHARE} . ${DOCSDIR}/config
 -	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}/docs
 -	cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${DOCSDIR}/scripts
 -	cd ${WRKSRC}/dba && ${COPYTREE_SHARE} . ${DOCSDIR}/dba
 +	${MKDIR} ${DOCSDIR}
 +.for docdirs in config docs scripts dba
 +	${MKDIR} ${DOCSDIR}/${docdirs}
 +	cd ${WRKSRC}/${docdirs} && ${COPYTREE_SHARE} . =
 ${DOCSDIR}/${docdirs}
 +.endfor
  	${CP} -pv ${WRKDIR}/httpd-davical.conf ${DOCSDIR}
  	${CP} -pv ${WRKSRC}/README ${DOCSDIR}
  	${CP} -pv ${WRKSRC}/INSTALL ${DOCSDIR}
 diff -u davical.orig/distinfo davical/distinfo
 --- davical.orig/distinfo	2012-01-27 09:55:22.000000000 +1100
 +++ davical/distinfo	2012-01-30 12:30:31.000000000 +1100
 @@ -1,2 +1,2 @@
 -SHA256 (davical-0.9.9.7.tar.gz) =3D =
 954649b61cadacd5647f14790fd31f79d59ce351196afa183ceee2ed51e8e1ef
 -SIZE (davical-0.9.9.7.tar.gz) =3D 2696161
 +SHA256 (davical-1.0.2.tar.gz) =3D =
 12633dfc22aeaef9807e347d2c8798f2a3af4b9dd712a8bb736511915b3b9da6
 +SIZE (davical-1.0.2.tar.gz) =3D 2739740
 Common subdirectories: davical.orig/files and davical/files
 diff -u davical.orig/pkg-descr davical/pkg-descr
 --- davical.orig/pkg-descr	2012-01-27 09:55:22.000000000 +1100
 +++ davical/pkg-descr	2012-01-27 11:44:58.000000000 +1100
 @@ -1,4 +1,4 @@
  DAViCal is a PHP based CalDAV server which uses a Postgres backend.=20
  It is administered using a Web interface.
 =20
 -WWW: http://rscds.sourceforge.net/
 +WWW: http://sourceforge.net/projects/davical
 diff -u davical.orig/pkg-plist davical/pkg-plist
 --- davical.orig/pkg-plist	2012-01-27 09:55:22.000000000 +1100
 +++ davical/pkg-plist	2012-01-27 11:44:58.000000000 +1100
 @@ -51,6 +51,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/CalendarInfo.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RRule.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRule.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleDateRange.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleDateTime.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RepeatRuleTimeZone.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/Rfc5545Duration.html
 @@ -104,6 +105,7 @@
  %%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---WritableCollection.php.htm=
 l
 =
 +%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---autodiscover-handler.php.=
 html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-LOCK.php.html
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-calquery.php=
 .html
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-REPORT-cardquery.ph=
 p.html
 @@ -123,9 +125,11 @@
  %%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---ui---collection-edit.php.h=
 tml
 =
 +%%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.ht=
 ml
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---vcard.php.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---well-known.php.html
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/authentication/_inc---auth-functi=
 ons.php.html
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_htdocs---caldav.php.html
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_htdocs---public.php.html
 @@ -147,6 +151,7 @@
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT-pps-s=
 et.php.html
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT-sync-=
 collection.php.html
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---caldav-REPORT.php.h=
 tml
 =
 +%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/caldav/_inc---schedule-functions=
 .php.html
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/external-bind/_inc---external-fet=
 ch.php.html
  =
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule/_inc---iSchedule.php.ht=
 ml
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/iSchedule/iSchedule.html
 @@ -368,6 +373,7 @@
  %%WWWDIR%%/inc/page-footer.php
  %%WWWDIR%%/inc/page-header.php
  %%WWWDIR%%/inc/pubsub.php
 +%%WWWDIR%%/inc/schedule-functions.php
  %%WWWDIR%%/inc/test-RRULE.php
  %%WWWDIR%%/inc/tz/capabilities.php
  %%WWWDIR%%/inc/tz/expand.php
 
 --Apple-Mail=_24E25E14-0E01-42BC-BE97-551FA14C6C18
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii
 
 
 
 
 --Apple-Mail=_24E25E14-0E01-42BC-BE97-551FA14C6C18--
State-Changed-From-To: feedback->closed 
State-Changed-By: jgh 
State-Changed-When: Mon Jan 30 04:51:53 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! I will put in a pr to update 
devel/php-libawl so davical can go to the next release. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163977 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/163977: commit references a PR
Date: Mon, 30 Jan 2012 04:50:26 +0000 (UTC)

 jgh         2012-01-30 04:50:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/davical          Makefile distinfo pkg-descr pkg-plist 
   Log:
   - Update to 1.0.1
   - Update required dependent version of devel/php-libawl
   - cleanup install and post-install targets while here
   - update WWW address
   
   PR: ports/163977
   Submitted by:   idefix at fechner.net
   Approved by:    maintainer, crees (mentor)
   
   Revision  Changes    Path
   1.16      +9 -8      ports/www/davical/Makefile
   1.12      +2 -2      ports/www/davical/distinfo
   1.2       +1 -1      ports/www/davical/pkg-descr
   1.12      +6 -0      ports/www/davical/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
