Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Apr 2016 15:45:51 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413785 - in head/www/py-graphite-web: . files
Message-ID:  <201604221545.u3MFjpiL079362@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Fri Apr 22 15:45:51 2016
New Revision: 413785
URL: https://svnweb.freebsd.org/changeset/ports/413785

Log:
  www/py-graphite-web: add CPE and fix example
  
  * Add CPE info for security issues [1]
  * Fix the path in the graphite.wsgi.example [2]
  * Bump portrevision for package change
  
  PR:		208331 [1]
  PR:		200174 [2]
  Submitted by:	shun <shun.fbsd.pr@dropcut.net> [1]
  Submitted by:	Kaspars Mickevics <kaspars@fx.lv> [2]

Modified:
  head/www/py-graphite-web/Makefile
  head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example

Modified: head/www/py-graphite-web/Makefile
==============================================================================
--- head/www/py-graphite-web/Makefile	Fri Apr 22 15:42:21 2016	(r413784)
+++ head/www/py-graphite-web/Makefile	Fri Apr 22 15:45:51 2016	(r413785)
@@ -3,6 +3,7 @@
 
 PORTNAME=	graphite-web
 PORTVERSION=	0.9.15
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -19,9 +20,11 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cair
 		xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype
 
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
-USES=		python:2
+USES=		cpe python:2
 USE_GITHUB=	yes
 GH_ACCOUNT=	graphite-project
+CPE_VENDOR=	graphite_project
+CPE_PRODUCT=	graphite
 USE_PYTHON=	distutils
 SUB_FILES=	pkg-message
 SUB_LIST+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} WWWOWN=${WWWOWN} \
@@ -33,6 +36,7 @@ post-patch:
 	@${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 \

Modified: head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example
==============================================================================
--- head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example	Fri Apr 22 15:42:21 2016	(r413784)
+++ head/www/py-graphite-web/files/patch-conf__graphite.wsgi.example	Fri Apr 22 15:45:51 2016	(r413785)
@@ -4,7 +4,7 @@
  import os
  import sys
 -sys.path.append('/opt/graphite/webapp')
-+sys.path.append('%%PREFIX%%/graphite/webapp')
++sys.path.append('%%PYTHON_SITELIBDIR%%/graphite')
  
  try:
      from importlib import import_module



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