Date: Sun, 1 Nov 2009 02:08:11 GMT From: Cristiano Rolim Pereira <cristianorolim@hotmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/140158: [patch] - update www/davical to version 0.9.7.6 Message-ID: <200911010208.nA128BOJ018354@www.freebsd.org> Resent-Message-ID: <200911010210.nA12A1mu049985@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140158
>Category: ports
>Synopsis: [patch] - update www/davical to version 0.9.7.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 01 02:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Cristiano Rolim Pereira
>Release: 7.2-RELEASE-p2
>Organization:
>Environment:
FreeBSD bsd7.casa 7.2-RELEASE-p2 FreeBSD 7.2-RELEASE-p2 #0: Wed Jun 24 00:14:35 UTC 2009 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
The attached diff updates www/davical to version 0.9.7.6 .
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN ../davical.orig/Makefile ./Makefile
--- ../davical.orig/Makefile 2009-10-31 20:33:53.000000000 -0200
+++ ./Makefile 2009-11-01 00:03:19.000000000 -0200
@@ -6,10 +6,10 @@
#
PORTNAME= davical
-PORTVERSION= 0.9.7
+PORTVERSION= 0.9.7.6
CATEGORIES?= www
MASTER_SITES= SF/rscds/${PORTNAME}/${PORTVERSION}
-DISTNAME= davical_${PORTVERSION}-0
+DISTNAME= davical-${PORTVERSION}
MAINTAINER= maurice@castro.aus.net
COMMENT= A simple CalDAV server using a postgres backend
@@ -21,8 +21,6 @@
${LOCALBASE}/bin/pwgen:${PORTSDIR}/sysutils/pwgen \
php-libawl>=0.37:${PORTSDIR}/devel/php-libawl
-WRKSRC= ${WRKDIR}/davical-${PORTVERSION}-0
-
NO_BUILD= yes
USE_PHP= gettext pcre xml
@@ -32,7 +30,6 @@
post-patch:
${RM} ${WRKSRC}/inc/always.php.orig
- ${RM} ${WRKSRC}/htdocs/index.php.orig
do-install:
${MKDIR} ${WWWDIR} ${WWWDIR}/htdocs ${WWWDIR}/inc ${WWWDIR}/config
@@ -51,7 +48,6 @@
${CP} -pv ${WRKSRC}/README ${DOCSDIR}
${CP} -pv ${WRKSRC}/INSTALL ${DOCSDIR}
${CHMOD} a+x ${DOCSDIR}/dba/update-davical-database
- ${CHMOD} a+x ${DOCSDIR}/dba/update-rscds-database
.endif
diff -ruN ../davical.orig/distinfo ./distinfo
--- ../davical.orig/distinfo 2009-10-31 20:33:53.000000000 -0200
+++ ./distinfo 2009-10-31 20:40:00.000000000 -0200
@@ -1,3 +1,3 @@
-MD5 (davical_0.9.7-0.tar.gz) = d116471d2ba364cfe998a307eb5af09d
-SHA256 (davical_0.9.7-0.tar.gz) = 09c3914d26fab8c7cdceb03ee26dc29b3f5126289de1538ad204d894bd310eae
-SIZE (davical_0.9.7-0.tar.gz) = 879860
+MD5 (davical-0.9.7.6.tar.gz) = b03aed88995e373891bfbf01daba6110
+SHA256 (davical-0.9.7.6.tar.gz) = 6b2519c60cc76cc4c31771ac42381d0e7c4c2cd2620872e4932ce1cd0ef8d72f
+SIZE (davical-0.9.7.6.tar.gz) = 1753860
diff -ruN ../davical.orig/files/patch-aa ./files/patch-aa
--- ../davical.orig/files/patch-aa 2009-10-31 20:33:53.000000000 -0200
+++ ./files/patch-aa 1969-12-31 21:00:00.000000000 -0300
@@ -1,11 +0,0 @@
---- htdocs/index.php.orig 2008-05-14 12:54:41.000000000 +1000
-+++ htdocs/index.php 2008-05-14 12:55:01.000000000 +1000
-@@ -31,7 +31,7 @@
-
- <h3>Users, Resources and Groups</h3>
- <p>These are the things which may have collections of calendar resources (i.e. calendars).</p>
--<p><a href="../users.php">Here is a list of users (maybe :-)</a>. You can click on any user to see the full detail
-+<p><a href="users.php">Here is a list of users (maybe :-)</a>. You can click on any user to see the full detail
- for that person (or group or resource - but from now we'll just call them users).</p>
- <p>The primary differences between them are as follows:</p>
- <ul>
diff -ruN ../davical.orig/files/patch-inc-always.php ./files/patch-inc-always.php
--- ../davical.orig/files/patch-inc-always.php 2009-10-31 20:33:53.000000000 -0200
+++ ./files/patch-inc-always.php 2009-10-31 23:54:25.000000000 -0200
@@ -1,10 +1,11 @@
---- inc/always.php.orig 2009-02-23 22:35:09.000000000 +0100
-+++ inc/always.php 2009-02-23 22:35:48.000000000 +0100
-@@ -34,6 +34,7 @@
+--- inc/always.php.orig 2009-10-31 21:11:51.000000000 -0200
++++ inc/always.php 2009-10-31 21:12:29.000000000 -0200
+@@ -43,7 +43,7 @@
+ $c->readonly_webdav_collections = true; // WebDAV access is readonly
// Ensure that ../inc is in our included paths as early as possible
- set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
-+set_include_path( '/usr/local/share/awl/inc'. PATH_SEPARATOR. get_include_path());
+-set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
++set_include_path( '../inc'. PATH_SEPARATOR. '/usr/local/share/awl/inc'. PATH_SEPARATOR. get_include_path());
// Kind of private configuration values
$c->total_query_time = 0;
diff -ruN ../davical.orig/pkg-plist ./pkg-plist
--- ../davical.orig/pkg-plist 2009-10-31 20:33:53.000000000 -0200
+++ ./pkg-plist 2009-10-31 23:13:44.000000000 -0200
@@ -8,7 +8,6 @@
%%PORTDOCS%%%%DOCSDIR%%/dba/base-data.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/caldav_functions.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/create-database.sh
-%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_functions-8.1.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/davical.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.10.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.1.11.sql
@@ -31,33 +30,41 @@
%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.3a.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.4.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/patches/1.2.5.sql
+%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_functions-8.1.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_functions.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/rrule_tests.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/sample-data.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/supported_locales.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/update-davical-database
-%%PORTDOCS%%%%DOCSDIR%%/dba/update-rscds-database
%%PORTDOCS%%%%DOCSDIR%%/dba/windows/awl-tables.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/windows/create-database.bat
%%PORTDOCS%%%%DOCSDIR%%/dba/windows/rscds.sql
%%PORTDOCS%%%%DOCSDIR%%/dba/windows/schema-management.sql
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/PdoQuery/PdoDatabase.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/PdoQuery/PdoDialect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/PdoQuery/PdoQuery.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/PdoQuery/_inc---PdoQuery.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/CalDAVClient.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/RRule.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---RRule.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/_inc---caldav-client.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/caldav/iCalDate.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/PdoQuery/PdoDatabase.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/PdoQuery/PdoQuery.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/PdoQuery/PdoDialect.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/awl/PdoQuery/_inc---PdoQuery.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/blank.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/classtrees_awl.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/classtrees_davical.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/Admin/_htdocs---users.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalSession/DAViCalSession.html
+%%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/DAViCalUser/DAViCalUser.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/DAViCalUser/_inc---DAViCalUser.php.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/CalDAVPrincipal.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/Principal/_inc---CalDAVPrincipal.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/PublicSession/PublicSession.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/PublicSession/_inc---PublicSession.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/RRuleTest.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/RSCDSSession/RSCDSSession.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/RSCDSSession/Tools.html
@@ -73,6 +80,7 @@
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---index.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---relationship_types.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---roles.php.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---testpdo.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_htdocs---usr.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---always.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/_inc---caldav-LOCK.php.html
@@ -104,6 +112,7 @@
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/ldapDrivers.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/ldap/squidPamDrivers.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/logging/_inc---log_caldav_action.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/elementindex.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/elementindex_awl.html
@@ -166,7 +175,9 @@
%%PORTDOCS%%%%DOCSDIR%%/docs/api/packages.html
%%PORTDOCS%%%%DOCSDIR%%/docs/api/phpdoc.ini
%%PORTDOCS%%%%DOCSDIR%%/docs/api/todolist.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/davical_en_user_guide.odt
%%PORTDOCS%%%%DOCSDIR%%/docs/website/administration.php
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/background.php
%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients.php
%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/Chandler-details.php
%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/Chandler-dialog1.png
@@ -195,11 +206,18 @@
%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iCal-dialog.png
%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iCal-icon.png
%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iCal-screenshot.png
-%%PORTDOCS%%%%DOCSDIR%%/docs/website/images/logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iPhone-1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iPhone-2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iPhone-3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iPhone-4.jpg
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iPhone-5.jpg
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iPhone-6.jpg
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/clients/iPhone-details.php
%%PORTDOCS%%%%DOCSDIR%%/docs/website/images/davical_logo.ico
-%%PORTDOCS%%%%DOCSDIR%%/docs/website/images/larger.png
-%%PORTDOCS%%%%DOCSDIR%%/docs/website/images/icon.png
%%PORTDOCS%%%%DOCSDIR%%/docs/website/images/davical_logo.svg
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/images/icon.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/images/larger.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/website/images/logo.gif
%%PORTDOCS%%%%DOCSDIR%%/docs/website/inc/page-footer.php
%%PORTDOCS%%%%DOCSDIR%%/docs/website/inc/page-header.php
%%PORTDOCS%%%%DOCSDIR%%/docs/website/inc/page-middle.php
@@ -211,6 +229,7 @@
%%PORTDOCS%%%%DOCSDIR%%/scripts/po/extract.pl
%%PORTDOCS%%%%DOCSDIR%%/scripts/po/rebuild-translations.sh
%%WWWDIR%%/config/example-config.php
+%%WWWDIR%%/htdocs/.htaccess
%%WWWDIR%%/htdocs/caldav.php
%%WWWDIR%%/htdocs/collection.php
%%WWWDIR%%/htdocs/css/browse.css
@@ -224,15 +243,18 @@
%%WWWDIR%%/htdocs/public.php
%%WWWDIR%%/htdocs/relationship_types.php
%%WWWDIR%%/htdocs/roles.php
+%%WWWDIR%%/htdocs/testpdo.php
%%WWWDIR%%/htdocs/tools.php
%%WWWDIR%%/htdocs/users.php
%%WWWDIR%%/htdocs/usr.php
%%WWWDIR%%/inc/CalDAVPrincipal.php
%%WWWDIR%%/inc/CalDAVRequest.php
+%%WWWDIR%%/inc/DAViCalSession.php
+%%WWWDIR%%/inc/DAViCalUser.php
%%WWWDIR%%/inc/HTTPAuthSession.php
+%%WWWDIR%%/inc/PdoQuery.php
+%%WWWDIR%%/inc/PublicSession.php
%%WWWDIR%%/inc/RRule.php
-%%WWWDIR%%/inc/RSCDSSession.php
-%%WWWDIR%%/inc/RSCDSUser.php
%%WWWDIR%%/inc/always.php
%%WWWDIR%%/inc/always.php.in
%%WWWDIR%%/inc/auth-functions.php
@@ -258,18 +280,18 @@
%%WWWDIR%%/inc/drivers_squid_pam.php
%%WWWDIR%%/inc/freebusy-GET.php
%%WWWDIR%%/inc/interactive-page.php
+%%WWWDIR%%/inc/log_caldav_action.php
%%WWWDIR%%/inc/other_translated_strings.php
%%WWWDIR%%/inc/page-footer.php
%%WWWDIR%%/inc/page-header.php
-%%WWWDIR%%/inc/PdoQuery.php
-%%WWWDIR%%/inc/PublicSession.php
+%%WWWDIR%%/inc/test-RRULE.php
@dirrm %%WWWDIR%%/inc
@dirrm %%WWWDIR%%/htdocs/js
@dirrm %%WWWDIR%%/htdocs/images
@dirrm %%WWWDIR%%/htdocs/css
@dirrm %%WWWDIR%%/htdocs
-@dirrm %%WWWDIR%%/config
-@dirrm %%WWWDIR%%
+@dirrmtry %%WWWDIR%%/config
+@dirrmtry %%WWWDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts/po
%%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/website/inc
@@ -279,14 +301,18 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/media/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/media
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/propfind
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/logging
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/ldap
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/caldav
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/authentication
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Request
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/RSCDSUser
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/RSCDSSession
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/PublicSession
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Principal
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/HTTPAuthSession
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/DAViCalUser
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/DAViCalSession
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical/Admin
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/davical
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/api/awl/caldav
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911010208.nA128BOJ018354>