svn commit: r368851 - head/www/py-graphite-web

[Baptiste Daroussin]

Author: bapt
Date: Mon Sep 22 11:48:26 2014
New Revision: 368851
URL: http://svnweb.freebsd.org/changeset/ports/368851
QAT: https://qat.redports.org/buildarchive/r368851/

Log:
  Simplify plist
  Allow packaging as regular user

Modified:
  head/www/py-graphite-web/Makefile
  head/www/py-graphite-web/pkg-plist

Modified: head/www/py-graphite-web/Makefile
==============================================================================
--- head/www/py-graphite-web/Makefile	Mon Sep 22 11:38:14 2014	(r368850)
+++ head/www/py-graphite-web/Makefile	Mon Sep 22 11:48:26 2014	(r368851)
@@ -25,6 +25,7 @@ USE_PYTHON=	distutils
 SUB_FILES=	pkg-message
 SUB_LIST+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} DATADIR=${DATADIR}
+PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/build-index.sh.orig
@@ -44,8 +45,6 @@ post-install:
 	@(cd ${WRKSRC}/webapp/content && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/content)
 	@${MKDIR} ${STAGEDIR}/var/log/graphite/webapp
 	@${MKDIR} ${STAGEDIR}/var/db/graphite
-	@${CHOWN} ${WWWOWN} ${STAGEDIR}/var/log/graphite
-	@${CHOWN} ${WWWOWN} ${STAGEDIR}/var/db/graphite
 	@${CP} ${STAGEDIR}${PYTHON_SITELIBDIR}/graphite/local_settings.py.example ${STAGEDIR}${PREFIX}/etc/graphite/local_settings.py.example
 	@${LN} -s ${PREFIX}/etc/graphite/local_settings.py ${STAGEDIR}${PYTHON_SITELIBDIR}/graphite/local_settings.py
 

Modified: head/www/py-graphite-web/pkg-plist
==============================================================================
--- head/www/py-graphite-web/pkg-plist	Mon Sep 22 11:38:14 2014	(r368850)
+++ head/www/py-graphite-web/pkg-plist	Mon Sep 22 11:48:26 2014	(r368851)
@@ -783,74 +783,6 @@ etc/graphite/local_settings.py.example
 %%PYTHON_SITELIBDIR%%/graphite/whitelist/views.pyc
 %%PYTHON_SITELIBDIR%%/graphite/whitelist/views.pyo
 @rmtry %%PYTHON_SITELIBDIR%%/graphite/local_settings.pyc
- at dirrm %%DATADIR%%/examples
- at dirrm %%DATADIR%%/content/js/window
- at dirrm %%DATADIR%%/content/js/scriptaculous
- at dirrm %%DATADIR%%/content/js/ext/ux
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/window
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/tree
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/toolbar
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/tabs
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/slider
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/sizer
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/shared
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/qtip
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/progress
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/panel
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/menu
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/layout
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/grid
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/form
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/editor
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/dd
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/button
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default/box
- at dirrm %%DATADIR%%/content/js/ext/resources/images/default
- at dirrm %%DATADIR%%/content/js/ext/resources/images
- at dirrm %%DATADIR%%/content/js/ext/resources/css/visual
- at dirrm %%DATADIR%%/content/js/ext/resources/css/theme-gray
- at dirrm %%DATADIR%%/content/js/ext/resources/css/theme-access
- at dirrm %%DATADIR%%/content/js/ext/resources/css/structure
- at dirrm %%DATADIR%%/content/js/ext/resources/css
- at dirrm %%DATADIR%%/content/js/ext/resources
- at dirrm %%DATADIR%%/content/js/ext/pkgs
- at dirrm %%DATADIR%%/content/js/ext/examples/shared/icons/fam
- at dirrm %%DATADIR%%/content/js/ext/examples/shared/icons
- at dirrm %%DATADIR%%/content/js/ext/examples/shared
- at dirrm %%DATADIR%%/content/js/ext/examples
- at dirrm %%DATADIR%%/content/js/ext/adapter/yui
- at dirrm %%DATADIR%%/content/js/ext/adapter/prototype
- at dirrm %%DATADIR%%/content/js/ext/adapter/jquery
- at dirrm %%DATADIR%%/content/js/ext/adapter/ext
- at dirrm %%DATADIR%%/content/js/ext/adapter
- at dirrm %%DATADIR%%/content/js/ext
- at dirrm %%DATADIR%%/content/js/ace
- at dirrm %%DATADIR%%/content/js
- at dirrm %%DATADIR%%/content/img
- at dirrm %%DATADIR%%/content/html
- at dirrm %%DATADIR%%/content/css/default
- at dirrm %%DATADIR%%/content/css/darkX
- at dirrm %%DATADIR%%/content/css
- at dirrm %%DATADIR%%/content
- at dirrm %%DATADIR%%
- at dirrm etc/graphite
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/whitelist
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/version
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/thirdparty
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/templates
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/render
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/metrics
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/graphlot
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/events
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/dashboard
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/composer
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/cli
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/browser
- at dirrm %%PYTHON_SITELIBDIR%%/graphite/account
- at dirrm %%PYTHON_SITELIBDIR%%/graphite
- at cwd /
- at dirrmtry var/db/graphite
- at dirrmtry var/log/graphite/webapp
- at dirrmtry var/log/graphite
- at cwd %%RESETPREFIX%%
+ at dir(%%WWWOWN%%,%%WWWGRP%%,) /var/db/graphite
+ at dir /var/log/graphite/webapp
+ at dir(%%WWWOWN%%,%%WWWGRP%%,) /var/log/graphite