diff options
| author | rillig <rillig> | 2006-02-26 12:50:03 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-02-26 12:50:03 +0000 |
| commit | 6c41ab5c7e5c9fe8115c6c16fb699669beede6af (patch) | |
| tree | a1c6f9cf60ebacf80147ca11d0e7432c5c13f8e3 /textproc | |
| parent | 97ad17671f35af54e862f579338e558e0e44a558 (diff) | |
| download | pkgsrc-6c41ab5c7e5c9fe8115c6c16fb699669beede6af.tar.gz | |
Added a patch that makes "xmlto txt" usable on pkgsrc system, which
usually don't have binary programs in /usr/bin. While here, fixed all
pkglint warnings.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/xmlto/Makefile | 18 | ||||
| -rw-r--r-- | textproc/xmlto/distinfo | 3 | ||||
| -rw-r--r-- | textproc/xmlto/patches/patch-aa | 28 |
3 files changed, 39 insertions, 10 deletions
diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile index a062b89fc43..9b7b735ed9f 100644 --- a/textproc/xmlto/Makefile +++ b/textproc/xmlto/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:11:08 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/02/26 12:50:03 rillig Exp $ # DISTNAME= xmlto-0.0.18 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= textproc MASTER_SITES= http://cyberelk.net/tim/data/xmlto/stable/ EXTRACT_SUFX= .tar.bz2 @@ -18,15 +18,15 @@ DEPENDS+= libxml2>=2.6.2:../../textproc/libxml2 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -MAKE_ENV+= SGML_CATALOG_FILES=${PREFIX}/share/xml/catalog -CONFIGURE_ARGS+= --with-getopt=${PREFIX}/bin/getopt +MAKE_ENV+= SGML_CATALOG_FILES=${PREFIX:Q}/share/xml/catalog +CONFIGURE_ARGS+= --with-getopt=${PREFIX:Q}/bin/getopt pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/xmlto/format/docbook - ${INSTALL_DATA_DIR} ${PREFIX}/share/xmlto/format/fo - @${SED} "s|/bin/bash|${PREFIX}/bin/bash|" \ - ${WRKSRC}/xmlto > ${WRKDIR}/xmlto.new - @${MV} ${WRKDIR}/xmlto.new ${WRKSRC}/xmlto + ${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 .include "../../textproc/libxslt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xmlto/distinfo b/textproc/xmlto/distinfo index a0b2ebfb721..6f0475e32a7 100644 --- a/textproc/xmlto/distinfo +++ b/textproc/xmlto/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 14:48:50 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/02/26 12:50:03 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 diff --git a/textproc/xmlto/patches/patch-aa b/textproc/xmlto/patches/patch-aa new file mode 100644 index 00000000000..4813752528c --- /dev/null +++ b/textproc/xmlto/patches/patch-aa @@ -0,0 +1,28 @@ +$NetBSD: patch-aa,v 1.1 2006/02/26 12:50:03 rillig Exp $ + +This patch makes "xmlto txt" usable on pkgsrc systems, which usually do +not have these binaries in /usr/bin. + +--- format/docbook/txt.orig 2003-11-30 17:56:45.000000000 +0100 ++++ format/docbook/txt 2006-02-26 13:40:54.000000000 +0100 +@@ -1,14 +1,14 @@ +-if [ -x /usr/bin/w3m ] ++if (type w3m 1>/dev/null 2>&1) + then +- CONVERT=/usr/bin/w3m ++ CONVERT=w3m + ARGS="-T text/html -dump" +-elif [ -x /usr/bin/lynx ] ++elif (type lynx 1>/dev/null 2>&1) + then +- CONVERT=/usr/bin/lynx ++ CONVERT=lynx + ARGS="-force_html -dump -nolist -width=72" +-elif [ -x /usr/bin/links ] ++elif (type links 1>/dev/null 2>&1) + then +- CONVERT=/usr/bin/links ++ CONVERT=links + ARGS="-dump" + else + echo >&2 "No way to convert HTML to text found." |