aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorfeld <feld@FreeBSD.org>2015-03-05 21:39:50 +0800
committerfeld <feld@FreeBSD.org>2015-03-05 21:39:50 +0800
commit8be227bc39b5efe2bde7bbb21497ac1c1379c90f (patch)
treece117c93411b9f64a14fc08bbd3d12111726eefc /www
parent6c9ca1abb42713791763eb31b813ef8dfdc0498e (diff)
downloadfreebsd-ports-gnome-8be227bc39b5efe2bde7bbb21497ac1c1379c90f.tar.gz
freebsd-ports-gnome-8be227bc39b5efe2bde7bbb21497ac1c1379c90f.tar.zst
freebsd-ports-gnome-8be227bc39b5efe2bde7bbb21497ac1c1379c90f.zip
Fix issue with creating DATADIR
Modernize: @dir, @sample PR: 198210
Diffstat (limited to 'www')
-rw-r--r--www/radicale/Makefile5
-rw-r--r--www/radicale/pkg-plist13
2 files changed, 6 insertions, 12 deletions
diff --git a/www/radicale/Makefile b/www/radicale/Makefile
index b28bf37c119e..24e0162c1cf0 100644
--- a/www/radicale/Makefile
+++ b/www/radicale/Makefile
@@ -3,7 +3,7 @@
PORTNAME= radicale
PORTVERSION= 0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -34,7 +34,7 @@ USES+= python
.endif
.if ${PORT_OPTIONS:MHTTP}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}requests1>=0:${PORTSDIR}/www/py-requests1
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}requests1>=0:${PORTSDIR}/www/py-requests1
.endif
.if ${PORT_OPTIONS:MLDAP}
@@ -47,6 +47,7 @@ post-patch:
post-install:
${MKDIR} ${STAGEDIR}/${ETCDIR}
+ ${MKDIR} ${STAGEDIR}/${DATADIR}
${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}/${ETCDIR}/config.sample
${INSTALL_DATA} ${WRKSRC}/logging ${STAGEDIR}/${ETCDIR}/logging.sample
diff --git a/www/radicale/pkg-plist b/www/radicale/pkg-plist
index 62ca10fb1010..34596e9baba3 100644
--- a/www/radicale/pkg-plist
+++ b/www/radicale/pkg-plist
@@ -1,6 +1,6 @@
bin/radicale
-%%ETCDIR%%/config.sample
-%%ETCDIR%%/logging.sample
+@sample %%ETCDIR%%/config.sample
+@sample %%ETCDIR%%/logging.sample
%%PYTHON_LIBDIR%%/site-packages/radicale/__init__.py
%%PYTHON_LIBDIR%%/site-packages/radicale/__init__.pyc
%%PYTHON_LIBDIR%%/site-packages/radicale/__init__.pyo
@@ -61,11 +61,4 @@ bin/radicale
%%PYTHON_LIBDIR%%/site-packages/radicale/xmlutils.py
%%PYTHON_LIBDIR%%/site-packages/radicale/xmlutils.pyc
%%PYTHON_LIBDIR%%/site-packages/radicale/xmlutils.pyo
-@dirrmtry %%ETCDIR%%
-@dirrm %%PYTHON_LIBDIR%%/site-packages/radicale
-@dirrm %%PYTHON_LIBDIR%%/site-packages/radicale/auth
-@dirrm %%PYTHON_LIBDIR%%/site-packages/radicale/rights
-@dirrm %%PYTHON_LIBDIR%%/site-packages/radicale/storage
-@dirrmtry %%PYTHON_LIBDIR%%/site-packages
-@dirrmtry %%PYTHON_LIBDIR%%
-@exec /usr/bin/install -d -o radicale %%DATADIR%%
+@dir(radicale,radicale,0755) %%DATADIR%%