summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorrillig <rillig>2006-07-22 13:11:28 +0000
committerrillig <rillig>2006-07-22 13:11:28 +0000
commit9d32ffd5dae1a746b256cf4268b59970de5fabc1 (patch)
tree1e3f166a2dfcb6fc81e03882307f9cb2f314f937 /textproc
parentca3a886a0ab91b389b7fc883a66017a494ab613b (diff)
downloadpkgsrc-9d32ffd5dae1a746b256cf4268b59970de5fabc1.tar.gz
Since some time, xmllint has to be run with --nonet. Bumped PKGREVISION.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/xmlto/Makefile15
-rw-r--r--textproc/xmlto/distinfo3
-rw-r--r--textproc/xmlto/patches/patch-ab15
3 files changed, 23 insertions, 10 deletions
diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index c485a9d6065..1d6485c1634 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:52 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/07/22 13:11:28 rillig Exp $
#
DISTNAME= xmlto-0.0.18
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://cyberelk.net/tim/data/xmlto/stable/
EXTRACT_SUFX= .tar.bz2
@@ -12,7 +12,6 @@ HOMEPAGE= http://cyberelk.net/tim/xmlto/index.html
COMMENT= Tool to help transform XML documents into other formats
DEPENDS+= getopt-[0-9]*:../../misc/getopt
-DEPENDS+= bash-[0-9]*:../../shells/bash
DEPENDS+= docbook-xsl>=1.67.0nb1:../../textproc/docbook-xsl
DEPENDS+= libxml2>=2.6.2:../../textproc/libxml2
@@ -21,12 +20,10 @@ GNU_CONFIGURE= yes
MAKE_ENV+= SGML_CATALOG_FILES=${PREFIX:Q}/share/xml/catalog
CONFIGURE_ARGS+= --with-getopt=${PREFIX:Q}/bin/getopt
-pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/xmlto/format/docbook
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/xmlto/format/fo
- @${SED} s,/bin/bash,${PREFIX:Q}/bin/bash, \
- ${WRKSRC:Q}/xmlto > ${WRKDIR:Q}/xmlto.new
- @${MV} ${WRKDIR:Q}/xmlto.new ${WRKSRC:Q}/xmlto
+REPLACE_BASH+= xmlto.in
+USE_TOOLS+= bash:run
+
+INSTALLATION_DIRS= share/xmlto/format/docbook share/xmlto/format/fo
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlto/distinfo b/textproc/xmlto/distinfo
index 6f0475e32a7..31badf12985 100644
--- a/textproc/xmlto/distinfo
+++ b/textproc/xmlto/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/02/26 12:50:03 rillig Exp $
+$NetBSD: distinfo,v 1.4 2006/07/22 13:11:28 rillig Exp $
SHA1 (xmlto-0.0.18.tar.bz2) = abee8925a80bfefcdf1543956a804b1facff7bec
RMD160 (xmlto-0.0.18.tar.bz2) = 4b7232ad673c6b3a0ad015d0061cf5b77165478c
Size (xmlto-0.0.18.tar.bz2) = 91275 bytes
SHA1 (patch-aa) = b404a269dea9aeae23ade6a3e7a7476a94b840b2
+SHA1 (patch-ab) = b7f09d5add1a2423690d7f5aa501ad0f1d215592
diff --git a/textproc/xmlto/patches/patch-ab b/textproc/xmlto/patches/patch-ab
new file mode 100644
index 00000000000..23665489a01
--- /dev/null
+++ b/textproc/xmlto/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2006/07/22 13:11:28 rillig Exp $
+
+--- xmlto.in.orig 2004-01-02 13:03:24.000000000 +0100
++++ xmlto.in 2006-07-22 15:06:09.000000000 +0200
+@@ -321,8 +321,8 @@ if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$S
+ then
+ VALIDATION="${XSLT_PROCESSED_DIR}/validation-errors"
+ [ "$VERBOSE" -ge 1 ] && \
+- echo >&2 "xmllint >/dev/null --xinclude --postvalid $INPUT_FILE"
+- xmllint >/dev/null --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}"
++ echo >&2 "xmllint >/dev/null --nonet --xinclude --postvalid $INPUT_FILE"
++ xmllint >/dev/null --nonet --xinclude --postvalid "$INPUT_FILE" 2>"${VALIDATION}"
+ xmllint_status=$?
+ if [ $xmllint_status -ne 0 ]
+ then