Index: head/www/py-graphite-web/Makefile =================================================================== --- head/www/py-graphite-web/Makefile (revision 468108) +++ head/www/py-graphite-web/Makefile (revision 468109) @@ -1,59 +1,58 @@ # Created by: Evan Sarmiento # $FreeBSD$ PORTNAME= graphite-web -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= swills@FreeBSD.org COMMENT= Enterprise scalable realtime graphing platform LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django>=1.4:www/py-django@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \ xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX} USES= cpe python:2.7 shebangfix USE_GITHUB= yes GH_ACCOUNT= graphite-project CPE_VENDOR= graphite_project CPE_PRODUCT= graphite USE_PYTHON= distutils SHEBANG_FILES= bin/build-index.sh 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 @${RM} ${WRKSRC}/bin/run-graphite-devel-server.py @${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' \ -e 's|%%DATADIR%%|${DATADIR}|' \ -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' \ ${WRKSRC}/bin/build-index.sh \ ${WRKSRC}/conf/graphite.wsgi.example \ ${WRKSRC}/setup.cfg \ ${WRKSRC}/setup.py \ ${WRKSRC}/webapp/graphite/local_settings.py.example post-install: @${MKDIR} ${STAGEDIR}${DATADIR}/examples @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/examples) @${MKDIR} ${STAGEDIR}${DATADIR}/content @(cd ${WRKSRC}/webapp/content && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/content) @${MKDIR} ${STAGEDIR}/var/log/graphite/webapp @${MKDIR} ${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 .include Index: head/www/py-graphite-web/distinfo =================================================================== --- head/www/py-graphite-web/distinfo (revision 468108) +++ head/www/py-graphite-web/distinfo (revision 468109) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521721030 -SHA256 (graphite-project-graphite-web-1.1.2_GH0.tar.gz) = 8a36221db5a17d9cbee11e85be5c346024a6229d28e9d8c2417d1660bf9cfe8e -SIZE (graphite-project-graphite-web-1.1.2_GH0.tar.gz) = 1431547 +TIMESTAMP = 1524503513 +SHA256 (graphite-project-graphite-web-1.1.3_GH0.tar.gz) = 34cff860d11b111d7fe1b00b5ade047ecc6a4b1e8025cb2247a22a0c7b422b60 +SIZE (graphite-project-graphite-web-1.1.3_GH0.tar.gz) = 1433061 Index: head/www/py-graphite-web/files/patch-bin__build-index.sh =================================================================== --- head/www/py-graphite-web/files/patch-bin__build-index.sh (revision 468108) +++ head/www/py-graphite-web/files/patch-bin__build-index.sh (revision 468109) @@ -1,9 +1,9 @@ ---- bin/build-index.sh.orig 2018-02-13 06:01:34.000000000 -0500 -+++ bin/build-index.sh 2018-03-22 08:58:11.785051000 -0400 +--- bin/build-index.sh.orig 2018-04-23 17:11:55 UTC ++++ bin/build-index.sh @@ -1,5 +1,5 @@ - #!/bin/bash + #!/usr/local/bin/bash -export PYTHONPATH="/opt/graphite/webapp/:$PYTHONPATH" +export PYTHONPATH="%%PREFIX%%/graphite/webapp/:$PYTHONPATH" BINDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ${BINDIR}/build-index Index: head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example =================================================================== --- head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example (revision 468108) +++ head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example (revision 468109) @@ -1,8 +1,8 @@ ---- conf/graphite.wsgi.example.orig 2018-02-13 06:01:34.000000000 -0500 -+++ conf/graphite.wsgi.example 2018-03-22 09:01:22.942401000 -0400 +--- conf/graphite.wsgi.example.orig 2018-04-04 07:58:36 UTC ++++ conf/graphite.wsgi.example @@ -1,4 +1,4 @@ import sys -sys.path.append('/opt/graphite/webapp') +sys.path.append('%%PYTHON_SITELIBDIR%%/graphite') from graphite.wsgi import application Index: head/www/py-graphite-web/files/patch-setup.py =================================================================== --- head/www/py-graphite-web/files/patch-setup.py (revision 468108) +++ head/www/py-graphite-web/files/patch-setup.py (revision 468109) @@ -1,42 +1,44 @@ ---- setup.py.orig 2018-02-13 06:01:34.000000000 -0500 -+++ setup.py 2018-03-22 09:16:21.606146000 -0400 -@@ -39,10 +39,6 @@ +--- setup.py.orig 2018-04-04 07:58:36 UTC ++++ setup.py +@@ -39,10 +39,6 @@ else: cf.add_section('install') except DuplicateSectionError: pass - if not cf.has_option('install', 'prefix'): - cf.set('install', 'prefix', '/opt/graphite') - if not cf.has_option('install', 'install-lib'): - cf.set('install', 'install-lib', '%(prefix)s/webapp') with open('setup.cfg', 'w') as f: cf.write(f) -@@ -59,16 +55,16 @@ +@@ -58,17 +54,17 @@ else: + storage_dirs = [] - for subdir in ('whisper', 'ceres', 'rrd', 'log', 'log/webapp'): +-for subdir in ('whisper/dummy.txt', 'ceres/dummy.txt', 'rrd/dummy.txt', 'log/dummy.txt', 'log/webapp/dummy.txt'): - storage_dirs.append( ('storage/%s' % subdir, []) ) ++for subdir in ('whisper', 'ceres', 'rrd', 'log', 'log/webapp'): + storage_dirs.append( ('graphite/storage/%s' % subdir, []) ) webapp_content = defaultdict(list) -for root, dirs, files in os.walk('webapp/content'): +for root, dirs, files in os.walk('graphite/webapp/content'): for filename in files: filepath = os.path.join(root, filename) webapp_content[root].append(filepath) -conf_files = [ ('conf', glob('conf/*.example')) ] -+conf_files = [ ('/usr/local/etc/graphite', glob('conf/*.example')) ] ++conf_files = [ ('%%PREFIX%%/etc/graphite', glob('conf/*.example')) ] examples = [ ('examples', glob('examples/example-*')) ] try: -@@ -108,7 +104,7 @@ +@@ -108,7 +104,7 @@ try: package_data={'graphite' : ['templates/*', 'local_settings.py.example']}, scripts=glob('bin/*'), - data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, + data_files=list(conf_files), install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], classifiers=[ 'Intended Audience :: Developers',