Hi,
here's an update to latest davical 1.1.3.1 (and its dep awl 0.55),
development resumed on gitlab after the original author moved to other
things, and now a new community is fixing bugs and taking care of it.
a bit of churn in makefiles due to the use of funky gitlab download
urls, but other than that should still work.
please test and report if you use it!
(sidenote: yeah, the README could be updated for nginx^Whttpd).
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/awl/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 6 Nov 2014 17:13:40 -0000 1.7
+++ Makefile 21 Nov 2014 15:38:21 -0000
@@ -1,22 +1,26 @@
# $OpenBSD: Makefile,v 1.7 2014/11/06 17:13:40 sthen Exp $
-COMMENT = Andrew's web libraries for PHP
+COMMENT = Andrews web libraries for PHP
-DISTNAME = awl-0.53
+GITLAB_PROJECT = awl
+GITLAB_ACCOUNT = davical-project
+GITLAB_TAG = r0.55
+DISTNAME = ${GITLAB_PROJECT}-${GITLAB_TAG:S/r//}
PKGNAME = php-${DISTNAME}
CATEGORIES = www
PKG_ARCH = *
-REVISION = 1
-HOMEPAGE = http://andrew.mcmillan.net.nz/projects/awl
+HOMEPAGE = https://gitlab.com/${GITLAB_ACCOUNT}/${GITLAB_PROJECT}
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://debian.mcmillan.net.nz/packages/awl/
+DISTFILES =
${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=${GITLAB_TAG}}
+MASTER_SITES =
https://gitlab.com/${GITLAB_ACCOUNT}/${GITLAB_PROJECT}/repository/
PREFIX = ${VARBASE}/www
-INSTDIR = ${PREFIX}/awl
+WRKDIST = ${WRKDIR}/${GITLAB_PROJECT}.git
+INSTDIR = ${PREFIX}/${GITLAB_PROJECT}
SUBST_VARS = INSTDIR
NO_BUILD = Yes
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/awl/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 11 Nov 2012 20:49:21 -0000 1.2
+++ distinfo 21 Nov 2014 15:38:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (awl-0.53.tar.gz) = iwEvbfFyxwry63+fhgs5FCmzomFJnJBNkGUyw0ruWe4=
-SIZE (awl-0.53.tar.gz) = 308256
+SHA256 (awl-0.55.tar.gz) = adj1Horv37a1oPw+XjL4uNZQxIkHnI66xaa2XyrT7Ik=
+SIZE (awl-0.55.tar.gz) = 765565
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/awl/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 11 Nov 2012 20:49:21 -0000 1.3
+++ pkg/PLIST 21 Nov 2014 15:38:21 -0000
@@ -8,6 +8,7 @@
awl/dba/schema-management.sql
awl/docs/
awl/docs/api/
+awl/docs/api/.gitignore
awl/docs/api/awl/
awl/docs/api/awl/AuthPlugin/
awl/docs/api/awl/AuthPlugin/AuthPlugin.html
@@ -41,12 +42,14 @@
awl/docs/api/awl/MenuSet/MenuOption.html
awl/docs/api/awl/MenuSet/MenuSet.html
awl/docs/api/awl/MenuSet/_MenuSet.php.html
+awl/docs/api/awl/Multipart.html
awl/docs/api/awl/PgQuery/
awl/docs/api/awl/PgQuery/PgQuery.html
awl/docs/api/awl/PgQuery/_PgQuery.php.html
awl/docs/api/awl/Session/
awl/docs/api/awl/Session/Session.html
awl/docs/api/awl/Session/_Session.php.html
+awl/docs/api/awl/SinglePart.html
awl/docs/api/awl/Translation/
awl/docs/api/awl/Translation/_Translation.php.html
awl/docs/api/awl/User/
@@ -64,6 +67,7 @@
awl/docs/api/awl/XMLElement/XMLElement.html
awl/docs/api/awl/XMLElement/_XMLElement.php.html
awl/docs/api/awl/_AwlCache.php.html
+awl/docs/api/awl/_Multipart.php.html
awl/docs/api/awl/classEditor/
awl/docs/api/awl/classEditor/Editor.html
awl/docs/api/awl/classEditor/EditorField.html
@@ -74,7 +78,6 @@
awl/docs/api/awl/iCalendar/iCalProp.html
awl/docs/api/awl/iCalendar/iCalendar.html
awl/docs/api/awl/vCalendar/
-awl/docs/api/awl/vCalendar/VCalendar.html
awl/docs/api/awl/vCalendar/_vCalendar.php.html
awl/docs/api/awl/vCalendar/vCalendar.html
awl/docs/api/awl/vComponent/
@@ -174,3 +177,5 @@
awl/inc/iCalendar.php
awl/inc/vCalendar.php
awl/inc/vComponent.php
+awl/inc/vObject.php
+awl/inc/vProperty.php
Index: Makefile
===================================================================
RCS file: /cvs/ports/productivity/davical/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 6 Nov 2014 17:13:40 -0000 1.12
+++ Makefile 21 Nov 2014 15:38:06 -0000
@@ -2,8 +2,10 @@
COMMENT = CalDAV/CardDav calendar/contacts server
-DISTNAME = davical-1.1.1
-REVISION = 6
+GITLAB_PROJECT = davical
+GITLAB_ACCOUNT = davical-project
+GITLAB_TAG = r1.1.3.1
+DISTNAME = ${GITLAB_PROJECT}-${GITLAB_TAG:S/r//}
CATEGORIES = productivity net
HOMEPAGE = http://www.davical.org/
@@ -13,28 +15,26 @@
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://debian.mcmillan.net.nz/packages/davical/
+DISTFILES =
${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=${GITLAB_TAG}}
+MASTER_SITES =
https://gitlab.com/${GITLAB_ACCOUNT}/${GITLAB_PROJECT}/repository/
MODULES = lang/php
PREFIX = ${VARBASE}/www
INSTDIR = ${PREFIX}/davical
+WRKDIST = ${WRKDIR}/${GITLAB_PROJECT}.git
TINSTDIR = ${TRUEPREFIX}/davical
SUBST_VARS = TINSTDIR
RUN_DEPENDS += lang/php/${MODPHP_VERSION},-curl \
lang/php/${MODPHP_VERSION},-pdo_pgsql \
- www/awl>=0.53 \
+ www/awl>=0.55 \
devel/p5-YAML \
databases/p5-DBD-Pg
NO_BUILD = Yes
NO_TEST = Yes
PKG_ARCH = *
-
-post-patch:
- # fix sql files to remove quotes from LANGUAGE statements, breaks with
pgsql 9.3.
- cd ${WRKSRC} && grep -rl LANGUAGE dba | xargs perl -pi -e "s/LANGUAGE
'(\w+)'/LANGUAGE \1/"
do-install:
${INSTALL_DATA_DIR} ${INSTDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/productivity/davical/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 11 Nov 2012 20:50:18 -0000 1.2
+++ distinfo 21 Nov 2014 15:38:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (davical-1.1.1.tar.gz) = Cb2So10nMP5of2gBeW2NoQkMuONsKRDAVqAbAMtzyvw=
-SIZE (davical-1.1.1.tar.gz) = 2979425
+SHA256 (davical-1.1.3.1.tar.gz) = RDnC3wBSJBtlxh608LEMQG2Tr9ZaXMa1I7WXwKewXBU=
+SIZE (davical-1.1.3.1.tar.gz) = 3031220
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/productivity/davical/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 11 Nov 2012 20:50:18 -0000 1.3
+++ pkg/PLIST 21 Nov 2014 15:38:06 -0000
@@ -3,6 +3,7 @@
davical/INSTALL
davical/README
davical/config/
+davical/config/.gitignore
davical/config/apache-davical.conf
davical/config/debug-config.php
davical/config/example-administration.yml
@@ -58,6 +59,7 @@
davical/dba/windows/
davical/dba/windows/create-database.bat
davical/htdocs/
+davical/htdocs/.gitignore
davical/htdocs/.htaccess
davical/htdocs/admin.php
davical/htdocs/always.php
@@ -83,6 +85,7 @@
davical/htdocs/tz.php
davical/htdocs/upgrade.php
davical/inc/
+davical/inc/.gitignore
davical/inc/AtomFeed.php
davical/inc/CalDAVRequest.php
davical/inc/DAVPrincipal.php
@@ -161,6 +164,10 @@
davical/inc/vtimezone.php
davical/inc/well-known.php
davical/po/
+davical/po/.gitignore
+davical/po/ar.po
+davical/po/ca.po
+davical/po/cs_CZ.po
davical/po/de.po
davical/po/de.values
davical/po/es_AR.po
@@ -173,14 +180,17 @@
davical/po/es_VE.values
davical/po/et.po
davical/po/et.values
+davical/po/fi.po
davical/po/fr.po
davical/po/fr.values
davical/po/hu.po
davical/po/hu.values
+davical/po/id_ID.po
davical/po/it.po
davical/po/it.values
davical/po/ja.po
davical/po/ja.values
+davical/po/ko_KR.po
davical/po/messages.pot
davical/po/nb_NO.po
davical/po/nb_NO.values
@@ -195,9 +205,11 @@
davical/po/pt_PT.values
davical/po/ru.po
davical/po/ru.values
+davical/po/sk_SK.po
davical/po/sv.po
davical/po/sv.values
davical/scripts/
+davical/scripts/archive-old-events.php
davical/scripts/build-always.sh
davical/scripts/cron-sync-ldap.php
davical/scripts/export_calendar.php
