diff options
| -rw-r--r-- | www/py-urlgrabber/Makefile | 7 | ||||
| -rw-r--r-- | www/py-urlgrabber/files/patch-setup.py | 24 |
2 files changed, 21 insertions, 10 deletions
diff --git a/www/py-urlgrabber/Makefile b/www/py-urlgrabber/Makefile index 54cbac65b880..61b9b765dad5 100644 --- a/www/py-urlgrabber/Makefile +++ b/www/py-urlgrabber/Makefile @@ -7,7 +7,7 @@ PORTNAME= urlgrabber PORTVERSION= 3.1.0 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= http://linux.duke.edu/projects/urlgrabber/download/ \ http://nivi.interfree.it/distfiles/${PORTNAME}/ @@ -19,8 +19,11 @@ COMMENT= A high-level cross-protocol url-grabber USE_PYTHON= yes USE_PYDISTUTILS= yes -.if !defined(NOPORTDOCS) REINPLACE_ARGS= -i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},' +DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} + +.if defined(NOPORTDOCS) +MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} .endif post-patch: diff --git a/www/py-urlgrabber/files/patch-setup.py b/www/py-urlgrabber/files/patch-setup.py index b3b65503a3bb..4f9a3f0132a2 100644 --- a/www/py-urlgrabber/files/patch-setup.py +++ b/www/py-urlgrabber/files/patch-setup.py @@ -1,18 +1,26 @@ --- setup.py 2005-03-08 23:53:20.000000000 +0100 -+++ setup.py.port 2007-09-22 17:12:58.000000000 +0200 -@@ -1,4 +1,5 @@ ++++ setup.py.port 2008-07-03 17:30:05.000000000 +0200 +@@ -1,3 +1,4 @@ ++ # urlgrabber distutils setup -+import os import re as _re import urlgrabber as _urlgrabber - -@@ -15,7 +16,8 @@ +@@ -15,8 +16,6 @@ packages = ['urlgrabber'] package_dir = {'urlgrabber':'urlgrabber'} scripts = ['scripts/urlgrabber'] -data_files = [('share/doc/' + name + '-' + version, -+if not os.getenv('NOPORTDOCS'): -+ data_files = [('%%DOCSDIR%%', - ['README','LICENSE', 'TODO', 'ChangeLog'])] +- ['README','LICENSE', 'TODO', 'ChangeLog'])] options = { 'clean' : { 'all' : 1 } } classifiers = [ + 'Development Status :: 4 - Beta', +@@ -41,5 +40,9 @@ + #print '%-20s -> %s' % (k, config[k]) + if k.startswith('_'): del config[k] + ++ import os ++ if not os.environ.has_key('NOPORTDOCS'): ++ config.setdefault('data_files', [('%%DOCSDIR%%', ['README','LICENSE', 'TODO', 'ChangeLog'])]) ++ + from distutils.core import setup + setup(**config) |