From 5620303c303f58fa46178e21e14f4e981b32e89a Mon Sep 17 00:00:00 2001 From: steven Date: Thu, 5 Jul 2007 16:05:09 +0000 Subject: [PATCH] update to libxml 2.6.29 ok simon@ --- textproc/libxml/Makefile | 6 +++--- textproc/libxml/distinfo | 10 ++++----- textproc/libxml/patches/patch-Makefile.in | 10 ++++----- textproc/libxml/patches/patch-catalog_c | 8 +++---- textproc/libxml/patches/patch-configure | 8 +++---- textproc/libxml/patches/patch-doc_Makefile_in | 8 +++---- .../libxml/patches/patch-python_Makefile_in | 8 +++---- .../patches/patch-python_tests_Makefile_in | 8 +++---- textproc/libxml/patches/patch-xmllint_c | 8 +++---- .../libxml/patches/patch-xstc_Makefile_in | 21 +++++++++++++++++++ textproc/libxml/pkg/PLIST-main | 3 ++- 11 files changed, 60 insertions(+), 38 deletions(-) create mode 100644 textproc/libxml/patches/patch-xstc_Makefile_in diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index a135c2f8d8a..3684488c23c 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.105 2007/05/03 06:37:19 steven Exp $ +# $OpenBSD: Makefile,v 1.106 2007/07/05 16:05:09 steven Exp $ COMMENT-main= "XML parsing library" COMMENT-python= "Python bindings for libxml" -VERSION= 2.6.28 +VERSION= 2.6.29 DISTNAME= libxml2-${VERSION} PKGNAME-main= libxml-${VERSION} PKGNAME-python= py-libxml-${VERSION} -SHARED_LIBS= xml2 9.5 +SHARED_LIBS= xml2 9.6 CATEGORIES= textproc MASTER_SITES= ftp://xmlsoft.org/libxml/ \ ${MASTER_SITE_GNOME:=sources/libxml2/2.6/} diff --git a/textproc/libxml/distinfo b/textproc/libxml/distinfo index 56cb23875b1..832211c9fac 100644 --- a/textproc/libxml/distinfo +++ b/textproc/libxml/distinfo @@ -1,5 +1,5 @@ -MD5 (libxml2-2.6.28.tar.gz) = 3fPDaZZJgKI4+tC2rUBTLA== -RMD160 (libxml2-2.6.28.tar.gz) = ZdDCzvXOQHUb1yu1RGLZEiVY+hc= -SHA1 (libxml2-2.6.28.tar.gz) = dkKlJ5nv3i4BY9Misq7ozZ9YMmg= -SHA256 (libxml2-2.6.28.tar.gz) = OE2xQ9jM3xkEQ5FQ71CB941/nwWsFTBvaFwQwr0+HLI= -SIZE (libxml2-2.6.28.tar.gz) = 4716025 +MD5 (libxml2-2.6.29.tar.gz) = i5m26LCOg4Q42ea2OdeevQ== +RMD160 (libxml2-2.6.29.tar.gz) = SJs5T8fdnCNhioi6Pdzs9xyvOHQ= +SHA1 (libxml2-2.6.29.tar.gz) = I1XyRVqmQIJEt+LERL7+sOk+N9U= +SHA256 (libxml2-2.6.29.tar.gz) = 40oZ4LnXrAOHSs/9Yk8YHIWpj7l23IRBHWzRvdqWWZI= +SIZE (libxml2-2.6.29.tar.gz) = 4719760 diff --git a/textproc/libxml/patches/patch-Makefile.in b/textproc/libxml/patches/patch-Makefile.in index 075e63221b2..983156faf78 100644 --- a/textproc/libxml/patches/patch-Makefile.in +++ b/textproc/libxml/patches/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Fri Apr 28 18:32:52 2006 -+++ Makefile.in Sun May 21 10:21:45 2006 -@@ -522,7 +522,7 @@ testModule_DEPENDENCIES = $(DEPS) +--- Makefile.in.orig Tue Jun 12 18:20:23 2007 ++++ Makefile.in Mon Jul 2 12:50:32 2007 +@@ -525,7 +525,7 @@ testModule_DEPENDENCIES = $(DEPS) testModule_LDADD = $(LDADDS) noinst_LTLIBRARIES = testdso.la testdso_la_SOURCES = testdso.c @@ -9,7 +9,7 @@ testapi_SOURCES = testapi.c testapi_LDFLAGS = testapi_DEPENDENCIES = $(DEPS) -@@ -551,7 +551,7 @@ pkgconfig_DATA = libxml-2.0.pc +@@ -554,7 +554,7 @@ pkgconfig_DATA = libxml-2.0.pc # Install the tests program sources as examples # BASE_DIR = $(datadir)/doc @@ -18,7 +18,7 @@ EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -1919,6 +1919,7 @@ SVGtests : xmllint$(EXEEXT) +@@ -1922,6 +1922,7 @@ SVGtests : xmllint$(EXEEXT) grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ else \ echo Testing $$name ; \ diff --git a/textproc/libxml/patches/patch-catalog_c b/textproc/libxml/patches/patch-catalog_c index f9d54e25aa2..f2b7e88303a 100644 --- a/textproc/libxml/patches/patch-catalog_c +++ b/textproc/libxml/patches/patch-catalog_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-catalog_c,v 1.3 2006/03/20 13:36:54 steven Exp $ ---- catalog.c.orig Fri Apr 1 15:15:01 2005 -+++ catalog.c Sun Mar 5 11:28:46 2006 -@@ -62,10 +62,10 @@ +$OpenBSD: patch-catalog_c,v 1.4 2007/07/05 16:05:09 steven Exp $ +--- catalog.c.orig Tue Jun 12 11:09:38 2007 ++++ catalog.c Mon Jul 2 12:50:32 2007 +@@ -68,10 +68,10 @@ #define XML_URN_PUBID "urn:publicid:" #define XML_CATAL_BREAK ((xmlChar *) -1) #ifndef XML_XML_DEFAULT_CATALOG diff --git a/textproc/libxml/patches/patch-configure b/textproc/libxml/patches/patch-configure index 9828835da94..0dd51011257 100644 --- a/textproc/libxml/patches/patch-configure +++ b/textproc/libxml/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.16 2006/06/18 13:48:19 steven Exp $ ---- configure.orig Tue Jun 6 17:46:49 2006 -+++ configure Thu Jun 15 19:10:40 2006 -@@ -26958,7 +26958,7 @@ fi +$OpenBSD: patch-configure,v 1.17 2007/07/05 16:05:09 steven Exp $ +--- configure.orig Tue Jun 12 18:10:36 2007 ++++ configure Mon Jul 2 12:50:32 2007 +@@ -27029,7 +27029,7 @@ fi fi if test "$with_python" != "" then diff --git a/textproc/libxml/patches/patch-doc_Makefile_in b/textproc/libxml/patches/patch-doc_Makefile_in index 0abf1481fb1..d59ebc9268b 100644 --- a/textproc/libxml/patches/patch-doc_Makefile_in +++ b/textproc/libxml/patches/patch-doc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.14 2006/06/11 18:24:11 steven Exp $ ---- doc/Makefile.in.orig Sun May 21 10:40:09 2006 -+++ doc/Makefile.in Sun May 21 10:40:16 2006 -@@ -271,7 +271,7 @@ sbindir = @sbindir@ +$OpenBSD: patch-doc_Makefile_in,v 1.15 2007/07/05 16:05:09 steven Exp $ +--- doc/Makefile.in.orig Tue Jun 12 18:20:21 2007 ++++ doc/Makefile.in Mon Jul 2 12:50:32 2007 +@@ -274,7 +274,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ diff --git a/textproc/libxml/patches/patch-python_Makefile_in b/textproc/libxml/patches/patch-python_Makefile_in index 3399233b425..66f0946a850 100644 --- a/textproc/libxml/patches/patch-python_Makefile_in +++ b/textproc/libxml/patches/patch-python_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-python_Makefile_in,v 1.7 2006/10/30 11:20:08 bernd Exp $ ---- python/Makefile.in.orig Thu Oct 19 01:26:49 2006 -+++ python/Makefile.in Thu Oct 19 01:27:05 2006 -@@ -732,9 +732,6 @@ uninstall-info: uninstall-info-recursive +$OpenBSD: patch-python_Makefile_in,v 1.8 2007/07/05 16:05:09 steven Exp $ +--- python/Makefile.in.orig Tue Jun 12 18:20:22 2007 ++++ python/Makefile.in Mon Jul 2 12:50:32 2007 +@@ -735,9 +735,6 @@ uninstall-info: uninstall-info-recursive @WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pythondir) @WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(pythondir) @WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 $(srcdir)/drv_libxml2.py $(DESTDIR)$(pythondir) diff --git a/textproc/libxml/patches/patch-python_tests_Makefile_in b/textproc/libxml/patches/patch-python_tests_Makefile_in index 4e6174a0748..0186d6a0fc5 100644 --- a/textproc/libxml/patches/patch-python_tests_Makefile_in +++ b/textproc/libxml/patches/patch-python_tests_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-python_tests_Makefile_in,v 1.6 2006/06/13 17:31:29 alek Exp $ ---- python/tests/Makefile.in.orig Sun Apr 9 16:36:22 2006 -+++ python/tests/Makefile.in Sun Apr 9 16:36:29 2006 -@@ -294,7 +294,6 @@ PYTESTS = \ +$OpenBSD: patch-python_tests_Makefile_in,v 1.7 2007/07/05 16:05:09 steven Exp $ +--- python/tests/Makefile.in.orig Tue Jun 12 18:20:23 2007 ++++ python/tests/Makefile.in Mon Jul 2 12:50:32 2007 +@@ -297,7 +297,6 @@ PYTESTS = \ readererr.py\ relaxng.py \ schema.py \ diff --git a/textproc/libxml/patches/patch-xmllint_c b/textproc/libxml/patches/patch-xmllint_c index 0c046d9d27a..08113985493 100644 --- a/textproc/libxml/patches/patch-xmllint_c +++ b/textproc/libxml/patches/patch-xmllint_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-xmllint_c,v 1.3 2006/03/20 13:36:54 steven Exp $ ---- xmllint.c.orig Mon Sep 12 11:15:48 2005 -+++ xmllint.c Sun Mar 5 11:28:46 2006 -@@ -100,7 +100,7 @@ +$OpenBSD: patch-xmllint_c,v 1.4 2007/07/05 16:05:09 steven Exp $ +--- xmllint.c.orig Tue Apr 17 14:28:16 2007 ++++ xmllint.c Mon Jul 2 12:50:32 2007 +@@ -103,7 +103,7 @@ #endif #ifndef XML_XML_DEFAULT_CATALOG diff --git a/textproc/libxml/patches/patch-xstc_Makefile_in b/textproc/libxml/patches/patch-xstc_Makefile_in new file mode 100644 index 00000000000..139ba15e817 --- /dev/null +++ b/textproc/libxml/patches/patch-xstc_Makefile_in @@ -0,0 +1,21 @@ +$OpenBSD: patch-xstc_Makefile_in,v 1.1 2007/07/05 16:05:09 steven Exp $ +--- xstc/Makefile.in.orig Mon Jul 2 13:45:51 2007 ++++ xstc/Makefile.in Mon Jul 2 13:46:06 2007 +@@ -461,7 +461,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta + else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi) + -@(if [ -f $(TARBALL_2) ] ; then \ + echo -n "extracting test data (NIST)..." ; \ +- $(TAR) -xzf $(TARBALL_2) --wildcards '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \ ++ $(TAR) -xzf $(TARBALL_2) '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \ + echo "done" ; \ + fi) + -@(if [ ! -f $(TARBALL) ] ; then \ +@@ -473,7 +473,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta + else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi) + -@(if [ -f $(TARBALL) ] ; then \ + echo -n "extracting test data (Sun, Microsoft)..." ; \ +- $(TAR) -C Tests -xzf $(TARBALL) --wildcards '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \ ++ $(TAR) -C Tests -xzf $(TARBALL) '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \ + if [ -d Tests/suntest ] ; then rm -r Tests/suntest ; fi ; \ + if [ -d Tests/msxsdtest ] ; then rm -r Tests/msxsdtest ; fi ; \ + mv Tests/xmlschema2002-01-16/* Tests ; \ diff --git a/textproc/libxml/pkg/PLIST-main b/textproc/libxml/pkg/PLIST-main index 3cb8364b2fb..50e40fcecc4 100644 --- a/textproc/libxml/pkg/PLIST-main +++ b/textproc/libxml/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.2 2007/04/23 15:34:04 steven Exp $ +@comment $OpenBSD: PLIST-main,v 1.3 2007/07/05 16:05:10 steven Exp $ @pkgpath textproc/libxml %%SHARED%% bin/xml2-config @@ -81,6 +81,7 @@ share/doc/libxml2/html/encoding.html share/doc/libxml2/html/html/ share/doc/libxml2/html/html/book1.html share/doc/libxml2/html/html/home.png +share/doc/libxml2/html/html/index.html share/doc/libxml2/html/html/left.png share/doc/libxml2/html/html/libxml-DOCBparser.html share/doc/libxml2/html/html/libxml-HTMLparser.html