diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-14 18:42:53 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-11-14 18:42:53 +0000 |
| commit | 30f0edef4145f0607c5af9e069d9cc1efa6d86b4 (patch) | |
| tree | 39a1ee482d9147adb50108dd0da8251c7eb0ddd5 | |
| parent | 0c2447fb34482d2c41c515670cb810c93668446f (diff) | |
| download | ports-30f0edef4145f0607c5af9e069d9cc1efa6d86b4.tar.gz ports-30f0edef4145f0607c5af9e069d9cc1efa6d86b4.zip | |
Notes
| -rw-r--r-- | textproc/libxml2/Makefile | 1 | ||||
| -rw-r--r-- | textproc/libxml2/files/patch-catalog.c | 26 |
2 files changed, 25 insertions, 2 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index fb5407a93833..c66cf1d013e6 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -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 diff --git a/textproc/libxml2/files/patch-catalog.c b/textproc/libxml2/files/patch-catalog.c index a567a2fe728b..5559d9eca6a9 100644 --- a/textproc/libxml2/files/patch-catalog.c +++ b/textproc/libxml2/files/patch-catalog.c @@ -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++; + } + } + |