From owner-svn-ports-head@FreeBSD.ORG Wed Feb 19 22:01:14 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D47D940; Wed, 19 Feb 2014 22:01:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2E8811920; Wed, 19 Feb 2014 22:01:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JM1EvT088614; Wed, 19 Feb 2014 22:01:14 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JM1DiN088612; Wed, 19 Feb 2014 22:01:13 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201402192201.s1JM1DiN088612@svn.freebsd.org> From: Chris Rees Date: Wed, 19 Feb 2014 22:01:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345157 - in head/www/xist: . 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.17 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: Wed, 19 Feb 2014 22:01:14 -0000 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 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",