Date: Wed, 19 Feb 2014 22:01:13 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345157 - in head/www/xist: . files Message-ID: <201402192201.s1JM1DiN088612@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Wed Feb 19 22:01:13 2014 New Revision: 345157 URL: http://svnweb.freebsd.org/changeset/ports/345157 QAT: https://qat.redports.org/buildarchive/r345157/ Log: Restore ll-core dependency and instead just don't overwrite files from it. Added: head/www/xist/files/ head/www/xist/files/patch-setup.py (contents, props changed) Modified: head/www/xist/Makefile Modified: head/www/xist/Makefile ============================================================================== --- head/www/xist/Makefile Wed Feb 19 21:48:12 2014 (r345156) +++ head/www/xist/Makefile Wed Feb 19 22:01:13 2014 (r345157) @@ -3,7 +3,7 @@ PORTNAME= xist PORTVERSION= 3.25 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ http://ftp.livinglogic.de/xist/ @@ -16,14 +16,19 @@ COMMENT= XML-based extensible HTML gener LICENSE= MIT RUN_DEPENDS= ${PYXML} \ + ${PYTHON_PKGNAMEPREFIX}ll-core>=1.11.1:${PORTSDIR}/devel/py-ll-core \ ${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging \ ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.7:${PORTSDIR}/www/py-cssutils -CONFLICTS_INSTALL= py*-ll-core-1* - USE_BZIP2= yes USE_PYTHON= 2 USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes +post-patch: +.for conflictswithllcore in __init__ scripts/__init__ ansistyle astyle color \ + daemon make misc scripts/ucp sisyphus url xml_codec + ${RM} ${WRKSRC}/src/ll/${conflictswithllcore}.py +.endfor + .include <bsd.port.mk> Added: head/www/xist/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/xist/files/patch-setup.py Wed Feb 19 22:01:13 2014 (r345157) @@ -0,0 +1,31 @@ +$FreeBSD$ + +Stop the port conflicting with devel/py-ll-core + +--- setup.py.orig 2011-08-11 11:51:22.000000000 +0100 ++++ setup.py 2014-02-19 21:45:27.310309976 +0000 +@@ -241,16 +241,11 @@ + packages=["ll", "ll.scripts", "ll.xist", "ll.xist.ns", "ll.xist.scripts", "ll.orasql", "ll.orasql.scripts"], + package_data={"ll.xist": ["data/js/*.js", "data/px/*.gif"]}, + ext_modules=[ +- tools.Extension("ll._url", ["src/ll/_url.c"]), +- tools.Extension("ll._ansistyle", ["src/ll/_ansistyle.c"]), +- tools.Extension("ll._misc", ["src/ll/_misc.c", "src/ll/_misc_include.c"]), +- tools.Extension("ll._xml_codec", ["src/ll/_xml_codec.c", "src/ll/_xml_codec_include.c"]), + tools.Extension("ll.xist.sgmlop", ["src/ll/xist/sgmlop.c"], define_macros=[("SGMLOP_UNICODE_SUPPORT", None)]), + ], + entry_points=dict( + console_scripts=[ + "uls = ll.scripts.uls:main", +- "ucp = ll.scripts.ucp:main", + "ucat = ll.scripts.ucat:main", + "uhpp = ll.xist.scripts.uhpp:main", + "db2ul4 = ll.scripts.db2ul4:main", +@@ -269,7 +264,6 @@ + ), + scripts=[ + "scripts/uls.py", +- "scripts/ucp.py", + "scripts/ucat.py", + "scripts/uhpp.py", + "scripts/db2ul4.py",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402192201.s1JM1DiN088612>