diff options
| author | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-08-28 13:48:28 +0000 |
|---|---|---|
| committer | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-08-28 13:48:28 +0000 |
| commit | 8680f69b0ba57333112096c7090167639ffb6008 (patch) | |
| tree | b0feda36aa29231357cb946c4219e9193a40c54a /textproc/libxml2 | |
| parent | Use ${ECHO_CMD} rather than ${ECHO} (diff) | |
- Also fix the catalog paths in xmllint.c and xmllint.1
- While here, refactor the catalog paths patches as ${REINPLACE_CMD} calls
Notes
Notes:
svn path=/head/; revision=141123
Diffstat (limited to 'textproc/libxml2')
| -rw-r--r-- | textproc/libxml2/Makefile | 8 | ||||
| -rw-r--r-- | textproc/libxml2/files/patch-catalog.c | 15 | ||||
| -rw-r--r-- | textproc/libxml2/files/patch-xmlcatalog.c | 11 |
3 files changed, 6 insertions, 28 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index e6fe0cd7caf7..611fd0529f3a 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -13,6 +13,7 @@ PORTNAME= libxml2 PORTVERSION= 2.6.20 +PORTREVISION= 1 CATEGORIES?= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 @@ -63,7 +64,10 @@ CONFIGURE_ARGS+= --with-thread-alloc .endif post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/catalog.c ${WRKSRC}/xmlcatalog.c +.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1 + @${REINPLACE_CMD} -e \ + 's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \ + s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' ${WRKSRC}/${f} +.endfor .include <bsd.port.mk> diff --git a/textproc/libxml2/files/patch-catalog.c b/textproc/libxml2/files/patch-catalog.c deleted file mode 100644 index bb69882c95d3..000000000000 --- a/textproc/libxml2/files/patch-catalog.c +++ /dev/null @@ -1,15 +0,0 @@ ---- catalog.c.orig Wed Jan 15 17:35:09 2003 -+++ catalog.c Wed Jan 15 17:36:03 2003 -@@ -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 deleted file mode 100644 index 3e68ccdb5a6b..000000000000 --- a/textproc/libxml2/files/patch-xmlcatalog.c +++ /dev/null @@ -1,11 +0,0 @@ ---- xmlcatalog.c.orig Sun Jan 26 14:45:48 2003 -+++ xmlcatalog.c Wed Feb 5 19:18:49 2003 -@@ -42,7 +42,7 @@ - #ifdef LIBXML_CATALOG_ENABLED - - #ifndef XML_SGML_DEFAULT_CATALOG --#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog" -+#define XML_SGML_DEFAULT_CATALOG "%%LOCALBASE%%/share/sgml/catalog" - #endif - - /************************************************************************ |