head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2010Q4:1.3.0.2 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.2.0.16 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.14 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.12 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.10 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.8 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.6 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.4 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.1.0.22 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.20 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.18 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.16 pkgsrc-2008Q1:1.1.0.14 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.12 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.10 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.8 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.6 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.4 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.2 pkgsrc-2006Q3-base:1.1; locks; strict; comment @# @; 1.4 date 2011.03.11.09.27.10; author adam; state dead; branches; next 1.3; 1.3 date 2010.11.22.05.54.17; author dholland; state Exp; branches; next 1.2; 1.2 date 2008.11.10.23.01.38; author wiz; state Exp; branches; next 1.1; 1.1 date 2006.07.22.13.11.28; author rillig; state Exp; branches; next ; desc @@ 1.4 log @Changes 0.0.23: * add support for detection of tail and gnu cp, do not hardcode /bin/bash initial value * use those detected binaries instead of previously hardcoded ones * use `type -t` bash shell builtin instead of `which` utility for detection of file availability * new option --noautosize to prevent overriding of user-defined paper sizes Changes 0.0.22: * added experimental support for xhtml1 source format * create tex and xhtml subpackage in spec file to reduce requirements for main package * automated detection of programs path in configure, program/utility path could be passed to configure by variable, allowed selection of default backend and default webbrowser (just for requirements at the moment) * check for missing tools/programs, fail if tool is not available * fixed libpaper cleaning up * xmllint validity check now with noent option * fixed --stringparam option * added some messages to easier detection of troubles, used different error codes for various situations * fixed FSF addresses, xmlif now licensed under GPLv2+ @ text @$NetBSD: patch-ab,v 1.3 2010/11/22 05:54:17 dholland Exp $ - don't hardwire paths - fix obvious bug handling XSLTPARAMS (PR 44126), already fixed upstream - xmllint needs --nonet --- xmlto.in.orig 2008-05-30 13:41:31.000000000 +0000 +++ xmlto.in @@@@ -97,7 +97,7 @@@@ XSLTOPTS= SEARCHPATH= # Try to setup papersize using libpaper first ... -if [ -x /usr/bin/paperconf ] +if (type paperconf 1>/dev/null 2>&1) then papername=`paperconf -n` paperheight=`paperconf -mh | sed 's/ //g'` @@@@ -128,7 +128,7 @@@@ EOF fi # ... or use magic paper size, based on LC_PAPER -elif [ -x /usr/bin/locale ] +elif (type locale 1>/dev/null 2>&1) then # For paper sizes we know about, specify them. h=$(locale LC_PAPER 2>/dev/null | head -n 1) @@@@ -151,7 +151,7 @@@@ EOF fi # Magic encoding, based on locale -if [ -x /usr/bin/locale ] +if (type locale 1>/dev/null 2>&1) then charmap=$(locale charmap 2>/dev/null) @@@@ -273,8 +273,8 @@@@ while [ "$#" -gt "0" ]; do ;; --stringparam) MYPARAM="$2" - XSLTPARAMS="XSLTPARAMS --stringparam ${MYPARAM%=*}" - XSLTPARAMS="XSLTPARAMS $MYPARAM#*=}" + XSLTPARAMS="$XSLTPARAMS --stringparam ${MYPARAM%=*}" + XSLTPARAMS="$XSLTPARAMS $MYPARAM#*=}" shift 2 ;; --noclean) @@@@ -427,8 +427,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 @ 1.3 log @Fix obviously wrong code handling XSLTPARAMS with the --stringparam option. PR 44126 from Goetz Isenmann. PKGREVISION++. While here, add comment to patch-ab. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2008/11/10 23:01:38 wiz Exp $ @ 1.2 log @Update to 0.0.21: 0.0.21 (stable) added experimental support for dblatex(needs installed dblatex package) fixed issue with cp -a option on non-gnu systems non-mandatory support for libpaper 0.0.20 (stable) added experimental fop support(needs installed fop package) possibility to read a stylesheet from STDIN some small fixes/changes in docbook formats and xmlto script 0.0.19 (stable) added supported for basename with spaces, stringparam option for passing argument to stylesheet, bash no longer hardcoded, added option for not cleaning temp files for diagnostics. @ text @d1 5 a5 1 $NetBSD: patch-ab,v 1.1 2006/07/22 13:11:28 rillig Exp $ d36 11 @ 1.1 log @Since some time, xmllint has to be run with --nonet. Bumped PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d3 30 a32 3 --- 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 d36 1 a36 1 - echo >&2 "xmllint >/dev/null --xinclude --postvalid $INPUT_FILE" d38 1 a38 1 + echo >&2 "xmllint >/dev/null --nonet --xinclude --postvalid $INPUT_FILE" @