diff options
author | hauke <hauke@pkgsrc.org> | 2019-05-10 12:25:04 +0000 |
---|---|---|
committer | hauke <hauke@pkgsrc.org> | 2019-05-10 12:25:04 +0000 |
commit | 5dee9d0c3c8d8c37df7938af74c1208a56751a85 (patch) | |
tree | 9f44c1bb1f870e19976996cab76439e2fd1a490e /www/davical | |
parent | 5f393244672829ad77db492d20d15dd3b074c85f (diff) | |
download | pkgsrc-5dee9d0c3c8d8c37df7938af74c1208a56751a85.tar.gz |
Update www/davical to v1.1.8
Minor changes and bug fixes - upstream's changelog is a bit unorganized.
Update the upgrade information in MESSAGES
Work in pkglint recommendations
Diffstat (limited to 'www/davical')
-rw-r--r-- | www/davical/MESSAGE | 13 | ||||
-rw-r--r-- | www/davical/Makefile | 14 | ||||
-rw-r--r-- | www/davical/PLIST | 4 | ||||
-rw-r--r-- | www/davical/distinfo | 10 |
4 files changed, 24 insertions, 17 deletions
diff --git a/www/davical/MESSAGE b/www/davical/MESSAGE index 01fb1b124ad..ec70b3dc409 100644 --- a/www/davical/MESSAGE +++ b/www/davical/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2010/11/13 00:27:24 jym Exp $ +$NetBSD: MESSAGE,v 1.5 2019/05/10 12:25:04 hauke Exp $ For pkgsrc installations, DAViCal's package is installed in non-default locations: @@ -7,11 +7,16 @@ locations: Document root: ${DAVICALDIR}/htdocs Configuration file: ${PKG_SYSCONFDIR}/config.php -If you are upgrading from a previous version, see +If you are upgrading from a previous version, you need to run - http://wiki.davical.org/w/Release_Notes + ${DAVICALDIR}/dba/update-davical-database -for how to perform a database upgrade. +See also + + <https://www.davical.org/installation.php> + <https://wiki.davical.org/index.php/Upgrading> + +for up-to-date upgrade instructions. To complete the installation of DAViCal, follow these steps: diff --git a/www/davical/Makefile b/www/davical/Makefile index c702686c21e..1fb9e8fd42a 100644 --- a/www/davical/Makefile +++ b/www/davical/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2018/08/22 09:47:24 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2019/05/10 12:25:04 hauke Exp $ DISTNAME= davical-${DAVICAL_VERSION} PKGNAME= ${PHP_PKG_PREFIX}-davical-${DAVICAL_VERSION} -PKGREVISION= 1 +#PKGREVISION= 1 CATEGORIES= www MASTER_SITES= -https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=${GITLAB_TAG} @@ -11,9 +11,9 @@ HOMEPAGE= https://www.davical.org/ COMMENT= Simple CalDAV server using a PostgreSQL backend LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 -DAVICAL_VERSION=1.1.7 +DAVICAL_VERSION=1.1.8 GITLAB_TAG= r${DAVICAL_VERSION} -GITLAB_REV= 05397d635c3f218b850775223aa5dd705da9f91c +GITLAB_REV= 4af9595f4d0530268ac1289ba4ab2adb4890802e DAVICALDIR= ${PREFIX}/share/davical EGDIR= ${PREFIX}/share/examples/davical @@ -77,19 +77,19 @@ REPLACE_FILES.php+= scripts/tz-update.php SUBST_CLASSES+= conf-path SUBST_STAGE.conf-path= pre-configure +SUBST_VARS.conf-path+= PKG_SYSCONFDIR 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_VARS.inc-path+= PKG_SYSCONFDIR 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_SED.inc-path+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" SUBST_MESSAGE.inc-path= Fixing AWL include path. SUBST_CLASSES+= examples @@ -100,8 +100,8 @@ SUBST_MESSAGE.examples= Fixing config examples path. SUBST_CLASSES+= files SUBST_STAGE.files= pre-configure +SUBST_VARS.files+= DAVICALDIR SUBST_FILES.files= davical.conf -SUBST_SED.files+= -e "s|@DAVICALDIR@|${DAVICALDIR}|g" SUBST_MESSAGE.files= Fixing DAViCal configuration file for Apache. pre-patch: diff --git a/www/davical/PLIST b/www/davical/PLIST index ecb6e66dcca..2f75322ef62 100644 --- a/www/davical/PLIST +++ b/www/davical/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2018/06/22 10:08:48 hauke Exp $ +@comment $NetBSD: PLIST,v 1.11 2019/05/10 12:25:04 hauke Exp $ share/davical/dba/appuser_permissions.txt share/davical/dba/base-data.sql share/davical/dba/better_perms.sql @@ -36,6 +36,7 @@ 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/patches/1.3.3.sql share/davical/dba/rrule_functions-8.1.sql share/davical/dba/rrule_functions.sql share/davical/dba/rrule_tests.sql @@ -120,6 +121,7 @@ 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/instance_range.php share/davical/inc/interactive-page.php share/davical/inc/log_caldav_action.php share/davical/inc/other_translated_strings.php diff --git a/www/davical/distinfo b/www/davical/distinfo index c4349f841c0..e4675fc71a1 100644 --- a/www/davical/distinfo +++ b/www/davical/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.14 2018/06/22 10:08:48 hauke Exp $ +$NetBSD: distinfo,v 1.15 2019/05/10 12:25:04 hauke Exp $ -SHA1 (davical-1.1.7.tar.gz) = 11da0ece29e016c986be74e704ca1ddc7296d017 -RMD160 (davical-1.1.7.tar.gz) = 06e31072f24224592b3f8c8d394a0af7de490d16 -SHA512 (davical-1.1.7.tar.gz) = 2bec19a85da5d626dcabc47c0c3a76e435d42a26da3e3a747a072c79a4dd955c012864580ad7ecd17b6c901acbebd77d17be9c74cef8ca19b12cba4b442c1d70 -Size (davical-1.1.7.tar.gz) = 1818904 bytes +SHA1 (davical-1.1.8.tar.gz) = b42da3733fa9d92f3e43529e4b19428707c0f4a2 +RMD160 (davical-1.1.8.tar.gz) = 620e2b16220a859cca6f751c10f847dcca30f997 +SHA512 (davical-1.1.8.tar.gz) = 86987599e4e3af5b1995ad25e589a83bb1634f5c740691b9f6d7deb7dc9970019a86ffb4e0a51e91061b11ed44046a78d873ba874a78eab0700f33f70a04cd6a +Size (davical-1.1.8.tar.gz) = 1837037 bytes SHA1 (patch-aa) = a2a8be1a131cd47c6541c0a0793a00a33ba3a9f2 SHA1 (patch-ab) = 7ae06c595f54d3a959db481d303978b29ebbd899 SHA1 (patch-ac) = 357abb2ad470121f3f30d19a4602692c77661872 |