1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00

Update to 2.4.27.

This commit is contained in:
Joe Marcus Clarke 2002-11-19 06:51:27 +00:00
parent 9032b9e3be
commit e91d0f6e74
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=70460
6 changed files with 18 additions and 60 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= libxml2
PORTVERSION= 2.4.26
PORTREVISION= 1
PORTVERSION= 2.4.27
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4

View File

@ -1 +1 @@
MD5 (gnome2/libxml2-2.4.26.tar.bz2) = feef1cfa822fed07c25b94d4d335f137
MD5 (gnome2/libxml2-2.4.27.tar.bz2) = fcee6c42938b6bc71bf221205dc1f0fa

View File

@ -1,8 +1,8 @@
--- Makefile.in.orig Tue Oct 8 00:40:19 2002
+++ Makefile.in Tue Oct 8 00:43:51 2002
--- Makefile.in.orig Tue Nov 19 00:01:49 2002
+++ Makefile.in Tue Nov 19 00:04:06 2002
@@ -137,7 +137,7 @@
AUTOMAKE_OPTIONS = no-dependencies
Z_CFLAGS = @Z_CFLAGS@
Z_LIBS = @Z_LIBS@
-SUBDIRS = include . doc example @PYTHON_SUBDIR@
+SUBDIRS = include . doc example @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@
@ -30,13 +30,13 @@
@@ -257,7 +257,7 @@
# Instll the tests program sources as examples
#
BASE_DIR = @HTML_DIR@
BASE_DIR = $(datadir)/doc
-DOC_MODULE = libxml2-$(VERSION)
+DOC_MODULE = libxml2
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -868,7 +868,7 @@
@@ -1354,7 +1354,7 @@
uninstall-confexecDATA uninstall-m4dataDATA \
uninstall-pkgconfigDATA
uninstall: uninstall-recursive

View File

@ -1,37 +0,0 @@
Note the second chunk in this patch can be removed on the next release. It
was added to crrect GNOME Bug#96963 which broke the
SGML_CATALOG_FILES variable.
--- catalog.c.orig Sat Oct 5 04:35:13 2002
+++ catalog.c Thu Nov 14 01:41:06 2002
@@ -56,10 +56,10 @@
#define XML_URN_PUBID "urn:publicid:"
#define XML_CATAL_BREAK ((xmlChar *) -1)
#ifndef XML_XML_DEFAULT_CATALOG
-#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
+#define XML_XML_DEFAULT_CATALOG "file://%%LOCALBASE%%/share/xml/catalog"
#endif
#ifndef XML_SGML_DEFAULT_CATALOG
-#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
+#define XML_SGML_DEFAULT_CATALOG "file://%%LOCALBASE%%/share/sgml/catalog"
#endif
static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
@@ -2938,7 +2938,7 @@
while (IS_BLANK(*cur)) cur++;
if (*cur != 0) {
paths = cur;
- while ((*cur != 0) && (!IS_BLANK(*cur)))
+ while ((*cur != 0) && (*cur != ':') && (!IS_BLANK(*cur)))
cur++;
path = xmlStrndup((const xmlChar *)paths, cur - paths);
if (path != NULL) {
@@ -2946,6 +2946,8 @@
xmlFree(path);
}
}
+ while(*cur == ':')
+ cur++;
}
}

View File

@ -1,14 +1,11 @@
$FreeBSD$
--- config.h.in 2001/07/30 12:43:27 1.1
+++ config.h.in 2001/07/30 12:44:21
@@ -1,5 +1,8 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* XXX */
+#define HAVE_VFSCANF
--- config.h.in.orig Sun Nov 3 16:55:05 2002
+++ config.h.in Tue Nov 19 00:06:05 2002
@@ -1,4 +1,8 @@
/* config.h.in. Generated from configure.in by autoheader. */
+
/* Define if you have the strftime function. */
#undef HAVE_STRFTIME
+/* XXX */
+#define GAVE_VFSCANF
+
#undef PACKAGE
#undef VERSION
#undef HAVE_LIBZ

View File

@ -34,7 +34,6 @@ include/libxml2/libxml/xmlschemas.h
include/libxml2/libxml/xmlschemastypes.h
include/libxml2/libxml/xmlunicode.h
include/libxml2/libxml/xmlversion.h
include/libxml2/libxml/xmlwin32version.h
include/libxml2/libxml/xpath.h
include/libxml2/libxml/xpathInternals.h
include/libxml2/libxml/xpointer.h