On Thu, Sep 21, 2006 at 02:40:38PM +0200, Xavier Santolaria wrote:
> On 9/21/06, Will Maier <[EMAIL PROTECTED]> wrote:
> >I'd like to resubmit this patch. I experienced problems with
> >0.7.1, which all appear to be fixed in 0.8.4. This patch also
> >cleans the Makefile up a bit, and adds a functioning do-regress.
[...]
> Use MODPY_VERSION instead of PYTHON_VER.
Done. Regress tests in my previous submissions failed unless the
package was installed; I've fixed that and the
s/PYTHON_VER/MODPY_VERSION/g in the attached updated diff.
Thanks!
--
o--------------------------{ Will Maier }--------------------------o
| web:.......http://www.lfod.us/ | [EMAIL PROTECTED] |
*------------------[ BSD Unix: Live Free or Die ]------------------*
diff -x CVS -urN ../py-xml-o/Makefile ./Makefile
--- ../py-xml-o/Makefile Thu Aug 3 18:55:11 2006
+++ ./Makefile Thu Sep 21 08:26:38 2006
@@ -4,9 +4,9 @@
COMMENT= "Python module for writing basic XML applications"
-VERSION= 0.7.1
+VERSION= 0.8.4
DISTNAME= PyXML-${VERSION}
-PKGNAME= py-xml-${VERSION}p0
+PKGNAME= py-xml-${VERSION}
CATEGORIES= textproc devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyxml/}
@@ -35,9 +35,10 @@
BUILD_DEPENDS= ${MODPY_EXPAT_DEPENDS}
.endif
-NO_REGRESS= Yes
+MODPY_VERSION= 2.4
+REGRESS_DEPENDS=
:python-tests-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-tests
-DOC_DIR= ${PREFIX}/share/doc/PyXML/
+DOC_DIR= ${PREFIX}/share/doc/py-xml/
SRC_DOCDIR= ${WRKSRC}/doc
DOCEXT= *.txt *.tex
@@ -48,5 +49,8 @@
${INSTALL_DATA} ${SRC_DOCDIR}/4DOM/* ${DOC_DIR}/4DOM/
${INSTALL_DATA} ${SRC_DOCDIR}/xmlproc/* ${DOC_DIR}/xmlproc/
@cd ${SRC_DOCDIR}/ && ${INSTALL_DATA} ${DOCEXT} ${DOC_DIR}
+
+do-regress:
+ @cd ${WRKSRC}/test && PYTHONPATH=${WRKSRC} ./regrtest.py
.include <bsd.port.mk>
diff -x CVS -urN ../py-xml-o/distinfo ./distinfo
--- ../py-xml-o/distinfo Wed Jan 5 11:34:32 2005
+++ ./distinfo Thu Sep 21 07:22:47 2006
@@ -1,4 +1,4 @@
-MD5 (PyXML-0.7.1.tar.gz) = 6a2e7f0b95961b08dab95b0416cebf9d
-RMD160 (PyXML-0.7.1.tar.gz) = 213855eab7af40e88853eacef53c649158c3ed88
-SHA1 (PyXML-0.7.1.tar.gz) = b548a6308a165a7b248fdebe2d1e2ab7b1ab068b
-SIZE (PyXML-0.7.1.tar.gz) = 606480
+MD5 (PyXML-0.8.4.tar.gz) = 1f7655050cebbb664db976405fdba209
+RMD160 (PyXML-0.8.4.tar.gz) = 976e618d99fb29840e36eb2c7662c1d0a1f2bca9
+SHA1 (PyXML-0.8.4.tar.gz) = 6f30d5907b75ef76809c19e0103d78f4a5fb027c
+SIZE (PyXML-0.8.4.tar.gz) = 734954
diff -x CVS -urN ../py-xml-o/patches/patch-test_regrtest_py
./patches/patch-test_regrtest_py
--- ../py-xml-o/patches/patch-test_regrtest_py Wed Dec 31 18:00:00 1969
+++ ./patches/patch-test_regrtest_py Thu Sep 21 08:27:56 2006
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- test/regrtest.py.orig Thu Sep 21 08:27:31 2006
++++ test/regrtest.py Thu Sep 21 08:27:44 2006
+@@ -115,6 +115,7 @@ STDTESTS = [
+ ]
+
+ NOTTESTS = [
++ 'test_saxdrivers',
+ 'test_support',
+ 'test_b1',
+ 'test_b2',
diff -x CVS -urN ../py-xml-o/pkg/DESCR ./pkg/DESCR
--- ../py-xml-o/pkg/DESCR Thu Jul 31 14:12:00 2003
+++ ./pkg/DESCR Thu Sep 21 07:22:47 2006
@@ -1,4 +1,4 @@
A package collecting the tools required for writing basic XML
-applications in Python, along with documentation and sample
-code Features include (but are not limited to) SAX, DOM, the
-xmlproc validating parser, an Expat interface, and more.
+applications in Python, along with documentation and sample code
+Features include (but are not limited to) SAX, DOM, the xmlproc
+validating parser, an Expat interface, and more.
diff -x CVS -urN ../py-xml-o/pkg/PLIST ./pkg/PLIST
--- ../py-xml-o/pkg/PLIST Wed Sep 15 13:44:07 2004
+++ ./pkg/PLIST Thu Sep 21 07:22:47 2006
@@ -63,6 +63,8 @@
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/en_US/
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/en_US/LC_MESSAGES/
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/en_US/LC_MESSAGES/4Suite.mo
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/expatbuilder.py
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/expatbuilder.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/ext/
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/ext/Dom2Sax.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/ext/Dom2Sax.pyc
@@ -95,9 +97,9 @@
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/ext/reader/Sgmlop.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/ext/reader/__init__.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/ext/reader/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/fr_FR/
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/fr_FR/LC_MESSAGES/
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/fr_FR/LC_MESSAGES/4Suite.mo
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/fr/
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/fr/LC_MESSAGES/
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/fr/LC_MESSAGES/4Suite.mo
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/html/
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/html/GenerateHtml.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/html/GenerateHtml.pyc
@@ -217,12 +219,16 @@
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/html/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/javadom.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/javadom.pyc
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/minicompat.py
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/minicompat.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/minidom.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/minidom.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/minitraversal.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/minitraversal.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/pulldom.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/pulldom.pyc
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/xmlbuilder.py
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/dom/xmlbuilder.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/marshal/
lib/python${MODPY_VERSION}/site-packages/_xmlplus/marshal/__init__.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/marshal/__init__.pyc
@@ -237,6 +243,7 @@
lib/python${MODPY_VERSION}/site-packages/_xmlplus/parsers/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/parsers/expat.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/parsers/expat.pyc
+lib/python${MODPY_VERSION}/site-packages/_xmlplus/parsers/pyexpat.so
lib/python${MODPY_VERSION}/site-packages/_xmlplus/parsers/sgmllib.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/parsers/sgmllib.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/parsers/sgmlop.so
@@ -405,138 +412,30 @@
lib/python${MODPY_VERSION}/site-packages/_xmlplus/xpath/pyxpath.pyc
lib/python${MODPY_VERSION}/site-packages/_xmlplus/xpath/yappsrt.py
lib/python${MODPY_VERSION}/site-packages/_xmlplus/xpath/yappsrt.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ApplyTemplatesElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ApplyTemplatesElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/AttributeElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/AttributeElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/AttributeSetElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/AttributeSetElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/AttributeValueTemplate.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/AttributeValueTemplate.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/BuiltInExtElements.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/BuiltInExtElements.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/CallTemplateElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/CallTemplateElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ChooseElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ChooseElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/CommentElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/CommentElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/CopyElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/CopyElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/CopyOfElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/CopyOfElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ElementElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ElementElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ForEachElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ForEachElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/HtmlWriter.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/HtmlWriter.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/IfElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/IfElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/LiteralElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/LiteralElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/LiteralText.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/LiteralText.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/MessageElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/MessageElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/MessageSource.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/MessageSource.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/NullWriter.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/NullWriter.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/NumberElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/NumberElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/OtherXslElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/OtherXslElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/OtherwiseElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/OtherwiseElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/OutputHandler.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/OutputHandler.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParamElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParamElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParsedLocationPathPattern.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParsedLocationPathPattern.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParsedPattern.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParsedPattern.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParsedRelativePathPattern.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParsedRelativePathPattern.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParsedStepPattern.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ParsedStepPattern.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/PlainTextWriter.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/PlainTextWriter.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ProcessingInstructionElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ProcessingInstructionElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/Processor.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/Processor.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/Roman.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/Roman.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/RtfWriter.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/RtfWriter.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/SortElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/SortElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/Stylesheet.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/Stylesheet.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/StylesheetReader.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/StylesheetReader.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/TemplateElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/TemplateElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/TextElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/TextElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/TextSax.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/TextSax.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/TextWriter.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/TextWriter.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ValueOfElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/ValueOfElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/VariableElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/VariableElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/WhenElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/WhenElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/WithParamElement.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/WithParamElement.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XPattern.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XPattern.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XPatternParser.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XPatternParser.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XPatternParserBase.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XPatternParserBase.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XmlWriter.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XmlWriter.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XsltContext.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XsltContext.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XsltFunctions.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/XsltFunctions.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/_4xslt.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/_4xslt.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/__init__.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/minisupport.py
-lib/python${MODPY_VERSION}/site-packages/_xmlplus/xslt/minisupport.pyc
-share/doc/PyXML/
-share/doc/PyXML/4DOM/
-share/doc/PyXML/4DOM/4DOM.web
-share/doc/PyXML/4DOM/Extensions.api
-share/doc/PyXML/4DOM/Extensions.html
-share/doc/PyXML/4DOM/Ranges.api
-share/doc/PyXML/4DOM/Ranges.html
-share/doc/PyXML/4DOM/index.html
-share/doc/PyXML/xml-howto.tex
-share/doc/PyXML/xml-howto.txt
-share/doc/PyXML/xml-ref.tex
-share/doc/PyXML/xml-ref.txt
-share/doc/PyXML/xmlproc/
-share/doc/PyXML/xmlproc/artikler.css
-share/doc/PyXML/xmlproc/basicapi.gif
-share/doc/PyXML/xmlproc/cmdline.gif
-share/doc/PyXML/xmlproc/standard.css
-share/doc/PyXML/xmlproc/wxval.gif
-share/doc/PyXML/xmlproc/xmlproc-catalog-doco.html
-share/doc/PyXML/xmlproc/xmlproc-doco.html
-share/doc/PyXML/xmlproc/xmlproc-dtd-doco.html
-share/doc/PyXML/xmlproc/xmlproc-license.html
-share/doc/PyXML/xmlproc/xmlproc.html
-share/doc/PyXML/xmlproc/xmlproc_cmdline.html
-share/doc/PyXML/xmlproc/xmlproc_dtdparser.html
-share/doc/PyXML/xmlproc/xmlproc_ns.html
-share/doc/PyXML/xmlproc/xmlproc_tut.html
-%%pyexpat%%
+share/doc/py-xml/
+share/doc/py-xml/4DOM/
+share/doc/py-xml/4DOM/4DOM.web
+share/doc/py-xml/4DOM/Extensions.api
+share/doc/py-xml/4DOM/Extensions.html
+share/doc/py-xml/4DOM/Ranges.api
+share/doc/py-xml/4DOM/Ranges.html
+share/doc/py-xml/4DOM/index.html
+share/doc/py-xml/xml-howto.tex
+share/doc/py-xml/xml-howto.txt
+share/doc/py-xml/xml-ref.tex
+share/doc/py-xml/xml-ref.txt
+share/doc/py-xml/xmlproc/
+share/doc/py-xml/xmlproc/artikler.css
+share/doc/py-xml/xmlproc/basicapi.gif
+share/doc/py-xml/xmlproc/cmdline.gif
+share/doc/py-xml/xmlproc/standard.css
+share/doc/py-xml/xmlproc/wxval.gif
+share/doc/py-xml/xmlproc/xmlproc-catalog-doco.html
+share/doc/py-xml/xmlproc/xmlproc-doco.html
+share/doc/py-xml/xmlproc/xmlproc-dtd-doco.html
+share/doc/py-xml/xmlproc/xmlproc-license.html
+share/doc/py-xml/xmlproc/xmlproc.html
+share/doc/py-xml/xmlproc/xmlproc_cmdline.html
+share/doc/py-xml/xmlproc/xmlproc_dtdparser.html
+share/doc/py-xml/xmlproc/xmlproc_ns.html
+share/doc/py-xml/xmlproc/xmlproc_tut.html
