Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Sep 2014 11:48:27 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368851 - head/www/py-graphite-web
Message-ID:  <201409221148.s8MBmRgm034961@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
-@dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%/content/js/window
-@dirrm %%DATADIR%%/content/js/scriptaculous
-@dirrm %%DATADIR%%/content/js/ext/ux
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/window
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/tree
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/toolbar
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/tabs
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/slider
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/sizer
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/shared
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/qtip
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/progress
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/panel
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/menu
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/layout
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/grid
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/form
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/editor
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/dd
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/button
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default/box
-@dirrm %%DATADIR%%/content/js/ext/resources/images/default
-@dirrm %%DATADIR%%/content/js/ext/resources/images
-@dirrm %%DATADIR%%/content/js/ext/resources/css/visual
-@dirrm %%DATADIR%%/content/js/ext/resources/css/theme-gray
-@dirrm %%DATADIR%%/content/js/ext/resources/css/theme-access
-@dirrm %%DATADIR%%/content/js/ext/resources/css/structure
-@dirrm %%DATADIR%%/content/js/ext/resources/css
-@dirrm %%DATADIR%%/content/js/ext/resources
-@dirrm %%DATADIR%%/content/js/ext/pkgs
-@dirrm %%DATADIR%%/content/js/ext/examples/shared/icons/fam
-@dirrm %%DATADIR%%/content/js/ext/examples/shared/icons
-@dirrm %%DATADIR%%/content/js/ext/examples/shared
-@dirrm %%DATADIR%%/content/js/ext/examples
-@dirrm %%DATADIR%%/content/js/ext/adapter/yui
-@dirrm %%DATADIR%%/content/js/ext/adapter/prototype
-@dirrm %%DATADIR%%/content/js/ext/adapter/jquery
-@dirrm %%DATADIR%%/content/js/ext/adapter/ext
-@dirrm %%DATADIR%%/content/js/ext/adapter
-@dirrm %%DATADIR%%/content/js/ext
-@dirrm %%DATADIR%%/content/js/ace
-@dirrm %%DATADIR%%/content/js
-@dirrm %%DATADIR%%/content/img
-@dirrm %%DATADIR%%/content/html
-@dirrm %%DATADIR%%/content/css/default
-@dirrm %%DATADIR%%/content/css/darkX
-@dirrm %%DATADIR%%/content/css
-@dirrm %%DATADIR%%/content
-@dirrm %%DATADIR%%
-@dirrm etc/graphite
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/whitelist
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/version
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/thirdparty/pytz
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/thirdparty
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/templates
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/render
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/metrics
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/graphlot
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/events
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/dashboard
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/composer
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/cli
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/browser
-@dirrm %%PYTHON_SITELIBDIR%%/graphite/account
-@dirrm %%PYTHON_SITELIBDIR%%/graphite
-@cwd /
-@dirrmtry var/db/graphite
-@dirrmtry var/log/graphite/webapp
-@dirrmtry var/log/graphite
-@cwd %%RESETPREFIX%%
+@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/db/graphite
+@dir /var/log/graphite/webapp
+@dir(%%WWWOWN%%,%%WWWGRP%%,) /var/log/graphite



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409221148.s8MBmRgm034961>