summaryrefslogtreecommitdiff
path: root/textproc/libxml2
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-06-03 20:17:37 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-06-03 20:17:37 +0000
commitd82032cc0f54424138037abd985ecd11570b4da5 (patch)
tree67ede21f9ab01f1d5f521349ca35b7eaa3289e13 /textproc/libxml2
parentadd osalp 0.7.2 (diff)
Set the default XML catalog location to the correct path. Bump PORTREVISION.
Notes
Notes: svn path=/head/; revision=60550
Diffstat (limited to 'textproc/libxml2')
-rw-r--r--textproc/libxml2/Makefile5
-rw-r--r--textproc/libxml2/files/patch-catalog.c15
-rw-r--r--textproc/libxml2/files/patch-xmlcatalog.c11
3 files changed, 31 insertions, 0 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 5fb6303ed94d..cfb7adc52ac5 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libxml2
PORTVERSION= 2.4.22
+PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libxml
@@ -50,4 +51,8 @@ pre-patch:
@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
+post-patch:
+ @${PERL} -pi -e 's|\%\%LOCALBASE\%\%|${LOCALBASE}|g' \
+ ${WRKSRC}/catalog.c ${WRKSRC}/xmlcatalog.c
+
.include <bsd.port.mk>
diff --git a/textproc/libxml2/files/patch-catalog.c b/textproc/libxml2/files/patch-catalog.c
new file mode 100644
index 000000000000..a567a2fe728b
--- /dev/null
+++ b/textproc/libxml2/files/patch-catalog.c
@@ -0,0 +1,15 @@
+--- catalog.c.orig Mon Jun 3 15:28:28 2002
++++ catalog.c Mon Jun 3 15:29:03 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);
diff --git a/textproc/libxml2/files/patch-xmlcatalog.c b/textproc/libxml2/files/patch-xmlcatalog.c
new file mode 100644
index 000000000000..dea513899b5b
--- /dev/null
+++ b/textproc/libxml2/files/patch-xmlcatalog.c
@@ -0,0 +1,11 @@
+--- xmlcatalog.c.orig Mon Jun 3 15:30:00 2002
++++ xmlcatalog.c Mon Jun 3 15:30:17 2002
+@@ -41,7 +41,7 @@
+
+ #ifdef LIBXML_CATALOG_ENABLED
+
+-#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
++#define XML_SGML_DEFAULT_CATALOG "%%LOCALBASE%%/share/sgml/catalog"
+
+ /************************************************************************
+ * *