diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index c9af40faac8..22a1f712eb6 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.53 2002/09/13 10:10:47 kevlo Exp $ +# $OpenBSD: Makefile,v 1.54 2002/10/22 06:09:28 kevlo Exp $ COMMENT= "XML parsing library" -VERSION= 2.4.24 +VERSION= 2.4.26 DISTNAME= libxml2-${VERSION} PKGNAME= libxml-${VERSION} CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/libxml/} +MASTER_SITES= ftp://xmlsoft.org/ HOMEPAGE= http://xmlsoft.org/ diff --git a/textproc/libxml/distinfo b/textproc/libxml/distinfo index fbddcd9ad2e..7f5058d2e7b 100644 --- a/textproc/libxml/distinfo +++ b/textproc/libxml/distinfo @@ -1,3 +1,3 @@ -MD5 (libxml2-2.4.24.tar.gz) = 7ffd80f0c632bcf3034cc552fcb2ea86 -RMD160 (libxml2-2.4.24.tar.gz) = d57b706e0456fbd7629f7b946d3c096e25b4a7b8 -SHA1 (libxml2-2.4.24.tar.gz) = 8f07250fd3cb29e897dba7c1e9bb323104368220 +MD5 (libxml2-2.4.26.tar.gz) = 744e9d5c12b053fa80a23f634590176d +RMD160 (libxml2-2.4.26.tar.gz) = 0bb7efdbc158dced17e4d46610cfa128761bc7a1 +SHA1 (libxml2-2.4.26.tar.gz) = c1f813bd2b4c9a8fccf9cdbc4180c8fd98c45598 diff --git a/textproc/libxml/patches/patch-python_Makefile_in b/textproc/libxml/patches/patch-python_Makefile_in deleted file mode 100644 index d8eb2075b6b..00000000000 --- a/textproc/libxml/patches/patch-python_Makefile_in +++ /dev/null @@ -1,26 +0,0 @@ ---- python/Makefile.in.orig Fri Sep 13 17:38:33 2002 -+++ python/Makefile.in Fri Sep 13 17:58:47 2002 -@@ -143,7 +143,7 @@ - -I$(top_srcdir)/include - - --DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION) -+DOCS_DIR = $(datadir)/libxml2-python - # libxml2class.txt is generated - DOCS = TODO - -@@ -532,12 +532,12 @@ - maintainer-clean - - --@WITH_PYTHON_TRUE@all-local: libxml2.py -+all-local: - - @WITH_PYTHON_TRUE@libxml2.py: $(srcdir)/libxml.py libxml2class.py - @WITH_PYTHON_TRUE@ cat $(srcdir)/libxml.py libxml2class.py > libxml2.py - --@WITH_PYTHON_TRUE@install-data-local: -+install-data-local: - @WITH_PYTHON_TRUE@ $(mkinstalldirs) $(libdir)/python${PYTHON_VERSION}/site-packages - @WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 libxml2.py $(libdir)/python${PYTHON_VERSION}/site-packages - @WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DOCS_DIR) diff --git a/textproc/libxml/patches/patch-python_tests_Makefile_in b/textproc/libxml/patches/patch-python_tests_Makefile_in deleted file mode 100644 index 4bdfeff0939..00000000000 --- a/textproc/libxml/patches/patch-python_tests_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- python/tests/Makefile.in.orig Fri Apr 19 12:41:54 2002 -+++ python/tests/Makefile.in Fri Apr 19 12:42:45 2002 -@@ -130,7 +130,7 @@ - Z_CFLAGS = @Z_CFLAGS@ - Z_LIBS = @Z_LIBS@ - --EXAMPLE_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples -+EXAMPLE_DIR = $(datadir)/libxml2-python/examples - - PYTESTS = \ - build.py \ diff --git a/textproc/libxml/pkg/PFRAG.shared b/textproc/libxml/pkg/PFRAG.shared index 2f2d07cce6d..e69a760d37e 100644 --- a/textproc/libxml/pkg/PFRAG.shared +++ b/textproc/libxml/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.33 2002/09/13 10:10:53 kevlo Exp $ -lib/libxml2.so.6.24 +@comment $OpenBSD: PFRAG.shared,v 1.34 2002/10/22 06:09:36 kevlo Exp $ +lib/libxml2.so.6.26 DYNLIBDIR(%B) diff --git a/textproc/libxml/pkg/PLIST b/textproc/libxml/pkg/PLIST index cacef5843c2..69262d6e0ef 100644 --- a/textproc/libxml/pkg/PLIST +++ b/textproc/libxml/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.21 2002/05/29 05:24:12 kevlo Exp $ +@comment $OpenBSD: PLIST,v 1.22 2002/10/22 06:09:36 kevlo Exp $ bin/xml2-config bin/xmlcatalog bin/xmllint @@ -55,6 +55,8 @@ share/libxml2/examples/testXPath.c share/libxml2/examples/xmllint.c share/libxml2/html/DOM.gif share/libxml2/html/FAQ.html +share/libxml2/html/Libxml2-Logo-180x168.gif +share/libxml2/html/Libxml2-Logo-90x34.gif share/libxml2/html/book1.html share/libxml2/html/encoding.html share/libxml2/html/index.sgml @@ -75,14 +77,20 @@ share/libxml2/html/libxml-notes.html share/libxml2/html/libxml-parser.html share/libxml2/html/libxml-parserinternals.html share/libxml2/html/libxml-sax.html +share/libxml2/html/libxml-schemasinternals.html share/libxml2/html/libxml-threads.html share/libxml2/html/libxml-tree.html share/libxml2/html/libxml-uri.html share/libxml2/html/libxml-valid.html share/libxml2/html/libxml-xinclude.html +share/libxml2/html/libxml-xmlautomata.html share/libxml2/html/libxml-xmlerror.html share/libxml2/html/libxml-xmlio.html share/libxml2/html/libxml-xmlmemory.html +share/libxml2/html/libxml-xmlregexp.html +share/libxml2/html/libxml-xmlschemas.html +share/libxml2/html/libxml-xmlschemastypes.html +share/libxml2/html/libxml-xmlunicode.html share/libxml2/html/libxml-xpath.html share/libxml2/html/libxml-xpathinternals.html share/libxml2/html/libxml-xpointer.html @@ -92,26 +100,6 @@ share/libxml2/html/smallfootonly.gif share/libxml2/html/structure.gif share/libxml2/html/w3c.png share/libxml2/html/xml.html -share/libxml2-python/examples/attribs.py -share/libxml2-python/examples/build.py -share/libxml2-python/examples/cutnpaste.py -share/libxml2-python/examples/error.py -share/libxml2-python/examples/invalid.xml -share/libxml2-python/examples/push.py -share/libxml2-python/examples/pushSAX.py -share/libxml2-python/examples/pushSAXhtml.py -share/libxml2-python/examples/serialize.py -share/libxml2-python/examples/tst.py -share/libxml2-python/examples/tst.xml -share/libxml2-python/examples/tstURI.py -share/libxml2-python/examples/tstxpath.py -share/libxml2-python/examples/valid.xml -share/libxml2-python/examples/validate.py -share/libxml2-python/examples/xpath.py -share/libxml2-python/examples/xpathext.py -share/libxml2-python/examples/xpathret.py -@dirrm share/libxml2-python/examples -@dirrm share/libxml2-python @dirrm share/libxml2/html @dirrm share/libxml2/examples @dirrm share/libxml2