Attachment 104133 Details for Bug 144271 – file.diff

[patch] file.diff

file.diff (text/plain), 4.06 KB, created by Maurice Castro on 2010-02-25 00:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maurice Castro

Created: 2010-02-25 00:30:03 UTC

Size: 4.06 KB

patch

obsolete

>diff -ur davical.orig/Makefile davical/Makefile
>--- davical.orig/Makefile	2010-02-25 09:02:26.000000000 +1100
>+++ davical/Makefile	2010-02-25 11:23:06.000000000 +1100
>@@ -6,22 +6,28 @@
> #
> 
> PORTNAME=	davical
>-PORTVERSION=	0.9.7.6
>+PORTVERSION=	0.9.8.1
> CATEGORIES?=	www
>-MASTER_SITES=	SF/rscds/${PORTNAME}/${PORTVERSION}
>+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
> 
>-RUN_DEPENDS=	${LOCALBASE}/include/php/ext/pgsql:${PORTSDIR}/databases/php5-pgsql \
>+RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
>+		${LOCALBASE}/include/php/ext/pgsql:${PORTSDIR}/databases/php5-pgsql \
>+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo.so:${PORTSDIR}/databases/php5-pdo \
>+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql \
> 		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
> 		${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.37:${PORTSDIR}/devel/php-libawl
>+		php-libawl>=0.40:${PORTSDIR}/devel/php-libawl \
>+		postgresql-client>=8.2:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
> 
> NO_BUILD=	yes
>+USE_PGSQL=	yes
> 
> USE_PHP=	gettext pcre xml iconv
> 
>@@ -30,6 +36,7 @@
> 
> post-patch:
> 	${RM} ${WRKSRC}/inc/always.php.orig
>+	${RM} ${WRKSRC}/dba/create-database.sh.orig
> 
> do-install:
> 	${MKDIR} ${WWWDIR} ${WWWDIR}/htdocs ${WWWDIR}/inc ${WWWDIR}/config
>diff -ur davical.orig/distinfo davical/distinfo
>--- davical.orig/distinfo	2010-02-25 09:02:26.000000000 +1100
>+++ davical/distinfo	2010-02-25 11:23:46.000000000 +1100
>@@ -1,3 +1,3 @@
>-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
>+MD5 (davical-0.9.8.1.tar.gz) = 91f54cc7000c35e46d2c4645e20abda9
>+SHA256 (davical-0.9.8.1.tar.gz) = 2b02df5d22027f93377a8823f61e262879a5f92a0355b7331576fe3f6e0a10db
>+SIZE (davical-0.9.8.1.tar.gz) = 1847934
>Only in davical/files: patch-create-database.sh
>diff -ur davical.orig/files/pkg-message.in davical/files/pkg-message.in
>--- davical.orig/files/pkg-message.in	2010-02-25 09:02:26.000000000 +1100
>+++ davical/files/pkg-message.in	2010-02-25 09:16:15.000000000 +1100
>@@ -1,32 +1,18 @@
> To complete the installation of DAViCal:
> 
>-1. Create the database user:
>+1. Create DAViCal's database
> 
>-	createuser -U pgsql -S --no-createdb --no-createrole general
>+       su pgsql %%DOCSDIR%%/dba/create-database.sh
> 
>-2. Create DAViCal's database
>+2. Edit pg_hba.conf file to add the davical_app user close to the
>+top of the accounts
> 
>-	su pgsql %%DOCSDIR%%/dba/create-database.sh
>+	local   davical     davical_app   trust
> 
>-3. Fix permissions
>+3. Copy and edit your config file
> 
>-	psql -U pgsql davical -c "grant all on \
>-	awl_db_revision, caldav_data, calendar_item, collection, \
>-	dav_resource, dav_resource_type, freebusy_ticket, \
>-	group_member, locks, principal, principal_type, privilege, \
>-	property, relationship, relationship_type, role_member, \
>-	roles, session, supported_locales, time_zone, tmp_password, \
>-	usr, usr_setting, dav_id_seq, dav_resource_type_resource_type_id_seq, \
>-	principal_principal_id_seq, principal_type_principal_type_id_seq, \
>-	relationship_type_rt_id_seq, roles_role_no_seq, \
>-	session_session_id_seq, usr_user_no_seq \
>-	to general;"
>+       cp %%WWWDIR%%/config/example-config.php %%WWWDIR%%/config/config.php
> 
>-	psql -U pgsql davical -c "grant all on database davical to general;"
>-
>-4. Copy and edit your config file 
>-
>-	cp %%WWWDIR%%/config/example-config.php %%WWWDIR%%/config/config.php
>-
>-5. Enable in apache by copying the httpd-davical.conf from the
>-documentation directory to the Apache Include directory and restart Apache. 
>+4. Enable in apache by copying the httpd-davical.conf from the
>+documentation directory to the Apache Include directory and restart
>+Apache.

Actions: View | Diff

Attachments on bug 144271: 104133 | 104134