Sat Jan 16 20:24:17 2021 UTC ()
Radicale: include rationale for python3, fix pkglint warning about
?= before bsd.prefs.mk.


(maya)
diff -r1.25 -r1.26 pkgsrc/net/Radicale/Makefile
diff -r1.11 -r1.12 pkgsrc/net/Radicale/options.mk
cvs diff -r1.25 -r1.26 pkgsrc/net/Radicale/Makefile (expand / switch to unified diff)

--- pkgsrc/net/Radicale/Makefile 2020/12/04 20:45:32 1.25
+++ pkgsrc/net/Radicale/Makefile 2021/01/16 20:24:16 1.26
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1# $NetBSD: Makefile,v 1.25 2020/12/04 20:45:32 nia Exp $ 1# $NetBSD: Makefile,v 1.26 2021/01/16 20:24:16 maya Exp $
2 2
3DISTNAME= Radicale-1.1.4 3DISTNAME= Radicale-1.1.4
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= net time www 5CATEGORIES= net time www
6MASTER_SITES= ${MASTER_SITE_PYPI:=R/Radicale/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=R/Radicale/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://radicale.org/ 9HOMEPAGE= https://radicale.org/
10COMMENT= CalDAV (calendar) and CardDAV (contact) server 10COMMENT= CalDAV (calendar) and CardDAV (contact) server
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13EGDIR= share/examples/radicale 13EGDIR= share/examples/radicale
14 14
 15.include "../../mk/bsd.prefs.mk"
 16
15RADICALE_USER?= www 17RADICALE_USER?= www
16RADICALE_GROUP?= www 18RADICALE_GROUP?= www
17PKG_GROUPS= ${RADICALE_GROUP} 19PKG_GROUPS= ${RADICALE_GROUP}
18PKG_USERS= ${RADICALE_USER}:${RADICALE_GROUP} 20PKG_USERS= ${RADICALE_USER}:${RADICALE_GROUP}
19 21
20INSTALLATION_DIRS= ${EGDIR} 22INSTALLATION_DIRS= ${EGDIR}
21OWN_DIRS= ${PKG_SYSCONFDIR}/radicale 23OWN_DIRS= ${PKG_SYSCONFDIR}/radicale
22CONF_FILES+= ${EGDIR}/config ${PKG_SYSCONFDIR}/radicale/config 24CONF_FILES+= ${EGDIR}/config ${PKG_SYSCONFDIR}/radicale/config
23RCD_SCRIPTS= radicale 25RCD_SCRIPTS= radicale
24FILES_SUBST+= RADICALE_USER=${RADICALE_USER} 26FILES_SUBST+= RADICALE_USER=${RADICALE_USER}
25FILES_SUBST+= RADICALE_GROUP=${RADICALE_GROUP} 27FILES_SUBST+= RADICALE_GROUP=${RADICALE_GROUP}
26FILES_SUBST+= PYTHONBIN=${PYTHONBIN} 28FILES_SUBST+= PYTHONBIN=${PYTHONBIN}
27 29
cvs diff -r1.11 -r1.12 pkgsrc/net/Radicale/options.mk (expand / switch to unified diff)

--- pkgsrc/net/Radicale/options.mk 2021/01/16 20:21:40 1.11
+++ pkgsrc/net/Radicale/options.mk 2021/01/16 20:24:16 1.12
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: options.mk,v 1.11 2021/01/16 20:21:40 maya Exp $ 1# $NetBSD: options.mk,v 1.12 2021/01/16 20:24:16 maya Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.Radicale 3PKG_OPTIONS_VAR= PKG_OPTIONS.Radicale
4PKG_SUPPORTED_OPTIONS= git ldap 4PKG_SUPPORTED_OPTIONS= git ldap
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8.if !empty(PKG_OPTIONS:Mgit) 8.if !empty(PKG_OPTIONS:Mgit)
 9# py-dulwich
9PYTHON_VERSIONS_INCOMPATIBLE= 27 10PYTHON_VERSIONS_INCOMPATIBLE= 27
10DEPENDS+= ${PYPKGPREFIX}-dulwich-[0-9]*:../../devel/py-dulwich 11DEPENDS+= ${PYPKGPREFIX}-dulwich-[0-9]*:../../devel/py-dulwich
11.endif 12.endif
12 13
13.if !empty(PKG_OPTIONS:Mldap) 14.if !empty(PKG_OPTIONS:Mldap)
14DEPENDS+= ${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap 15DEPENDS+= ${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap
15.endif 16.endif