Date: Thu, 9 Jul 2009 03:27:40 GMT From: Wen Heping <wenheping@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/136596: [Patch]textproc/py-xml:welcome python2.6 Message-ID: <200907090327.n693Rel5047743@www.freebsd.org> Resent-Message-ID: <200907090330.n693U7wi031547@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 136596
>Category: ports
>Synopsis: [Patch]textproc/py-xml:welcome python2.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 09 03:30:07 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Wen Heping
>Release: FreeBSD 8.0-CURRENT
>Organization:
ChangAn Middle School
>Environment:
FreeBSD fb8.wenjing.com 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Mar 22 22:12:06 CST 2009 root@fb8.wenjing.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
"as" is rserved name in python-2.6 now,
we should give it another name if a variable was
named "as".
if not, the port would build well but run errors,
and it would break the running of some ports that
depends on it.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN py-xml/Makefile py-xml.new/Makefile
--- py-xml/Makefile 2009-06-09 20:38:03.000000000 +0800
+++ py-xml.new/Makefile 2009-07-09 11:12:46.000000000 +0800
@@ -7,7 +7,7 @@
PORTNAME= xml
PORTVERSION= 0.8.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pyxml
diff -urN py-xml/files/patch-xml-xpath-ParsedAbbreviatedAbsoluteLocationPath.py py-xml.new/files/patch-xml-xpath-ParsedAbbreviatedAbsoluteLocationPath.py
--- py-xml/files/patch-xml-xpath-ParsedAbbreviatedAbsoluteLocationPath.py 1970-01-01 08:00:00.000000000 +0800
+++ py-xml.new/files/patch-xml-xpath-ParsedAbbreviatedAbsoluteLocationPath.py 2009-07-09 11:02:01.000000000 +0800
@@ -0,0 +1,13 @@
+--- xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py.orig 2009-07-09 08:48:55.000000000 +0800
++++ xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-07-09 08:49:09.000000000 +0800
+@@ -24,8 +24,8 @@
+ self._rel = rel
+ nt = ParsedNodeTest.ParsedNodeTest('node', '')
+ ppl = ParsedPredicateList.ParsedPredicateList([])
+- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+- self._step = ParsedStep.ParsedStep(as, nt, ppl)
++ as26 = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
++ self._step = ParsedStep.ParsedStep(as26, nt, ppl)
+ return
+
+ def evaluate(self, context):
diff -urN py-xml/files/patch-xml-xpath-ParsedAbbreviatedRelativeLocationPath.py py-xml.new/files/patch-xml-xpath-ParsedAbbreviatedRelativeLocationPath.py
--- py-xml/files/patch-xml-xpath-ParsedAbbreviatedRelativeLocationPath.py 1970-01-01 08:00:00.000000000 +0800
+++ py-xml.new/files/patch-xml-xpath-ParsedAbbreviatedRelativeLocationPath.py 2009-07-09 11:02:01.000000000 +0800
@@ -0,0 +1,13 @@
+--- xml/xpath/ParsedAbbreviatedRelativeLocationPath.py.orig 2009-07-09 08:43:39.000000000 +0800
++++ xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-07-09 08:43:56.000000000 +0800
+@@ -28,8 +28,8 @@
+ self._right = right
+ nt = ParsedNodeTest.ParsedNodeTest('node','')
+ ppl = ParsedPredicateList.ParsedPredicateList([])
+- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+- self._middle = ParsedStep.ParsedStep(as, nt, ppl)
++ as26 = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
++ self._middle = ParsedStep.ParsedStep(as26, nt, ppl)
+
+ def evaluate(self, context):
+ res = []
diff -urN py-xml/pkg-plist py-xml.new/pkg-plist
--- py-xml/pkg-plist 2009-06-09 20:38:03.000000000 +0800
+++ py-xml.new/pkg-plist 2009-07-09 11:13:41.000000000 +0800
@@ -532,7 +532,11 @@
%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/NamespaceNode.pyc
%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/NamespaceNode.pyo
%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
+%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.pyc
+%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.pyo
%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.py
+%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.pyc
+%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.pyo
%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.py
%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.pyc
%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.pyo
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907090327.n693Rel5047743>