Work around by the recent buildfailure by rather patching/sed'ing the

catalog path in the relevant files (catalog.c, xmlcatalog.c) directly
rather than defining it in the CFLAGS.
Do not bump pkgrevision since nothing changed in the resulting binaries.

4 files changed, 39 insertions, 4 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 5d05289b248..ebe6fa9080e 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/01/16 22:28:34 recht Exp $
+# $NetBSD: Makefile,v 1.65 2005/02/12 16:27:47 recht Exp $
 
 DISTNAME=	libxml2-2.6.17
 CATEGORIES=	textproc
@@ -35,8 +35,11 @@ MAKE_ENV+=	PAX=${PAX:Q}
 
 TEST_TARGET=	check
 
-CFLAGS+=	-DXML_SGML_DEFAULT_CATALOG=\"\\\"${SGML_DEFAULT_CATALOG}\\\"\"
-CFLAGS+=	-DXML_XML_DEFAULT_CATALOG=\"\\\"${XML_DEFAULT_CATALOG}\\\"\"
+SUBST_CLASSES+=		cat
+SUBST_STAGE.cat=	pre-configure
+SUBST_FILES.cat=	catalog.c xmlcatalog.c
+SUBST_SED.cat=	-e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
+SUBST_SED.cat+=	-e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index eede4928192..f80f9c1515c 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.46 2005/01/16 22:28:34 recht Exp $
+$NetBSD: distinfo,v 1.47 2005/02/12 16:27:47 recht Exp $
 
 SHA1 (libxml2-2.6.17.tar.bz2) = 52325ef86a6b3c7e611daea1f7519df8df764479
 Size (libxml2-2.6.17.tar.bz2) = 3067503 bytes
 SHA1 (patch-aa) = a8eb8928330f8bf6827a9d06a07f5e88d6963457
 SHA1 (patch-ab) = e4c782df227b40e2cc70e60695d97952444ea088
+SHA1 (patch-ac) = b704e360662978558694aaab3c4672f26765c5c7
+SHA1 (patch-ad) = 8d0559b439091f66d248a8cce83126fb11c3d574
diff --git a/textproc/libxml2/patches/patch-ac b/textproc/libxml2/patches/patch-ac
new file mode 100644
index 00000000000..9eb00a9b145
--- /dev/null
+++ b/textproc/libxml2/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.5 2005/02/12 16:27:47 recht Exp $
+
+--- catalog.c.orig	Sat Feb 12 16:42:39 2005
++++ catalog.c	Sat Feb 12 16:44:34 2005
+@@ -62,10 +62,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://@@XML_DEFAULT_CATALOG@@"
+ #endif
+ #ifndef XML_SGML_DEFAULT_CATALOG
+-#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
++#define XML_SGML_DEFAULT_CATALOG "file://@@SGML_DEFAULT_CATALOG@@"
+ #endif
+ 
+ #if defined(_WIN32) && defined(_MSC_VER)
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
new file mode 100644
index 00000000000..dc18923be75
--- /dev/null
+++ b/textproc/libxml2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.16 2005/02/12 16:27:47 recht Exp $
+
+--- xmlcatalog.c.orig	Sat Feb 12 16:45:09 2005
++++ xmlcatalog.c	Sat Feb 12 16:45:18 2005
+@@ -43,7 +43,7 @@
+ 
+ 
+ #ifndef XML_SGML_DEFAULT_CATALOG
+-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
++#define XML_SGML_DEFAULT_CATALOG "@@SGML_DEFAULT_CATALOG@@"
+ #endif
+ 
+ /************************************************************************