svn commit: r380491 - head/www/radicale

[Mark Felder]

Author: feld
Date: Thu Mar  5 13:39:50 2015
New Revision: 380491
URL: https://svnweb.freebsd.org/changeset/ports/380491
QAT: https://qat.redports.org/buildarchive/r380491/

Log:
  Fix issue with creating DATADIR
  
  Modernize: @dir, @sample
  
  PR:		198210

Modified:
  head/www/radicale/Makefile
  head/www/radicale/pkg-plist

Modified: head/www/radicale/Makefile
==============================================================================
--- head/www/radicale/Makefile	Thu Mar  5 13:20:16 2015	(r380490)
+++ head/www/radicale/Makefile	Thu Mar  5 13:39:50 2015	(r380491)
@@ -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
 

Modified: head/www/radicale/pkg-plist
==============================================================================
--- head/www/radicale/pkg-plist	Thu Mar  5 13:20:16 2015	(r380490)
+++ head/www/radicale/pkg-plist	Thu Mar  5 13:39:50 2015	(r380491)
@@ -1,6 +1,6 @@
 bin/radicale
-%%ETCDIR%%/config.sample
-%%ETCDIR%%/logging.sample
+ at sample %%ETCDIR%%/config.sample
+ at 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
- at dirrmtry %%ETCDIR%%
- at dirrm %%PYTHON_LIBDIR%%/site-packages/radicale
- at dirrm %%PYTHON_LIBDIR%%/site-packages/radicale/auth
- at dirrm %%PYTHON_LIBDIR%%/site-packages/radicale/rights
- at dirrm %%PYTHON_LIBDIR%%/site-packages/radicale/storage
- at dirrmtry %%PYTHON_LIBDIR%%/site-packages
- at dirrmtry %%PYTHON_LIBDIR%%
- at exec /usr/bin/install -d -o radicale %%DATADIR%%
+ at dir(radicale,radicale,0755) %%DATADIR%%