pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
davical-current: Rename to davical-git
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Thu Sep 22 23:08:35 2016 +0200
Changeset: 6165b70283fd645f2769e8dfc813c6d02c07e730
Modified Files:
Makefile
php-libawl-git/Makefile.common
Added Files:
davical-git/DESCR
davical-git/MESSAGE
davical-git/Makefile
davical-git/PLIST
davical-git/distinfo
davical-git/files/davical.conf
davical-git/patches/patch-dba_create-database.sh
davical-git/patches/patch-dba_update-davical-database
davical-git/patches/patch-inc_always.php.in
davical-git/patches/patch-inc_davical__configuration__missing.php
davical-git/patches/patch-scripts_po_rebuild-translations.sh
Removed Files:
davical-current/DESCR
davical-current/MESSAGE
davical-current/Makefile
davical-current/PLIST
davical-current/distinfo
davical-current/files/davical.conf
davical-current/patches/patch-dba_create-database.sh
davical-current/patches/patch-dba_update-davical-database
davical-current/patches/patch-inc_always.php.in
davical-current/patches/patch-inc_davical__configuration__missing.php
davical-current/patches/patch-scripts_po_rebuild-translations.sh
Log Message:
davical-current: Rename to davical-git
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6165b70283fd645f2769e8dfc813c6d02c07e730
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
davical-current/DESCR | 15 --
davical-current/MESSAGE | 73 -------
davical-current/Makefile | 146 --------------
davical-current/PLIST | 216 ---------------------
davical-current/distinfo | 7 -
davical-current/files/davical.conf | 30 ---
.../patches/patch-dba_create-database.sh | 23 ---
.../patches/patch-dba_update-davical-database | 13 --
davical-current/patches/patch-inc_always.php.in | 29 ---
.../patch-inc_davical__configuration__missing.php | 13 --
.../patch-scripts_po_rebuild-translations.sh | 14 --
davical-git/DESCR | 15 ++
davical-git/MESSAGE | 73 +++++++
davical-git/Makefile | 146 ++++++++++++++
davical-git/PLIST | 216 +++++++++++++++++++++
davical-git/distinfo | 7 +
davical-git/files/davical.conf | 30 +++
davical-git/patches/patch-dba_create-database.sh | 23 +++
.../patches/patch-dba_update-davical-database | 13 ++
davical-git/patches/patch-inc_always.php.in | 29 +++
.../patch-inc_davical__configuration__missing.php | 13 ++
.../patch-scripts_po_rebuild-translations.sh | 14 ++
php-libawl-git/Makefile.common | 2 +-
24 files changed, 581 insertions(+), 581 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index f84d9a1..7fb5b15 100644
--- a/Makefile
+++ b/Makefile
@@ -464,7 +464,7 @@ SUBDIR+= datamash
SUBDIR+= datapipe
SUBDIR+= dates
SUBDIR+= dateutils
-SUBDIR+= davical-current
+SUBDIR+= davical-git
SUBDIR+= db1
SUBDIR+= dbf
SUBDIR+= dbus-explorer
diff --git a/davical-current/DESCR b/davical-current/DESCR
deleted file mode 100644
index 65bcb33..0000000
--- a/davical-current/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-DAViCal is a server for calendar sharing. It is an implementation of the
-CalDAV protocol which is designed for storing calendaring resources (in
-iCalendar format) on a remote shared server.
-
-DAViCal supports basic delegation of read/write access among calendar users,
-multiple users (or clients) reading and writing the same calendar entries over
-time, and scheduling of meetings with free/busy time displayed.
-
-An increasing number of calendar clients support the maintenance of shared
-remote calendars through CalDAV, including Evolution, Mulberry, Chandler,
-Mozilla Calendar (Sunbird/Lightning), and various other closed-source
-products such as Apple's iCal and iPhone.
-
-This package will install the current development version from the GIT
-repository.
diff --git a/davical-current/MESSAGE b/davical-current/MESSAGE
deleted file mode 100644
index 66d86b2..0000000
--- a/davical-current/MESSAGE
+++ /dev/null
@@ -1,73 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2012/11/22 12:13:19 hfath Exp $
-
-For pkgsrc installations, DAViCal's package is installed in non-default
-locations:
-
- Document root: ${DAVICALDIR}/htdocs
- Configuration file: ${PKG_SYSCONFDIR}/config.php
-
-If you are upgrading from a previous version, see
-
- http://wiki.davical.org/w/Release_Notes
-
-for how to perform a database upgrade.
-
-To complete the installation of DAViCal, follow these steps:
-
-1. Create DAViCal's app (application) and dba (database admin) acounts.
- Depending on your PostgreSQL setup, this could be done in different
- ways, like:
-
- $ su pgsql
- $ createuser -D -R -S --pwprompt davical_app
- <enter davical_app passwd>
- $ createuser -D -R -S --pwprompt davical_dba
- <enter davical_dba passwd>
-
- Consider editing pg_hba.conf file to grant access for both accounts
- to the soon to be created 'davical' database.
-
-2. Adapt DAViCal's configuration files to your setup:
-
- ${PKG_SYSCONFDIR}/administration.yml (used for davical_dba)
- ${PKG_SYSCONFDIR}/config.php (used for davical_app)
-
- Look for 'pg_connect', 'system_name', 'admin_email', and 'default_locale'
- in config.php.
-
-3. To ease DAViCal's database creation, you can use the following script:
-
- ${DAVICALDIR}/dba/create-database.sh
-
- To work properly, it needs to be executed with a PostgreSQL's superuser
- account, and requires access to administration.yml file (see step 2.).
-
- At the end, the script will output the password of the www 'admin'
- account for DAViCal. Keep it in mind, it will be used at step 5.
-
-4. You will need to make DAViCal accessible through your HTTP server.
- If you are running Apache and ap-php, you can use the following file:
-
- ${PKG_SYSCONFDIR}/davical.conf
-
- and add an Include directive directly within Apache configuration:
-
- Include ${PKG_SYSCONFDIR}/davical.conf
-
- then restart Apache. Note that Davical requires the following PHP
- extensions to be loaded: pdo.so, pdo_pgsql.so, pgsql.so, iconv.so and
- gettext.so.
-
-5. You should now be able to access DAViCal through the URL configured
- at step 4. At login page, enter the following credentials:
-
- Login: admin
- Password: <the one obtained in step 3.>
-
- Validate, then follow the steps to create user accounts. See DAViCal
- online documentation for further information:
-
- ${HOMEPAGE}
-
-===========================================================================
diff --git a/davical-current/Makefile b/davical-current/Makefile
deleted file mode 100644
index ac424d1..0000000
--- a/davical-current/Makefile
+++ /dev/null
@@ -1,146 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2014/04/10 15:41:17 hfath Exp $
-#
-
-DISTNAME= davical-${DAVICAL_VERSION}
-DAVICAL_VERSION=1.1.4
-PKGREVISION= ${_GIT_PKGVERSION:S/.//g}
-CATEGORIES= www
-MASTER_SITES= http://debian.mcmillan.net.nz/packages/davical/
-
-MAINTAINER= hauke%NetBSD.org@localhost
-HOMEPAGE= http://www.davical.org/
-COMMENT= Simple CalDAV server using a PostgreSQL backend
-
-LICENSE= gnu-gpl-v2 AND gnu-gpl-v3
-
-GIT_REPOSITORIES= master
-GIT_REPO.master= https://gitlab.com/davical-project/davical.git
-GIT_MODULE.master= davical
-# for "SSL certificate problem: unable to get local issuer certificate"
-GIT_ENV.master+= GIT_SSL_NO_VERIFY=true
-
-DAVICALDIR= ${PREFIX}/share/davical
-EGDIR= ${PREFIX}/share/examples/davical
-DOCDIR= ${PREFIX}/share/doc/davical
-
-BUILD_DEFS= APACHE_USER APACHE_GROUP PGUSER PGGROUP
-
-# davical_dba account
-DAVICAL_USER?= ${PGUSER}
-DAVICAL_GROUP?= ${PGGROUP}
-
-USE_TOOLS= gmake pax msgfmt perl:build
-WRKSRC= ${WRKDIR}/${PKGBASE}
-
-PAXDIRS= htdocs inc dba po scripts
-
-INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}/config
-
-.include "../../lang/php/phpversion.mk"
-
-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.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
-
-PKG_SYSCONFSUBDIR= davical
-
-MESSAGE_SUBST+= DAVICALDIR=${DAVICALDIR:Q} DOCDIR=${DOCDIR:Q}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE:Q}
-
-CONF_FILES= ${EGDIR}/davical.conf \
- ${PKG_SYSCONFDIR}/davical.conf
-
-CONF_FILES_PERMS+= ${EGDIR}/config/example-administration.yml \
- ${PKG_SYSCONFDIR}/administration.yml \
- ${DAVICAL_USER} ${DAVICAL_GROUP} 0600
-
-CONF_FILES_PERMS+= ${EGDIR}/config/example-config.php \
- ${PKG_SYSCONFDIR}/config.php \
- ${APACHE_USER} ${APACHE_GROUP} 0640
-
-REPLACE_PERL= dba/update-davical-database
-REPLACE_PERL+= scripts/davical-cli
-
-REPLACE_INTERPRETER+= php
-REPLACE.php.old= .*php
-REPLACE.php.new= ${PREFIX}/bin/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
-REPLACE_FILES.php+= scripts/sync-remote-caldav.php
-REPLACE_FILES.php+= scripts/tz-update.php
-
-SUBST_CLASSES+= conf-path
-SUBST_STAGE.conf-path= pre-configure
-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_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
-SUBST_SED.inc-path+= -e "s|@LIBAWLPATH@|${PREFIX}/${LIBAWLDIR}|g"
-SUBST_MESSAGE.inc-path= Fixing AWL include path.
-
-SUBST_CLASSES+= examples
-SUBST_STAGE.examples= pre-configure
-SUBST_FILES.examples= dba/create-database.sh
-SUBST_SED.examples+= -e "s|@EGDIRCONFIG@|${EGDIR}/config|g"
-SUBST_MESSAGE.examples= Fixing config examples path.
-
-SUBST_CLASSES+= files
-SUBST_STAGE.files= pre-configure
-SUBST_FILES.files= davical.conf
-SUBST_SED.files+= -e "s|@DAVICALDIR@|${DAVICALDIR}|g"
-SUBST_MESSAGE.files= Fixing DAViCal configuration file for Apache.
-
-post-extract:
- ${CP} ${FILESDIR}/davical.conf ${WRKSRC}/davical.conf
-
-pre-install:
- ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
- ${FIND} ${WRKSRC}/po -name "*~" -print | ${XARGS} ${RM} -f
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/davical.conf \
- ${DESTDIR}${EGDIR}/davical.conf
-
- cd ${WRKSRC}/docs && \
- find . -name .gitignore -exec rm -f \{\} \; && \
- pax -rwpam . ${DESTDIR}${DOCDIR}
-
-. for f in COPYING CREDITS ChangeLog INSTALL README TODO VERSION
- cd ${WRKSRC} && \
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
-. endfor
-
-. for d in ${PAXDIRS}
- ${INSTALL_DATA_DIR} ${DESTDIR}${DAVICALDIR}/${d}
- cd ${WRKSRC}/${d} && find . -name .gitignore -exec rm -f \{\} \;
- cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${DAVICALDIR}/${d}
-. endfor
-
- cd ${WRKSRC}/config && for f in *; do \
- ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/config/$$f; \
- done
-
-.include "../../wip/mk/git-package.mk"
-.include "../../mk/pgsql.buildlink3.mk"
-.include "../../devel/php-libawl/Makefile.common"
-.include "../../mk/apache.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/davical-current/PLIST b/davical-current/PLIST
deleted file mode 100644
index f7cd364..0000000
--- a/davical-current/PLIST
+++ /dev/null
@@ -1,216 +0,0 @@
-@comment $NetBSD$
-share/davical/dba/appuser_permissions.txt
-share/davical/dba/base-data.sql
-share/davical/dba/better_perms.sql
-share/davical/dba/caldav_functions.sql
-share/davical/dba/create-database.sh
-share/davical/dba/davical.sql
-share/davical/dba/patches/1.1.10.sql
-share/davical/dba/patches/1.1.11.sql
-share/davical/dba/patches/1.1.11a.sql
-share/davical/dba/patches/1.1.12.sql
-share/davical/dba/patches/1.1.12a.sql
-share/davical/dba/patches/1.1.2.sql
-share/davical/dba/patches/1.1.3.sql
-share/davical/dba/patches/1.1.4.sql
-share/davical/dba/patches/1.1.5.sql
-share/davical/dba/patches/1.1.6.sql
-share/davical/dba/patches/1.1.7.sql
-share/davical/dba/patches/1.1.8.sql
-share/davical/dba/patches/1.1.9.sql
-share/davical/dba/patches/1.2.1.sql
-share/davical/dba/patches/1.2.10.sql
-share/davical/dba/patches/1.2.10a.sql
-share/davical/dba/patches/1.2.11.sql
-share/davical/dba/patches/1.2.12.sql
-share/davical/dba/patches/1.2.1a.sql
-share/davical/dba/patches/1.2.1b.sql
-share/davical/dba/patches/1.2.2.sql
-share/davical/dba/patches/1.2.3.sql
-share/davical/dba/patches/1.2.3a.sql
-share/davical/dba/patches/1.2.4.sql
-share/davical/dba/patches/1.2.5.sql
-share/davical/dba/patches/1.2.6.sql
-share/davical/dba/patches/1.2.7.sql
-share/davical/dba/patches/1.2.8.sql
-share/davical/dba/patches/1.2.9.sql
-share/davical/dba/patches/1.3.1.sql
-share/davical/dba/patches/1.3.2.sql
-share/davical/dba/rrule_functions-8.1.sql
-share/davical/dba/rrule_functions.sql
-share/davical/dba/rrule_tests.sql
-share/davical/dba/supported_locales.sql
-share/davical/dba/update-davical-database
-share/davical/dba/views/dav_principal.sql
-share/davical/dba/windows/create-database.bat
-share/davical/htdocs/.htaccess
-share/davical/htdocs/admin.php
-share/davical/htdocs/always.php
-share/davical/htdocs/caldav.php
-share/davical/htdocs/css/browse.css
-share/davical/htdocs/css/edit.css
-share/davical/htdocs/davical.css
-share/davical/htdocs/feed.php
-share/davical/htdocs/freebusy.php
-share/davical/htdocs/help.php
-share/davical/htdocs/iSchedule.php
-share/davical/htdocs/images/down.gif
-share/davical/htdocs/images/up.gif
-share/davical/htdocs/index.php
-share/davical/htdocs/js/browse.js
-share/davical/htdocs/metrics.php
-share/davical/htdocs/public.php
-share/davical/htdocs/robots.txt
-share/davical/htdocs/setup.php
-share/davical/htdocs/tools.php
-share/davical/htdocs/tz.php
-share/davical/htdocs/upgrade.php
-share/davical/inc/AtomFeed.php
-share/davical/inc/CalDAVRequest.php
-share/davical/inc/DAVPrincipal.php
-share/davical/inc/DAVResource.php
-share/davical/inc/DAVTicket.php
-share/davical/inc/DAViCalSession.php
-share/davical/inc/HTTPAuthSession.php
-share/davical/inc/Principal.php
-share/davical/inc/PublicSession.php
-share/davical/inc/RRule-v2.php
-share/davical/inc/RRule.php
-share/davical/inc/WritableCollection.php
-share/davical/inc/always.php.in
-share/davical/inc/auth-functions.php
-share/davical/inc/autodiscover-handler.php
-share/davical/inc/caldav-ACL.php
-share/davical/inc/caldav-BIND.php
-share/davical/inc/caldav-DELETE.php
-share/davical/inc/caldav-DELTICKET.php
-share/davical/inc/caldav-GET-functions.php
-share/davical/inc/caldav-GET.php
-share/davical/inc/caldav-LOCK.php
-share/davical/inc/caldav-MKCOL.php
-share/davical/inc/caldav-MKTICKET.php
-share/davical/inc/caldav-MOVE.php
-share/davical/inc/caldav-OPTIONS.php
-share/davical/inc/caldav-POST.php
-share/davical/inc/caldav-PROPFIND.php
-share/davical/inc/caldav-PROPPATCH.php
-share/davical/inc/caldav-PUT-default.php
-share/davical/inc/caldav-PUT-functions.php
-share/davical/inc/caldav-PUT-vcalendar.php
-share/davical/inc/caldav-PUT-vcard.php
-share/davical/inc/caldav-REPORT-calquery.php
-share/davical/inc/caldav-REPORT-cardquery.php
-share/davical/inc/caldav-REPORT-expand-property.php
-share/davical/inc/caldav-REPORT-freebusy.php
-share/davical/inc/caldav-REPORT-multiget.php
-share/davical/inc/caldav-REPORT-pps-set.php
-share/davical/inc/caldav-REPORT-principal-match.php
-share/davical/inc/caldav-REPORT-principal.php
-share/davical/inc/caldav-REPORT-sync-collection.php
-share/davical/inc/caldav-REPORT.php
-share/davical/inc/caldav-client-v2.php
-share/davical/inc/caldav-client.php
-share/davical/inc/check_UTF8.php
-share/davical/inc/davical_configuration_missing.php
-share/davical/inc/drivers_imap_pam.php
-share/davical/inc/drivers_ldap.php
-share/davical/inc/drivers_pwauth_pam.php
-share/davical/inc/drivers_rimap.php
-share/davical/inc/drivers_squid_pam.php
-share/davical/inc/external-fetch.php
-share/davical/inc/freebusy-functions.php
-share/davical/inc/iSchedule-POST.php
-share/davical/inc/iSchedule.php
-share/davical/inc/interactive-page.php
-share/davical/inc/log_caldav_action.php
-share/davical/inc/other_translated_strings.php
-share/davical/inc/page-footer.php
-share/davical/inc/page-header.php
-share/davical/inc/pubsub.php
-share/davical/inc/schedule-functions.php
-share/davical/inc/test-RRULE.php
-share/davical/inc/tz/capabilities.php
-share/davical/inc/tz/expand.php
-share/davical/inc/tz/get.php
-share/davical/inc/tz/list.php
-share/davical/inc/ui/collection-edit.php
-share/davical/inc/ui/external-browse.php
-share/davical/inc/ui/principal-browse.php
-share/davical/inc/ui/principal-edit.php
-share/davical/inc/vcard.php
-share/davical/inc/vtimezone.php
-share/davical/inc/well-known.php
-share/davical/po/ar.po
-share/davical/po/ar.values
-share/davical/po/ca.po
-share/davical/po/cs_CZ.po
-share/davical/po/de.po
-share/davical/po/de.values
-share/davical/po/es_AR.po
-share/davical/po/es_AR.values
-share/davical/po/es_ES.po
-share/davical/po/es_ES.values
-share/davical/po/es_MX.po
-share/davical/po/es_MX.values
-share/davical/po/es_VE.po
-share/davical/po/es_VE.values
-share/davical/po/et.po
-share/davical/po/et.values
-share/davical/po/fi.po
-share/davical/po/fi.values
-share/davical/po/fr.po
-share/davical/po/fr.values
-share/davical/po/hu.po
-share/davical/po/hu.values
-share/davical/po/id_ID.po
-share/davical/po/it.po
-share/davical/po/it.values
-share/davical/po/ja.po
-share/davical/po/ja.values
-share/davical/po/ko_KR.po
-share/davical/po/ko_KR.values
-share/davical/po/messages.pot
-share/davical/po/nb_NO.po
-share/davical/po/nb_NO.values
-share/davical/po/nl.po
-share/davical/po/nl.values
-share/davical/po/pl.po
-share/davical/po/pl.values
-share/davical/po/pofilelist.txt
-share/davical/po/pt_BR.po
-share/davical/po/pt_BR.values
-share/davical/po/pt_PT.po
-share/davical/po/pt_PT.values
-share/davical/po/ru.po
-share/davical/po/ru.values
-share/davical/po/sk_SK.po
-share/davical/po/sk_SK.values
-share/davical/po/sv.po
-share/davical/po/sv.values
-share/davical/scripts/archive-old-events.php
-share/davical/scripts/build-always.sh
-share/davical/scripts/cron-sync-ldap.php
-share/davical/scripts/davical-cli
-share/davical/scripts/export_calendar.php
-share/davical/scripts/load_calendar.php
-share/davical/scripts/po/rebuild-translations.sh
-share/davical/scripts/refresh-alarms.php
-share/davical/scripts/sync-remote-caldav.php
-share/davical/scripts/tz-update.php
-share/doc/davical/COPYING
-share/doc/davical/CREDITS
-share/doc/davical/ChangeLog
-share/doc/davical/INSTALL
-share/doc/davical/README
-share/doc/davical/TODO
-share/doc/davical/VERSION
-share/doc/davical/davical_en_user_guide.odt
-share/doc/davical/phpdoc.ini
-share/doc/davical/translation.rst
-share/examples/davical/config/apache-davical.conf
-share/examples/davical/config/debug-config.php
-share/examples/davical/config/example-administration.yml
-share/examples/davical/config/example-config.php
-share/examples/davical/config/imap_pam_conf_php.txt
-share/examples/davical/config/other-config.php
-share/examples/davical/davical.conf
diff --git a/davical-current/distinfo b/davical-current/distinfo
deleted file mode 100644
index b971361..0000000
--- a/davical-current/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2013/11/07 12:39:31 noud4 Exp $
-
-SHA1 (patch-dba_create-database.sh) = d5719354896873badce2ffa0a7718870f0c705c2
-SHA1 (patch-dba_update-davical-database) = 7ac756cff0949090b54f4cdfa709c07198b6366c
-SHA1 (patch-inc_always.php.in) = 0a818cb04dd64df25ba15b04b5eb38a2dffd8438
-SHA1 (patch-inc_davical__configuration__missing.php) = 27d0fab4ff8770acf07a12b19cadb8ac059381e2
-SHA1 (patch-scripts_po_rebuild-translations.sh) = 864692ee896a71171a12127bab883321b6f77c81
diff --git a/davical-current/files/davical.conf b/davical-current/files/davical.conf
deleted file mode 100644
index 5821652..0000000
--- a/davical-current/files/davical.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# This configuration puts DAViCal under /davical. The user accounts
-# will be accessible through /davical/caldav.php/<username>
-Alias /davical "@DAVICALDIR@/htdocs"
-
-<Directory "@DAVICALDIR@/htdocs">
- AllowOverride All
- DirectoryIndex index.php
- Order Allow,Deny
- Allow from All
- php_value include_path "@LIBAWLPATH@"
-</Directory>
-
-# This configuration puts DAViCal in its own VirtualHost. The user
-# accounts will be accessible through
-# http(s)://davical.example.net/caldav.php/<username>
-#<VirtualHost *>
-# DocumentRoot "@DAVICALDIR@/htdocs"
-#
-# ServerName davical.example.net
-# ServerAlias calendar.example.net
-#
-# DirectoryIndex index.php
-#
-# <Location />
-# Order allow,deny
-# Allow from all
-# </Location>
-#
-# php_value include_path "@LIBAWLPATH@"
-#</VirtualHost>
diff --git a/davical-current/patches/patch-dba_create-database.sh b/davical-current/patches/patch-dba_create-database.sh
deleted file mode 100644
index f5e3450..0000000
--- a/davical-current/patches/patch-dba_create-database.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
---- dba/create-database.sh.orig 2015-11-12 14:35:57.000000000 +0000
-+++ dba/create-database.sh
-@@ -12,7 +12,8 @@ INSTALL_NOTE_FN="`mktemp -t tmp.XXXXXXXX
-
-
- # Candidate locations of the AWL directory
--awldirs="${DBADIR}/../../awl
-+awldirs="@LIBAWLPATH@
-+${DBADIR}/../../awl
- /usr/share/awl
- /usr/share/php/awl
- /usr/local/share/awl"
-@@ -182,7 +183,7 @@ rm "${INSTALL_NOTE_FN}"
- cat <<FRIENDLY
- * The password for the 'admin' user has been set to '${ADMINPW}'
-
--Thanks for trying DAViCal! Check in /usr/share/doc/davical/examples/ for
-+Thanks for trying DAViCal! Check in @EGDIRCONFIG@/ for
- some configuration examples. For help, visit #davical on irc.oftc.net.
-
- FRIENDLY
diff --git a/davical-current/patches/patch-dba_update-davical-database b/davical-current/patches/patch-dba_update-davical-database
deleted file mode 100644
index ed6eaa3..0000000
--- a/davical-current/patches/patch-dba_update-davical-database
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- dba/update-davical-database.orig 2015-11-12 14:35:57.000000000 +0000
-+++ dba/update-davical-database
-@@ -23,7 +23,7 @@ my $helpmeplease = 0;
- my $apply_patches = 1;
- my $revoke_list = "";
- my $force_owner = "";
--my $config_file = "config/administration.yml";
-+my $config_file = "@PKG_SYSCONFDIR@/administration.yml";
-
- my $dbadir = $0;
- $dbadir =~ s#/[^/]*$##;
diff --git a/davical-current/patches/patch-inc_always.php.in b/davical-current/patches/patch-inc_always.php.in
deleted file mode 100644
index 01ee49c..0000000
--- a/davical-current/patches/patch-inc_always.php.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
---- inc/always.php.in.orig 2015-11-12 14:35:57.000000000 +0000
-+++ inc/always.php.in
-@@ -105,7 +105,7 @@ if ( ! @include_once('AWLUtilities.php')
- '../../awl/inc'
- , '/usr/share/awl/inc' // Where it ends up on Debian
- , '/usr/share/php/awl/inc' // Fedora's standard for PHP libraries
-- , '/usr/local/share/awl/inc'
-+ , '@LIBAWLPATH@/inc'
- );
- foreach( $try_paths AS $awl_include_path ) {
- if ( @file_exists($awl_include_path.'/AWLUtilities.php') ) {
-@@ -158,11 +158,11 @@ if ( @file_exists('/etc/davical/'.$_SERV
- else if ( @file_exists('/etc/davical/config.php') ) {
- include('/etc/davical/config.php');
- }
--else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
-- include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
-+else if ( @file_exists('@PKG_SYSCONFDIR@'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
-+ include('@PKG_SYSCONFDIR@'.$_SERVER['SERVER_NAME'].'-conf.php');
- }
--else if ( @file_exists('/usr/local/etc/davical/config.php') ) {
-- include('/usr/local/etc/davical/config.php');
-+else if ( @file_exists('@PKG_SYSCONFDIR@/config.php') ) {
-+ include('@PKG_SYSCONFDIR@/config.php');
- }
- else if ( @file_exists('../config/config.php') ) {
- include('../config/config.php');
diff --git a/davical-current/patches/patch-inc_davical__configuration__missing.php b/davical-current/patches/patch-inc_davical__configuration__missing.php
deleted file mode 100644
index 8e39d29..0000000
--- a/davical-current/patches/patch-inc_davical__configuration__missing.php
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- inc/davical_configuration_missing.php.orig 2015-11-12 14:35:57.000000000 +0000
-+++ inc/davical_configuration_missing.php
-@@ -4,7 +4,7 @@ include("page-header.php");
- echo <<<EOBODY
- <h1>DAViCal Not Configured</h1>
- <h2>The Bad News</h2>
--<p>There is no configuration file present in <b>/etc/davical/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so
-+<p>There is no configuration file present in <b>@PKG_SYSCONFDIR@/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so
- your installation is not fully set up.</p>
- <h2>The Good News</h2>
- <p>Well, you're seeing this! At least you have DAViCal <i>installed</i> :-) You also have Apache and PHP working
diff --git a/davical-current/patches/patch-scripts_po_rebuild-translations.sh b/davical-current/patches/patch-scripts_po_rebuild-translations.sh
deleted file mode 100644
index d592d6d..0000000
--- a/davical-current/patches/patch-scripts_po_rebuild-translations.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- scripts/po/rebuild-translations.sh.orig 2015-11-12 14:35:57.000000000 +0000
-+++ scripts/po/rebuild-translations.sh
-@@ -11,7 +11,8 @@ PODIR="po"
- LOCALEDIR="locale"
- APPLICATION="davical"
-
--awldirs="../awl
-+awldirs="@LIBAWLPATH@
-+../awl
- `find .. -type d -name 'awl-*.*'`
- /usr/share/awl
- /usr/share/php/awl
diff --git a/davical-git/DESCR b/davical-git/DESCR
new file mode 100644
index 0000000..65bcb33
--- /dev/null
+++ b/davical-git/DESCR
@@ -0,0 +1,15 @@
+DAViCal is a server for calendar sharing. It is an implementation of the
+CalDAV protocol which is designed for storing calendaring resources (in
+iCalendar format) on a remote shared server.
+
+DAViCal supports basic delegation of read/write access among calendar users,
+multiple users (or clients) reading and writing the same calendar entries over
+time, and scheduling of meetings with free/busy time displayed.
+
+An increasing number of calendar clients support the maintenance of shared
+remote calendars through CalDAV, including Evolution, Mulberry, Chandler,
+Mozilla Calendar (Sunbird/Lightning), and various other closed-source
+products such as Apple's iCal and iPhone.
+
+This package will install the current development version from the GIT
+repository.
diff --git a/davical-git/MESSAGE b/davical-git/MESSAGE
new file mode 100644
index 0000000..66d86b2
--- /dev/null
+++ b/davical-git/MESSAGE
@@ -0,0 +1,73 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2012/11/22 12:13:19 hfath Exp $
+
+For pkgsrc installations, DAViCal's package is installed in non-default
+locations:
+
+ Document root: ${DAVICALDIR}/htdocs
+ Configuration file: ${PKG_SYSCONFDIR}/config.php
+
+If you are upgrading from a previous version, see
+
+ http://wiki.davical.org/w/Release_Notes
+
+for how to perform a database upgrade.
+
+To complete the installation of DAViCal, follow these steps:
+
+1. Create DAViCal's app (application) and dba (database admin) acounts.
+ Depending on your PostgreSQL setup, this could be done in different
+ ways, like:
+
+ $ su pgsql
+ $ createuser -D -R -S --pwprompt davical_app
+ <enter davical_app passwd>
+ $ createuser -D -R -S --pwprompt davical_dba
+ <enter davical_dba passwd>
+
+ Consider editing pg_hba.conf file to grant access for both accounts
+ to the soon to be created 'davical' database.
+
+2. Adapt DAViCal's configuration files to your setup:
+
+ ${PKG_SYSCONFDIR}/administration.yml (used for davical_dba)
+ ${PKG_SYSCONFDIR}/config.php (used for davical_app)
+
+ Look for 'pg_connect', 'system_name', 'admin_email', and 'default_locale'
+ in config.php.
+
+3. To ease DAViCal's database creation, you can use the following script:
+
+ ${DAVICALDIR}/dba/create-database.sh
+
+ To work properly, it needs to be executed with a PostgreSQL's superuser
+ account, and requires access to administration.yml file (see step 2.).
+
+ At the end, the script will output the password of the www 'admin'
+ account for DAViCal. Keep it in mind, it will be used at step 5.
+
+4. You will need to make DAViCal accessible through your HTTP server.
+ If you are running Apache and ap-php, you can use the following file:
+
+ ${PKG_SYSCONFDIR}/davical.conf
+
+ and add an Include directive directly within Apache configuration:
+
+ Include ${PKG_SYSCONFDIR}/davical.conf
+
+ then restart Apache. Note that Davical requires the following PHP
+ extensions to be loaded: pdo.so, pdo_pgsql.so, pgsql.so, iconv.so and
+ gettext.so.
+
+5. You should now be able to access DAViCal through the URL configured
+ at step 4. At login page, enter the following credentials:
+
+ Login: admin
+ Password: <the one obtained in step 3.>
+
+ Validate, then follow the steps to create user accounts. See DAViCal
+ online documentation for further information:
+
+ ${HOMEPAGE}
+
+===========================================================================
diff --git a/davical-git/Makefile b/davical-git/Makefile
new file mode 100644
index 0000000..ac424d1
--- /dev/null
+++ b/davical-git/Makefile
@@ -0,0 +1,146 @@
+# $NetBSD: Makefile,v 1.4 2014/04/10 15:41:17 hfath Exp $
+#
+
+DISTNAME= davical-${DAVICAL_VERSION}
+DAVICAL_VERSION=1.1.4
+PKGREVISION= ${_GIT_PKGVERSION:S/.//g}
+CATEGORIES= www
+MASTER_SITES= http://debian.mcmillan.net.nz/packages/davical/
+
+MAINTAINER= hauke%NetBSD.org@localhost
+HOMEPAGE= http://www.davical.org/
+COMMENT= Simple CalDAV server using a PostgreSQL backend
+
+LICENSE= gnu-gpl-v2 AND gnu-gpl-v3
+
+GIT_REPOSITORIES= master
+GIT_REPO.master= https://gitlab.com/davical-project/davical.git
+GIT_MODULE.master= davical
+# for "SSL certificate problem: unable to get local issuer certificate"
+GIT_ENV.master+= GIT_SSL_NO_VERIFY=true
+
+DAVICALDIR= ${PREFIX}/share/davical
+EGDIR= ${PREFIX}/share/examples/davical
+DOCDIR= ${PREFIX}/share/doc/davical
+
+BUILD_DEFS= APACHE_USER APACHE_GROUP PGUSER PGGROUP
+
+# davical_dba account
+DAVICAL_USER?= ${PGUSER}
+DAVICAL_GROUP?= ${PGGROUP}
+
+USE_TOOLS= gmake pax msgfmt perl:build
+WRKSRC= ${WRKDIR}/${PKGBASE}
+
+PAXDIRS= htdocs inc dba po scripts
+
+INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}/config
+
+.include "../../lang/php/phpversion.mk"
+
+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.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
+
+PKG_SYSCONFSUBDIR= davical
+
+MESSAGE_SUBST+= DAVICALDIR=${DAVICALDIR:Q} DOCDIR=${DOCDIR:Q}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE:Q}
+
+CONF_FILES= ${EGDIR}/davical.conf \
+ ${PKG_SYSCONFDIR}/davical.conf
+
+CONF_FILES_PERMS+= ${EGDIR}/config/example-administration.yml \
+ ${PKG_SYSCONFDIR}/administration.yml \
+ ${DAVICAL_USER} ${DAVICAL_GROUP} 0600
+
+CONF_FILES_PERMS+= ${EGDIR}/config/example-config.php \
+ ${PKG_SYSCONFDIR}/config.php \
+ ${APACHE_USER} ${APACHE_GROUP} 0640
+
+REPLACE_PERL= dba/update-davical-database
+REPLACE_PERL+= scripts/davical-cli
+
+REPLACE_INTERPRETER+= php
+REPLACE.php.old= .*php
+REPLACE.php.new= ${PREFIX}/bin/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
+REPLACE_FILES.php+= scripts/sync-remote-caldav.php
+REPLACE_FILES.php+= scripts/tz-update.php
+
+SUBST_CLASSES+= conf-path
+SUBST_STAGE.conf-path= pre-configure
+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_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
+SUBST_SED.inc-path+= -e "s|@LIBAWLPATH@|${PREFIX}/${LIBAWLDIR}|g"
+SUBST_MESSAGE.inc-path= Fixing AWL include path.
+
+SUBST_CLASSES+= examples
+SUBST_STAGE.examples= pre-configure
+SUBST_FILES.examples= dba/create-database.sh
+SUBST_SED.examples+= -e "s|@EGDIRCONFIG@|${EGDIR}/config|g"
+SUBST_MESSAGE.examples= Fixing config examples path.
+
+SUBST_CLASSES+= files
+SUBST_STAGE.files= pre-configure
+SUBST_FILES.files= davical.conf
+SUBST_SED.files+= -e "s|@DAVICALDIR@|${DAVICALDIR}|g"
+SUBST_MESSAGE.files= Fixing DAViCal configuration file for Apache.
+
+post-extract:
+ ${CP} ${FILESDIR}/davical.conf ${WRKSRC}/davical.conf
+
+pre-install:
+ ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+ ${FIND} ${WRKSRC}/po -name "*~" -print | ${XARGS} ${RM} -f
+
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/davical.conf \
+ ${DESTDIR}${EGDIR}/davical.conf
+
+ cd ${WRKSRC}/docs && \
+ find . -name .gitignore -exec rm -f \{\} \; && \
+ pax -rwpam . ${DESTDIR}${DOCDIR}
+
+. for f in COPYING CREDITS ChangeLog INSTALL README TODO VERSION
+ cd ${WRKSRC} && \
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
+. endfor
+
+. for d in ${PAXDIRS}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${DAVICALDIR}/${d}
+ cd ${WRKSRC}/${d} && find . -name .gitignore -exec rm -f \{\} \;
+ cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${DAVICALDIR}/${d}
+. endfor
+
+ cd ${WRKSRC}/config && for f in *; do \
+ ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/config/$$f; \
+ done
+
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/pgsql.buildlink3.mk"
+.include "../../devel/php-libawl/Makefile.common"
+.include "../../mk/apache.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/davical-git/PLIST b/davical-git/PLIST
new file mode 100644
index 0000000..f7cd364
--- /dev/null
+++ b/davical-git/PLIST
@@ -0,0 +1,216 @@
+@comment $NetBSD$
+share/davical/dba/appuser_permissions.txt
+share/davical/dba/base-data.sql
+share/davical/dba/better_perms.sql
+share/davical/dba/caldav_functions.sql
+share/davical/dba/create-database.sh
+share/davical/dba/davical.sql
+share/davical/dba/patches/1.1.10.sql
+share/davical/dba/patches/1.1.11.sql
+share/davical/dba/patches/1.1.11a.sql
+share/davical/dba/patches/1.1.12.sql
+share/davical/dba/patches/1.1.12a.sql
+share/davical/dba/patches/1.1.2.sql
+share/davical/dba/patches/1.1.3.sql
+share/davical/dba/patches/1.1.4.sql
+share/davical/dba/patches/1.1.5.sql
+share/davical/dba/patches/1.1.6.sql
+share/davical/dba/patches/1.1.7.sql
+share/davical/dba/patches/1.1.8.sql
+share/davical/dba/patches/1.1.9.sql
+share/davical/dba/patches/1.2.1.sql
+share/davical/dba/patches/1.2.10.sql
+share/davical/dba/patches/1.2.10a.sql
+share/davical/dba/patches/1.2.11.sql
+share/davical/dba/patches/1.2.12.sql
+share/davical/dba/patches/1.2.1a.sql
+share/davical/dba/patches/1.2.1b.sql
+share/davical/dba/patches/1.2.2.sql
+share/davical/dba/patches/1.2.3.sql
+share/davical/dba/patches/1.2.3a.sql
+share/davical/dba/patches/1.2.4.sql
+share/davical/dba/patches/1.2.5.sql
+share/davical/dba/patches/1.2.6.sql
+share/davical/dba/patches/1.2.7.sql
+share/davical/dba/patches/1.2.8.sql
+share/davical/dba/patches/1.2.9.sql
+share/davical/dba/patches/1.3.1.sql
+share/davical/dba/patches/1.3.2.sql
+share/davical/dba/rrule_functions-8.1.sql
+share/davical/dba/rrule_functions.sql
+share/davical/dba/rrule_tests.sql
+share/davical/dba/supported_locales.sql
+share/davical/dba/update-davical-database
+share/davical/dba/views/dav_principal.sql
+share/davical/dba/windows/create-database.bat
+share/davical/htdocs/.htaccess
+share/davical/htdocs/admin.php
+share/davical/htdocs/always.php
+share/davical/htdocs/caldav.php
+share/davical/htdocs/css/browse.css
+share/davical/htdocs/css/edit.css
+share/davical/htdocs/davical.css
+share/davical/htdocs/feed.php
+share/davical/htdocs/freebusy.php
+share/davical/htdocs/help.php
+share/davical/htdocs/iSchedule.php
+share/davical/htdocs/images/down.gif
+share/davical/htdocs/images/up.gif
+share/davical/htdocs/index.php
+share/davical/htdocs/js/browse.js
+share/davical/htdocs/metrics.php
+share/davical/htdocs/public.php
+share/davical/htdocs/robots.txt
+share/davical/htdocs/setup.php
+share/davical/htdocs/tools.php
+share/davical/htdocs/tz.php
+share/davical/htdocs/upgrade.php
+share/davical/inc/AtomFeed.php
+share/davical/inc/CalDAVRequest.php
+share/davical/inc/DAVPrincipal.php
+share/davical/inc/DAVResource.php
+share/davical/inc/DAVTicket.php
+share/davical/inc/DAViCalSession.php
+share/davical/inc/HTTPAuthSession.php
+share/davical/inc/Principal.php
+share/davical/inc/PublicSession.php
+share/davical/inc/RRule-v2.php
+share/davical/inc/RRule.php
+share/davical/inc/WritableCollection.php
+share/davical/inc/always.php.in
+share/davical/inc/auth-functions.php
+share/davical/inc/autodiscover-handler.php
+share/davical/inc/caldav-ACL.php
+share/davical/inc/caldav-BIND.php
+share/davical/inc/caldav-DELETE.php
+share/davical/inc/caldav-DELTICKET.php
+share/davical/inc/caldav-GET-functions.php
+share/davical/inc/caldav-GET.php
+share/davical/inc/caldav-LOCK.php
+share/davical/inc/caldav-MKCOL.php
+share/davical/inc/caldav-MKTICKET.php
+share/davical/inc/caldav-MOVE.php
+share/davical/inc/caldav-OPTIONS.php
+share/davical/inc/caldav-POST.php
+share/davical/inc/caldav-PROPFIND.php
+share/davical/inc/caldav-PROPPATCH.php
+share/davical/inc/caldav-PUT-default.php
+share/davical/inc/caldav-PUT-functions.php
+share/davical/inc/caldav-PUT-vcalendar.php
+share/davical/inc/caldav-PUT-vcard.php
+share/davical/inc/caldav-REPORT-calquery.php
+share/davical/inc/caldav-REPORT-cardquery.php
+share/davical/inc/caldav-REPORT-expand-property.php
+share/davical/inc/caldav-REPORT-freebusy.php
+share/davical/inc/caldav-REPORT-multiget.php
+share/davical/inc/caldav-REPORT-pps-set.php
+share/davical/inc/caldav-REPORT-principal-match.php
+share/davical/inc/caldav-REPORT-principal.php
+share/davical/inc/caldav-REPORT-sync-collection.php
+share/davical/inc/caldav-REPORT.php
+share/davical/inc/caldav-client-v2.php
+share/davical/inc/caldav-client.php
+share/davical/inc/check_UTF8.php
+share/davical/inc/davical_configuration_missing.php
+share/davical/inc/drivers_imap_pam.php
+share/davical/inc/drivers_ldap.php
+share/davical/inc/drivers_pwauth_pam.php
+share/davical/inc/drivers_rimap.php
+share/davical/inc/drivers_squid_pam.php
+share/davical/inc/external-fetch.php
+share/davical/inc/freebusy-functions.php
+share/davical/inc/iSchedule-POST.php
+share/davical/inc/iSchedule.php
+share/davical/inc/interactive-page.php
+share/davical/inc/log_caldav_action.php
+share/davical/inc/other_translated_strings.php
+share/davical/inc/page-footer.php
+share/davical/inc/page-header.php
+share/davical/inc/pubsub.php
+share/davical/inc/schedule-functions.php
+share/davical/inc/test-RRULE.php
+share/davical/inc/tz/capabilities.php
+share/davical/inc/tz/expand.php
+share/davical/inc/tz/get.php
+share/davical/inc/tz/list.php
+share/davical/inc/ui/collection-edit.php
+share/davical/inc/ui/external-browse.php
+share/davical/inc/ui/principal-browse.php
+share/davical/inc/ui/principal-edit.php
+share/davical/inc/vcard.php
+share/davical/inc/vtimezone.php
+share/davical/inc/well-known.php
+share/davical/po/ar.po
+share/davical/po/ar.values
+share/davical/po/ca.po
+share/davical/po/cs_CZ.po
+share/davical/po/de.po
+share/davical/po/de.values
+share/davical/po/es_AR.po
+share/davical/po/es_AR.values
+share/davical/po/es_ES.po
+share/davical/po/es_ES.values
+share/davical/po/es_MX.po
+share/davical/po/es_MX.values
+share/davical/po/es_VE.po
+share/davical/po/es_VE.values
+share/davical/po/et.po
+share/davical/po/et.values
+share/davical/po/fi.po
+share/davical/po/fi.values
+share/davical/po/fr.po
+share/davical/po/fr.values
+share/davical/po/hu.po
+share/davical/po/hu.values
+share/davical/po/id_ID.po
+share/davical/po/it.po
+share/davical/po/it.values
+share/davical/po/ja.po
+share/davical/po/ja.values
+share/davical/po/ko_KR.po
+share/davical/po/ko_KR.values
+share/davical/po/messages.pot
+share/davical/po/nb_NO.po
+share/davical/po/nb_NO.values
+share/davical/po/nl.po
+share/davical/po/nl.values
+share/davical/po/pl.po
+share/davical/po/pl.values
+share/davical/po/pofilelist.txt
+share/davical/po/pt_BR.po
+share/davical/po/pt_BR.values
+share/davical/po/pt_PT.po
+share/davical/po/pt_PT.values
+share/davical/po/ru.po
+share/davical/po/ru.values
+share/davical/po/sk_SK.po
+share/davical/po/sk_SK.values
+share/davical/po/sv.po
+share/davical/po/sv.values
+share/davical/scripts/archive-old-events.php
+share/davical/scripts/build-always.sh
+share/davical/scripts/cron-sync-ldap.php
+share/davical/scripts/davical-cli
+share/davical/scripts/export_calendar.php
+share/davical/scripts/load_calendar.php
+share/davical/scripts/po/rebuild-translations.sh
+share/davical/scripts/refresh-alarms.php
+share/davical/scripts/sync-remote-caldav.php
+share/davical/scripts/tz-update.php
+share/doc/davical/COPYING
+share/doc/davical/CREDITS
+share/doc/davical/ChangeLog
+share/doc/davical/INSTALL
+share/doc/davical/README
+share/doc/davical/TODO
+share/doc/davical/VERSION
+share/doc/davical/davical_en_user_guide.odt
+share/doc/davical/phpdoc.ini
+share/doc/davical/translation.rst
+share/examples/davical/config/apache-davical.conf
+share/examples/davical/config/debug-config.php
+share/examples/davical/config/example-administration.yml
+share/examples/davical/config/example-config.php
+share/examples/davical/config/imap_pam_conf_php.txt
+share/examples/davical/config/other-config.php
+share/examples/davical/davical.conf
diff --git a/davical-git/distinfo b/davical-git/distinfo
new file mode 100644
index 0000000..b971361
--- /dev/null
+++ b/davical-git/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.4 2013/11/07 12:39:31 noud4 Exp $
+
+SHA1 (patch-dba_create-database.sh) = d5719354896873badce2ffa0a7718870f0c705c2
+SHA1 (patch-dba_update-davical-database) = 7ac756cff0949090b54f4cdfa709c07198b6366c
+SHA1 (patch-inc_always.php.in) = 0a818cb04dd64df25ba15b04b5eb38a2dffd8438
+SHA1 (patch-inc_davical__configuration__missing.php) = 27d0fab4ff8770acf07a12b19cadb8ac059381e2
+SHA1 (patch-scripts_po_rebuild-translations.sh) = 864692ee896a71171a12127bab883321b6f77c81
diff --git a/davical-git/files/davical.conf b/davical-git/files/davical.conf
new file mode 100644
index 0000000..5821652
--- /dev/null
+++ b/davical-git/files/davical.conf
@@ -0,0 +1,30 @@
+# This configuration puts DAViCal under /davical. The user accounts
+# will be accessible through /davical/caldav.php/<username>
+Alias /davical "@DAVICALDIR@/htdocs"
+
+<Directory "@DAVICALDIR@/htdocs">
+ AllowOverride All
+ DirectoryIndex index.php
+ Order Allow,Deny
+ Allow from All
+ php_value include_path "@LIBAWLPATH@"
+</Directory>
+
+# This configuration puts DAViCal in its own VirtualHost. The user
+# accounts will be accessible through
+# http(s)://davical.example.net/caldav.php/<username>
+#<VirtualHost *>
+# DocumentRoot "@DAVICALDIR@/htdocs"
+#
+# ServerName davical.example.net
+# ServerAlias calendar.example.net
+#
+# DirectoryIndex index.php
+#
+# <Location />
+# Order allow,deny
+# Allow from all
+# </Location>
+#
+# php_value include_path "@LIBAWLPATH@"
+#</VirtualHost>
diff --git a/davical-git/patches/patch-dba_create-database.sh b/davical-git/patches/patch-dba_create-database.sh
new file mode 100644
index 0000000..f5e3450
--- /dev/null
+++ b/davical-git/patches/patch-dba_create-database.sh
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- dba/create-database.sh.orig 2015-11-12 14:35:57.000000000 +0000
++++ dba/create-database.sh
+@@ -12,7 +12,8 @@ INSTALL_NOTE_FN="`mktemp -t tmp.XXXXXXXX
+
+
+ # Candidate locations of the AWL directory
+-awldirs="${DBADIR}/../../awl
++awldirs="@LIBAWLPATH@
++${DBADIR}/../../awl
+ /usr/share/awl
+ /usr/share/php/awl
+ /usr/local/share/awl"
+@@ -182,7 +183,7 @@ rm "${INSTALL_NOTE_FN}"
+ cat <<FRIENDLY
+ * The password for the 'admin' user has been set to '${ADMINPW}'
+
+-Thanks for trying DAViCal! Check in /usr/share/doc/davical/examples/ for
++Thanks for trying DAViCal! Check in @EGDIRCONFIG@/ for
+ some configuration examples. For help, visit #davical on irc.oftc.net.
+
+ FRIENDLY
diff --git a/davical-git/patches/patch-dba_update-davical-database b/davical-git/patches/patch-dba_update-davical-database
new file mode 100644
index 0000000..ed6eaa3
--- /dev/null
+++ b/davical-git/patches/patch-dba_update-davical-database
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dba/update-davical-database.orig 2015-11-12 14:35:57.000000000 +0000
++++ dba/update-davical-database
+@@ -23,7 +23,7 @@ my $helpmeplease = 0;
+ my $apply_patches = 1;
+ my $revoke_list = "";
+ my $force_owner = "";
+-my $config_file = "config/administration.yml";
++my $config_file = "@PKG_SYSCONFDIR@/administration.yml";
+
+ my $dbadir = $0;
+ $dbadir =~ s#/[^/]*$##;
diff --git a/davical-git/patches/patch-inc_always.php.in b/davical-git/patches/patch-inc_always.php.in
new file mode 100644
index 0000000..01ee49c
--- /dev/null
+++ b/davical-git/patches/patch-inc_always.php.in
@@ -0,0 +1,29 @@
+$NetBSD$
+
+--- inc/always.php.in.orig 2015-11-12 14:35:57.000000000 +0000
++++ inc/always.php.in
+@@ -105,7 +105,7 @@ if ( ! @include_once('AWLUtilities.php')
+ '../../awl/inc'
+ , '/usr/share/awl/inc' // Where it ends up on Debian
+ , '/usr/share/php/awl/inc' // Fedora's standard for PHP libraries
+- , '/usr/local/share/awl/inc'
++ , '@LIBAWLPATH@/inc'
+ );
+ foreach( $try_paths AS $awl_include_path ) {
+ if ( @file_exists($awl_include_path.'/AWLUtilities.php') ) {
+@@ -158,11 +158,11 @@ if ( @file_exists('/etc/davical/'.$_SERV
+ else if ( @file_exists('/etc/davical/config.php') ) {
+ include('/etc/davical/config.php');
+ }
+-else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
+- include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
++else if ( @file_exists('@PKG_SYSCONFDIR@'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
++ include('@PKG_SYSCONFDIR@'.$_SERVER['SERVER_NAME'].'-conf.php');
+ }
+-else if ( @file_exists('/usr/local/etc/davical/config.php') ) {
+- include('/usr/local/etc/davical/config.php');
++else if ( @file_exists('@PKG_SYSCONFDIR@/config.php') ) {
++ include('@PKG_SYSCONFDIR@/config.php');
+ }
+ else if ( @file_exists('../config/config.php') ) {
+ include('../config/config.php');
diff --git a/davical-git/patches/patch-inc_davical__configuration__missing.php b/davical-git/patches/patch-inc_davical__configuration__missing.php
new file mode 100644
index 0000000..8e39d29
--- /dev/null
+++ b/davical-git/patches/patch-inc_davical__configuration__missing.php
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- inc/davical_configuration_missing.php.orig 2015-11-12 14:35:57.000000000 +0000
++++ inc/davical_configuration_missing.php
+@@ -4,7 +4,7 @@ include("page-header.php");
+ echo <<<EOBODY
+ <h1>DAViCal Not Configured</h1>
+ <h2>The Bad News</h2>
+-<p>There is no configuration file present in <b>/etc/davical/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so
++<p>There is no configuration file present in <b>@PKG_SYSCONFDIR@/config.php</b> (or in <b>$_SERVER[SERVER_NAME]-conf.php</b>) so
+ your installation is not fully set up.</p>
+ <h2>The Good News</h2>
+ <p>Well, you're seeing this! At least you have DAViCal <i>installed</i> :-) You also have Apache and PHP working
diff --git a/davical-git/patches/patch-scripts_po_rebuild-translations.sh b/davical-git/patches/patch-scripts_po_rebuild-translations.sh
new file mode 100644
index 0000000..d592d6d
--- /dev/null
+++ b/davical-git/patches/patch-scripts_po_rebuild-translations.sh
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- scripts/po/rebuild-translations.sh.orig 2015-11-12 14:35:57.000000000 +0000
++++ scripts/po/rebuild-translations.sh
+@@ -11,7 +11,8 @@ PODIR="po"
+ LOCALEDIR="locale"
+ APPLICATION="davical"
+
+-awldirs="../awl
++awldirs="@LIBAWLPATH@
++../awl
+ `find .. -type d -name 'awl-*.*'`
+ /usr/share/awl
+ /usr/share/php/awl
diff --git a/php-libawl-git/Makefile.common b/php-libawl-git/Makefile.common
index 1fea07e..f52eeb8 100644
--- a/php-libawl-git/Makefile.common
+++ b/php-libawl-git/Makefile.common
@@ -1,6 +1,6 @@
# $NetBSD: Makefile.common,v 1.1 2013/12/13 13:14:08 hfath Exp $
# used by wip/php-libawl-git/Makefile
-# used by wip/davical-current/Makefile
+# used by wip/davical-git/Makefile
#
# Include path of AWL
Home |
Main Index |
Thread Index |
Old Index