update to libxml 2.6.23; many bugfixes

ok bernd@
This commit is contained in:
steven 2006-03-20 13:36:54 +00:00
parent 6f35f24ce0
commit 8ffa4e00e1
7 changed files with 49 additions and 30 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.94 2006/02/03 14:14:36 bernd Exp $
# $OpenBSD: Makefile,v 1.95 2006/03/20 13:36:54 steven Exp $
COMMENT= "XML parsing library"
VERSION= 2.6.16
VERSION= 2.6.23
DISTNAME= libxml2-${VERSION}
PKGNAME= libxml-${VERSION}p8
SHARED_LIBS= xml2 9.0
PKGNAME= libxml-${VERSION}
SHARED_LIBS= xml2 9.1
CATEGORIES= textproc
MASTER_SITES= ftp://xmlsoft.org/ \
${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
@ -32,6 +32,8 @@ CONFIGURE_ARGS+= --with-iconv="${DEPBASE}"
CONFIGURE_ARGS+= --without-python
CONFIGURE_ARGS+= --without-threads
REGRESS_DEPENDS= ::devel/gmake
post-configure:
sed -e 's,@PREFIX@,${PREFIX},' <${FILESDIR}/rebuild >${WRKBUILD}/rebuild
@ -39,6 +41,10 @@ post-install:
${INSTALL_SCRIPT_DIR} ${PREFIX}/share/libxml2
${INSTALL_SCRIPT} ${WRKBUILD}/rebuild ${PREFIX}/share/libxml2/
do-regress:
@cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${GMAKE} \
${REGRESS_FLAGS} -f ${MAKE_FILE} ${REGRESS_TARGET}
# XXX let's cheat
#post-configure:
# @perl -pi.bak -e \

View File

@ -1,4 +1,4 @@
MD5 (libxml2-2.6.16.tar.gz) = 7b28b412498625b51d86e58e30fbdd31
RMD160 (libxml2-2.6.16.tar.gz) = 4c3d0f3520c2b54327f25528095ad1efb6ac4032
SHA1 (libxml2-2.6.16.tar.gz) = 3c293f5b621325d23a0463114753bf43515d447d
SIZE (libxml2-2.6.16.tar.gz) = 4008551
MD5 (libxml2-2.6.23.tar.gz) = 0f37385e3ad73cc94db43d6873f4fc3b
RMD160 (libxml2-2.6.23.tar.gz) = 9fc1640354d5d56b251e40ec06addb494349ac0c
SHA1 (libxml2-2.6.23.tar.gz) = e0e58856532c49bd16447922ec802c7ac99d497d
SIZE (libxml2-2.6.23.tar.gz) = 4513068

View File

@ -1,15 +1,24 @@
--- Makefile.in.orig Tue Nov 4 10:27:20 2003
+++ Makefile.in Thu Nov 6 13:25:17 2003
@@ -307,7 +307,7 @@
# Instll the tests program sources as examples
--- Makefile.in.orig Thu Jan 5 16:39:09 2006
+++ Makefile.in Sun Mar 5 12:00:07 2006
@@ -524,7 +524,7 @@ testModule_DEPENDENCIES = $(DEPS)
testModule_LDADD = $(LDADDS)
noinst_LTLIBRARIES = testdso.la
testdso_la_SOURCES = testdso.c
-testdso_la_LDFLAGS = -module -rpath $(libdir)
+testdso_la_LDFLAGS = -module -avoid-version -rpath $(libdir)
testapi_SOURCES = testapi.c
testapi_LDFLAGS =
testapi_DEPENDENCIES = $(DEPS)
@@ -553,7 +553,7 @@ pkgconfig_DATA = libxml-2.0.pc
# Install the tests program sources as examples
#
BASE_DIR = $(datadir)/doc
-DOC_MODULE = libxml2-$(VERSION)
+DOC_MODULE = libxml2
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -1573,6 +1573,7 @@
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1909,6 +1909,7 @@ SVGtests : xmllint$(EXEEXT)
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
else \
echo Testing $$name ; \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-catalog_c,v 1.2 2003/08/26 16:33:11 marcm Exp $
--- catalog.c.orig 2003-08-04 11:41:42.000000000 -0700
+++ catalog.c 2003-08-19 20:44:38.000000000 -0700
$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 @@
#define XML_URN_PUBID "urn:publicid:"
#define XML_CATAL_BREAK ((xmlChar *) -1)
@ -13,4 +13,4 @@ $OpenBSD: patch-catalog_c,v 1.2 2003/08/26 16:33:11 marcm Exp $
+#define XML_SGML_DEFAULT_CATALOG "file:///var/db/sgmlcatalog"
#endif
static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
#if defined(_WIN32) && defined(_MSC_VER)

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-xmlcatalog_c,v 1.1 2003/06/17 03:40:03 marcm Exp $
--- xmlcatalog.c.orig Fri Jun 13 23:31:32 2003
+++ xmlcatalog.c Fri Jun 13 23:32:03 2003
@@ -42,7 +42,7 @@ static char *filename;
#ifdef LIBXML_CATALOG_ENABLED
$OpenBSD: patch-xmlcatalog_c,v 1.2 2006/03/20 13:36:54 steven Exp $
--- xmlcatalog.c.orig Tue Jan 4 15:49:48 2005
+++ xmlcatalog.c Sun Mar 5 11:28:46 2006
@@ -43,7 +43,7 @@ static char *filename = NULL;
#ifndef XML_SGML_DEFAULT_CATALOG
-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xmllint_c,v 1.2 2003/08/26 16:33:11 marcm Exp $
--- xmllint.c.orig 2003-08-13 18:18:06.000000000 -0700
+++ xmllint.c 2003-08-19 20:44:38.000000000 -0700
@@ -99,7 +99,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 @@
#endif
#ifndef XML_XML_DEFAULT_CATALOG
@ -9,4 +9,4 @@ $OpenBSD: patch-xmllint_c,v 1.2 2003/08/26 16:33:11 marcm Exp $
+#define XML_XML_DEFAULT_CATALOG "file:///var/db/xmlcatalog"
#endif
#ifdef LIBXML_DEBUG_ENABLED
typedef enum {

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.39 2006/02/03 14:14:36 bernd Exp $
@comment $OpenBSD: PLIST,v 1.40 2006/03/20 13:36:54 steven Exp $
%%SHARED%%
bin/xml2-config
bin/xmlcatalog
@ -27,6 +27,7 @@ include/libxml2/libxml/parserInternals.h
include/libxml2/libxml/pattern.h
include/libxml2/libxml/relaxng.h
include/libxml2/libxml/schemasInternals.h
include/libxml2/libxml/schematron.h
include/libxml2/libxml/threads.h
include/libxml2/libxml/tree.h
include/libxml2/libxml/uri.h
@ -38,6 +39,7 @@ include/libxml2/libxml/xmlautomata.h
include/libxml2/libxml/xmlerror.h
include/libxml2/libxml/xmlexports.h
include/libxml2/libxml/xmlmemory.h
include/libxml2/libxml/xmlmodule.h
include/libxml2/libxml/xmlreader.h
include/libxml2/libxml/xmlregexp.h
include/libxml2/libxml/xmlsave.h
@ -103,6 +105,7 @@ share/doc/libxml2/html/html/libxml-parserInternals.html
share/doc/libxml2/html/html/libxml-pattern.html
share/doc/libxml2/html/html/libxml-relaxng.html
share/doc/libxml2/html/html/libxml-schemasInternals.html
share/doc/libxml2/html/html/libxml-schematron.html
share/doc/libxml2/html/html/libxml-threads.html
share/doc/libxml2/html/html/libxml-tree.html
share/doc/libxml2/html/html/libxml-uri.html
@ -114,6 +117,7 @@ share/doc/libxml2/html/html/libxml-xmlautomata.html
share/doc/libxml2/html/html/libxml-xmlerror.html
share/doc/libxml2/html/html/libxml-xmlexports.html
share/doc/libxml2/html/html/libxml-xmlmemory.html
share/doc/libxml2/html/html/libxml-xmlmodule.html
share/doc/libxml2/html/html/libxml-xmlreader.html
share/doc/libxml2/html/html/libxml-xmlregexp.html
share/doc/libxml2/html/html/libxml-xmlsave.html