From owner-svn-ports-head@freebsd.org Fri Apr 22 15:45:53 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28768B18958; Fri, 22 Apr 2016 15:45:53 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CEB4418D1; Fri, 22 Apr 2016 15:45:52 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3MFjqU0079364; Fri, 22 Apr 2016 15:45:52 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3MFjpiL079362; Fri, 22 Apr 2016 15:45:51 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201604221545.u3MFjpiL079362@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 22 Apr 2016 15:45:51 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2016 15:45:53 -0000 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 [1] Submitted by: Kaspars Mickevics [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