1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

Undo the SGML_CATALOG_FILES variable breakage introduced in 2.4.26. This

caused KDE documentation not to build.  This patch has been rolled into
libxml CVS, and should be resolved in the next release.  See
http://bugzilla.gnome.org/show_bug.cgi?id=96963 for more details.

Submitted by:	will
Obtained from:	libxml CVS
This commit is contained in:
Joe Marcus Clarke 2002-11-14 18:42:53 +00:00
parent 0c2447fb34
commit 30f0edef41
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=70126
2 changed files with 25 additions and 2 deletions

View File

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

View File

@ -1,5 +1,9 @@
--- catalog.c.orig Mon Jun 3 15:28:28 2002
+++ catalog.c Mon Jun 3 15:29:03 2002
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)
@ -13,3 +17,21 @@
#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++;
}
}