aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/trac-graphviz/Makefile4
-rw-r--r--www/trac-graphviz/files/patch-graphviz_graphviz.py22
2 files changed, 24 insertions, 2 deletions
diff --git a/www/trac-graphviz/Makefile b/www/trac-graphviz/Makefile
index 9d09ce9e6317..6a550a719a08 100644
--- a/www/trac-graphviz/Makefile
+++ b/www/trac-graphviz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
PORTVERSION= 0.7.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www devel graphics python
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= brooks
@@ -22,7 +22,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urw
tracd:${PORTSDIR}/www/trac
BUILD_DEPENDS+= easy_install:${PORTSDIR}/devel/py-setuptools
-USE_PYTHON= yes
+USE_PYTHON= 2.5+
NO_BUILD= yes
USE_PYDISTUTILS=yes
PYDISTUTILS_PKGNAME= graphviz
diff --git a/www/trac-graphviz/files/patch-graphviz_graphviz.py b/www/trac-graphviz/files/patch-graphviz_graphviz.py
index cb8cc3469d4b..acc7878a3989 100644
--- a/www/trac-graphviz/files/patch-graphviz_graphviz.py
+++ b/www/trac-graphviz/files/patch-graphviz_graphviz.py
@@ -3,6 +3,19 @@ $FreeBSD$
--- graphviz/graphviz.py.orig
+++ graphviz/graphviz.py
+@@ -16,11 +16,11 @@
+ __version__ = '0.7.2'
+
+
++import hashlib
+ import inspect
+ import locale
+ import os
+ import re
+-import sha
+ import subprocess
+ import sys
+
@@ -59,10 +59,7 @@
'c:\\Program Files\\ATT\\Graphviz\\bin',
],
@@ -15,3 +28,12 @@ $FreeBSD$
],
'darwin': ['/opt/local/bin',
+@@ -312,7 +309,7 @@
+ encoded_cmd = (processor + unicode(self.processor_options)) \
+ .encode(self.encoding)
+ encoded_content = content.encode(self.encoding)
+- sha_key = sha.new(encoded_cmd + encoded_content).hexdigest()
++ sha_key = hashlib.sha1(encoded_cmd + encoded_content).hexdigest()
+ img_name = '%s.%s.%s' % (sha_key, processor, out_format)
+ # cache: hash.<dot>.<png>
+ img_path = os.path.join(self.cache_dir, img_name)