[csw-devel] SF.net SVN: gar:[6368] csw/mgar/pkg/xmlto/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Mon Sep 21 18:18:43 CEST 2009
Revision: 6368
http://gar.svn.sourceforge.net/gar/?rev=6368&view=rev
Author: bdwalton
Date: 2009-09-21 16:18:43 +0000 (Mon, 21 Sep 2009)
Log Message:
-----------
xmlto: bump to 0.0.23, remove patches that got rolled in upstream
Modified Paths:
--------------
csw/mgar/pkg/xmlto/trunk/Makefile
csw/mgar/pkg/xmlto/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch
csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch
csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch
csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch
Modified: csw/mgar/pkg/xmlto/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-21 16:11:41 UTC (rev 6367)
+++ csw/mgar/pkg/xmlto/trunk/Makefile 2009-09-21 16:18:43 UTC (rev 6368)
@@ -1,5 +1,5 @@
GARNAME = xmlto
-GARVERSION = 0.0.22
+GARVERSION = 0.0.23
CATEGORIES = utils
PREREQUISITE_PKGS += CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt
@@ -19,11 +19,6 @@
MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-PATCHFILES += 0001-add-support-for-selection-of-posix-tail-binary.patch
-PATCHFILES += 0002-add-handling-so-that-gnu-cp-can-be-specified.patch
-PATCHFILES += 0003-do-no-hardcode-bin-bash-to-override-env-check.patch
-PATCHFILES += 0004-switch-file-detection-from-which-to-type.patch
-
TEST_TARGET = check
# We define upstream file regex so we can be notifed of new upstream software release
Modified: csw/mgar/pkg/xmlto/trunk/checksums
===================================================================
--- csw/mgar/pkg/xmlto/trunk/checksums 2009-09-21 16:11:41 UTC (rev 6367)
+++ csw/mgar/pkg/xmlto/trunk/checksums 2009-09-21 16:18:43 UTC (rev 6368)
@@ -1,5 +1 @@
-037997ead86e0589b4e34538d7d2694a download/0001-add-support-for-selection-of-posix-tail-binary.patch
-134ec47ba3f225ebd04bfb629b230e69 download/0002-add-handling-so-that-gnu-cp-can-be-specified.patch
-b53522eb1413d28da8e661b76f4ab098 download/0003-do-no-hardcode-bin-bash-to-override-env-check.patch
-aec9edfc4fdc77ee6bc77124bb1235f4 download/0004-switch-file-detection-from-which-to-type.patch
-12f297dc7051e4fef08339980f88a1dd download/xmlto-0.0.22.tar.bz2
+3001d6bb2bbc2c8f6c2301f05120f074 download/xmlto-0.0.23.tar.bz2
Deleted: csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch
===================================================================
--- csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch 2009-09-21 16:11:41 UTC (rev 6367)
+++ csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch 2009-09-21 16:18:43 UTC (rev 6368)
@@ -1,48 +0,0 @@
-From 788a65e1792057ac1379c459e111eccf06b4a034 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Tue, 15 Sep 2009 19:01:55 +0200
-Subject: [PATCH 1/2] add support for selection of posix tail binary
-
----
- configure.in | 3 +++
- xmlto.in | 3 ++-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index c41bb72..0fb685e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -107,6 +107,9 @@ AC_PATH_PROG([LINKS], [links], [links])
- AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.])
- AC_PATH_PROG([W3M], [w3m], [w3m])
-
-+AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.])
-+AC_PATH_PROG([TAIL], [tail], [tail])
-+
- dnl
- dnl default webrowser
- dnl
-diff --git a/xmlto.in b/xmlto.in
-index 66423b3..21f9acc 100755
---- a/xmlto.in
-+++ b/xmlto.in
-@@ -21,6 +21,7 @@ FIND=@FIND@ # This must be GNU find (need -maxdepth)
- MKTEMP=@MKTEMP@ # See http://www.mktemp.org if missing on your system
- BASH=@BASH@ # GNU bash, for running the format scripts
- GETOPT=@GETOPT@ # a getopt that supports --longoptions
-+TAIL=@TAIL@ # a tail that supports -n (posix)
-
- version () {
- echo "@PACKAGE@ version @VERSION@"
-@@ -407,7 +408,7 @@ esac
- # sed -e 's/^<?[^?>]*?>//g' -e 's/^<![^>]*>//g' -e 's/^<\([^ ]*\).*$/\1/')
-
- # Seems reasonable fix the file command and teach it to identify the DTD/Schema but this is faster to write:
--rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |tail -n 1 | cut -f 4 -d " " )
-+rootel=$(echo "xpath *" | "$XMLLINT_PATH" --shell "$INPUT_FILE" 2> /dev/null | head -n 3 |$TAIL -n 1 | cut -f 4 -d " " )
-
- case $(echo $rootel) in
- fo:root)
---
-1.6.3.2
-
Deleted: csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch
===================================================================
--- csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch 2009-09-21 16:11:41 UTC (rev 6367)
+++ csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch 2009-09-21 16:18:43 UTC (rev 6368)
@@ -1,191 +0,0 @@
-From d8102af69b3d635abfb913771d3fe9b1d11ad971 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Tue, 15 Sep 2009 19:39:54 +0200
-Subject: [PATCH 2/2] add handling so that gnu cp can be specified
-
----
- configure.in | 3 +++
- format/docbook/fo | 2 +-
- format/docbook/html | 2 +-
- format/docbook/html-nochunks | 2 +-
- format/docbook/htmlhelp | 2 +-
- format/docbook/javahelp | 2 +-
- format/docbook/man | 2 +-
- format/docbook/xhtml | 2 +-
- format/docbook/xhtml-nochunks | 2 +-
- format/fo/dvi | 2 +-
- format/fo/pdf | 2 +-
- format/xhtml1/fo | 2 +-
- xmlto.in | 2 ++
- 13 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 0fb685e..727da83 100644
---- a/configure.in
-+++ b/configure.in
-@@ -110,6 +110,9 @@ AC_PATH_PROG([W3M], [w3m], [w3m])
- AC_ARG_VAR([TAIL], [Name and path of a tail binary that supports -n.])
- AC_PATH_PROG([TAIL], [tail], [tail])
-
-+AC_ARG_VAR([GCP], [Name and path of a GNU cp binary (need at least -P)])
-+AC_PATH_PROG([GCP], [cp], [cp])
-+
- dnl
- dnl default webrowser
- dnl
-diff --git a/format/docbook/fo b/format/docbook/fo
-index 699fe3b..8b4f200 100755
---- a/format/docbook/fo
-+++ b/format/docbook/fo
-@@ -7,6 +7,6 @@ stylesheet)
- echo "http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"
- ;;
- post-process)
-- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo"
-+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo"
- ;;
- esac
-diff --git a/format/docbook/html b/format/docbook/html
-index 56bed62..3b2cd71 100755
---- a/format/docbook/html
-+++ b/format/docbook/html
-@@ -7,6 +7,6 @@ stylesheet)
- echo "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
- ;;
- post-process)
-- cp -R -P -p -- * "$OUTPUT_DIR"
-+ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR"
- ;;
- esac
-diff --git a/format/docbook/html-nochunks b/format/docbook/html-nochunks
-index 18a0a63..82b635b 100755
---- a/format/docbook/html-nochunks
-+++ b/format/docbook/html-nochunks
-@@ -7,6 +7,6 @@ stylesheet)
- echo "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"
- ;;
- post-process)
-- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html"
-+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").html"
- ;;
- esac
-diff --git a/format/docbook/htmlhelp b/format/docbook/htmlhelp
-index 6ae2750..01553df 100755
---- a/format/docbook/htmlhelp
-+++ b/format/docbook/htmlhelp
-@@ -7,6 +7,6 @@ stylesheet)
- echo "http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl"
- ;;
- post-process)
-- cp -R -P -p -- * "$OUTPUT_DIR"
-+ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR"
- ;;
- esac
-diff --git a/format/docbook/javahelp b/format/docbook/javahelp
-index ad50388..57710f0 100755
---- a/format/docbook/javahelp
-+++ b/format/docbook/javahelp
-@@ -7,6 +7,6 @@ stylesheet)
- echo "http://docbook.sourceforge.net/release/xsl/current/javahelp/javahelp.xsl"
- ;;
- post-process)
-- cp -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR"
-+ ${GCP_PATH:-cp} -R -P -p -- *.htm* *.hs *.xml *.jhm "$OUTPUT_DIR"
- ;;
- esac
-diff --git a/format/docbook/man b/format/docbook/man
-index 1b0d561..525b03b 100755
---- a/format/docbook/man
-+++ b/format/docbook/man
-@@ -8,6 +8,6 @@ stylesheet)
- ;;
- post-process)
- [ -e "$XSLT_PROCESSED" ] && rm "$XSLT_PROCESSED"
-- cp -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null
-+ ${GCP_PATH:-cp} -R -P -p -- * "$OUTPUT_DIR" 2>/dev/null
- ;;
- esac
-diff --git a/format/docbook/xhtml b/format/docbook/xhtml
-index 940c250..8204549 100755
---- a/format/docbook/xhtml
-+++ b/format/docbook/xhtml
-@@ -7,6 +7,6 @@ stylesheet)
- echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"
- ;;
- post-process)
-- cp -R -P -p -- *.*htm* "$OUTPUT_DIR"
-+ ${GCP_PATH:-cp} -R -P -p -- *.*htm* "$OUTPUT_DIR"
- ;;
- esac
-diff --git a/format/docbook/xhtml-nochunks b/format/docbook/xhtml-nochunks
-index 3ae4c81..82b555d 100755
---- a/format/docbook/xhtml-nochunks
-+++ b/format/docbook/xhtml-nochunks
-@@ -7,6 +7,6 @@ stylesheet)
- echo "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"
- ;;
- post-process)
-- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html"
-+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename ${XSLT_PROCESSED%.*}).html"
- ;;
- esac
-diff --git a/format/fo/dvi b/format/fo/dvi
-index 1c797a6..9db53c7 100755
---- a/format/fo/dvi
-+++ b/format/fo/dvi
-@@ -34,6 +34,6 @@ post-process)
- [ "$VERBOSE" -ge 3 ] && cat $OUT
- fi
- fi
-- cp -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi"
-+ ${GCP_PATH:-cp} -R -P -p -- *.dvi "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").dvi"
- ;;
- esac
-diff --git a/format/fo/pdf b/format/fo/pdf
-index c6f55a4..670cd3c 100755
---- a/format/fo/pdf
-+++ b/format/fo/pdf
-@@ -37,7 +37,7 @@ DEFAULT|DBLATEX)
- [ "$VERBOSE" -ge 3 ] && cat $OUT
- fi
- fi
-- cp -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf"
-+ ${GCP_PATH:-cp} -R -P -p -- *.pdf "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").pdf"
- ;;
- esac
- ;;
-diff --git a/format/xhtml1/fo b/format/xhtml1/fo
-index 588051e..a445ea0 100755
---- a/format/xhtml1/fo
-+++ b/format/xhtml1/fo
-@@ -7,6 +7,6 @@ stylesheet)
- echo "http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/xhtml2fo.xsl"
- ;;
- post-process)
-- cp -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo"
-+ ${GCP_PATH:-cp} -R -P -p -- "$XSLT_PROCESSED" "$OUTPUT_DIR/$(basename "${XSLT_PROCESSED%.*}").fo"
- ;;
- esac
-diff --git a/xmlto.in b/xmlto.in
-index 21f9acc..dcab15e 100755
---- a/xmlto.in
-+++ b/xmlto.in
-@@ -245,6 +245,7 @@ fi
- LINKS_PATH=@LINKS@
- W3M_PATH=@W3M@
- LYNX_PATH=@LYNX@
-+GCP_PATH=@GCP@
-
- # Process any options
- ARGS=$(${GETOPT} \
-@@ -441,6 +442,7 @@ fi
- XSLT_PROCESSOR="$XSLTPROC_PATH" # We only know about xsltproc right now.
- export XSLT_PROCESSOR
- export W3M_PATH
-+export GCP_PATH
- export LINKS_PATH
- export LYNX_PATH
- export FOP_PATH
---
-1.6.3.2
-
Deleted: csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch
===================================================================
--- csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 2009-09-21 16:11:41 UTC (rev 6367)
+++ csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch 2009-09-21 16:18:43 UTC (rev 6368)
@@ -1,24 +0,0 @@
-From d9ee41aa38e8009bff734ec540c41822a7d3998f Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Tue, 15 Sep 2009 19:45:33 +0200
-Subject: [PATCH 3/3] do no hardcode /bin/bash to override env check
-
----
- configure.in | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 727da83..bf854b7 100644
---- a/configure.in
-+++ b/configure.in
-@@ -18,7 +18,6 @@ AC_CHECK_PROG([MKTEMP], [mktemp],, [mktemp])
- AC_ARG_VAR([FIND], [Name of the GNU `find' program.])
- AC_CHECK_PROG([FIND], [find],, [find] )
-
--BASH=/bin/bash
- AC_ARG_VAR([BASH], [Name and path of the GNU `bash' shell.])
- AC_PATH_PROG([BASH], [bash], [/bin/bash])
-
---
-1.6.3.2
-
Deleted: csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch
===================================================================
--- csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch 2009-09-21 16:11:41 UTC (rev 6367)
+++ csw/mgar/pkg/xmlto/trunk/files/0004-switch-file-detection-from-which-to-type.patch 2009-09-21 16:18:43 UTC (rev 6368)
@@ -1,170 +0,0 @@
-From b9b12cdac3163c55bf3af13b1d51dd7c60639d4b Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Wed, 16 Sep 2009 02:30:05 +0200
-Subject: [PATCH 4/4] switch file detection from `which` to `type`
-
----
- format/docbook/txt | 6 +++---
- format/fo/dvi | 2 +-
- format/fo/pdf | 2 +-
- format/xhtml1/txt | 6 +++---
- xmlto.in | 18 +++++++++---------
- 5 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/format/docbook/txt b/format/docbook/txt
-index 390e96a..d72f27f 100755
---- a/format/docbook/txt
-+++ b/format/docbook/txt
-@@ -1,14 +1,14 @@
- case "$USE_BACKEND" in
- DEFAULT|DBLATEX)
-- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ]
-+ if [ -n "`type -t $W3M_PATH`" ]
- then
- CONVERT="$W3M_PATH"
- ARGS="-T text/html -dump"
-- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ]
-+ elif [ -n "`type -t $LYNX_PATH`" ]
- then
- CONVERT="$LYNX_PATH"
- ARGS="-force_html -dump -nolist -width=72"
-- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ]
-+ elif [ -n "`type -t $LINKS_PATH`" ]
- then
- CONVERT="$LINKS_PATH"
- ARGS="-dump"
-diff --git a/format/fo/dvi b/format/fo/dvi
-index 9db53c7..a9af333 100755
---- a/format/fo/dvi
-+++ b/format/fo/dvi
-@@ -6,7 +6,7 @@ post-process)
- then
- echo >&2 "Post-process XSL-FO to DVI"
- fi
-- if [ -z "`which $XMLTEX_PATH 2>/dev/null`" ]
-+ if [ -z "`type -t $XMLTEX_PATH`" ]
- then
- echo >&2 "Can't process, xmltex tool not found at $XMLTEX_PATH."
- exit 3
-diff --git a/format/fo/pdf b/format/fo/pdf
-index 670cd3c..aa967aa 100755
---- a/format/fo/pdf
-+++ b/format/fo/pdf
-@@ -8,7 +8,7 @@ DEFAULT|DBLATEX)
- then
- echo >&2 "Post-process XSL-FO to PDF"
- fi
-- if [ -z "`which $PDFXMLTEX_PATH 2>/dev/null`" ]
-+ if [ -z "`type -t $PDFXMLTEX_PATH`" ]
- then
- echo >&2 "Can't process, pdfxmltex tool not found at $PDFXMLTEX_PATH."
- exit 3
-diff --git a/format/xhtml1/txt b/format/xhtml1/txt
-index fa34ff7..18c9559 100755
---- a/format/xhtml1/txt
-+++ b/format/xhtml1/txt
-@@ -1,14 +1,14 @@
- case "$USE_BACKEND" in
- DEFAULT|DBLATEX)
-- if [ -n "`which "$W3M_PATH" 2>/dev/null`" ]
-+ if [ -n "`type -t $W3M_PATH`" ]
- then
- CONVERT="$W3M_PATH"
- ARGS="-T text/html -dump"
-- elif [ -n "`which "$LYNX_PATH" 2>/dev/null`" ]
-+ elif [ -n "`type -t $LYNX_PATH`" ]
- then
- CONVERT="$LYNX_PATH"
- ARGS="-force_html -dump -nolist -width=72"
-- elif [ -n "`which "$LINKS_PATH" 2>/dev/null`" ]
-+ elif [ -n "`type -t $LINKS_PATH`" ]
- then
- CONVERT="$LINKS_PATH"
- ARGS="-dump"
-diff --git a/xmlto.in b/xmlto.in
-index dcab15e..45221a6 100755
---- a/xmlto.in
-+++ b/xmlto.in
-@@ -125,7 +125,7 @@ XMLLINT_PATH=@XMLLINT@
- XSLTPROC_PATH=@XSLTPROC@
-
- # Try to setup papersize using libpaper first ...
--if [ -n "`which "$PAPERCONF_PATH" 2>/dev/null`" ]
-+if [ -n "`type -t $PAPERCONF_PATH`" ]
- then
- papername=`"$PAPERCONF_PATH" -n`
- paperheight=`"$PAPERCONF_PATH" -mh | sed 's/ //g'`
-@@ -156,7 +156,7 @@ EOF
- fi
-
- # ... or use magic paper size, based on LC_PAPER
--elif [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ]
-+elif [ -n "`type -t $LOCALE_PATH`" ]
- then
- # For paper sizes we know about, specify them.
- h=$("$LOCALE_PATH" LC_PAPER 2>/dev/null | head -n 1)
-@@ -179,7 +179,7 @@ EOF
- fi
-
- # Magic encoding, based on locale
--if [ -n "`which "$LOCALE_PATH" 2>/dev/null`" ]
-+if [ -n "`type -t $LOCALE_PATH`" ]
- then
- charmap=$("$LOCALE_PATH" charmap 2>/dev/null)
-
-@@ -228,14 +228,14 @@ XMLTEX_PATH=@XMLTEX@
- PDFXMLTEX_PATH=@PDFXMLTEX@
-
- #check if we could use fop/dblatex backend as default(if not, use passivetex)
--if [ x"$USE_BACKEND" = xFOP ] && [ -z "`which "$FOP_PATH" 2>/dev/null`" ]
-+if [ x"$USE_BACKEND" = xFOP ] && [ -z "`type -t $FOP_PATH`" ]
- then
- echo >&2 "@PACKAGE@: Warning: fop not found or not executable."
- echo >&2 "@PACKAGE@: Using default backend..."
- USE_BACKEND=DEFAULT
- fi
- if [ x"$USE_BACKEND" = xDBLATEX ] && \
-- [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ]
-+ [ -z "`type -t $DBLATEX_PATH`" ]
- then
- echo >&2 "@PACKAGE@: Warning: dblatex not found or not executable."
- echo >&2 "@PACKAGE@: Using default backend..."
-@@ -330,7 +330,7 @@ while [ "$#" -gt "0" ]; do
- ;;
- --with-fop)
- ##use fop instead of passivetex where possible
-- if [ -z "`which "$FOP_PATH" 2>/dev/null`" ]
-+ if [ -z "`type -t $FOP_PATH`" ]
- then
- echo >&2 Warning: fop not found or not executable.
- echo >&2 Using default backend...
-@@ -341,7 +341,7 @@ while [ "$#" -gt "0" ]; do
- ;;
- --with-dblatex)
- ##use dblatex instead of passivetex where possible
-- if [ -z "`which "$DBLATEX_PATH" 2>/dev/null`" ]
-+ if [ -z "`type -t $DBLATEX_PATH`" ]
- then
- echo >&2 Warning: dblatex not found or not executable.
- echo >&2 Using default backend...
-@@ -490,7 +490,7 @@ cd "$XSLT_PROCESSED_DIR"
- if [ "$SKIP_VALIDATION" -eq 0 ] && [ "$SOURCE_FORMAT" != "fo" ]
- then
- #do we have xmllint validation tool?
-- if [ -z "`which "$XMLLINT_PATH" 2>/dev/null`" ]
-+ if [ -z "`type -t $XMLLINT_PATH`" ]
- then
- echo >&2 "@PACKAGE@: xmllint validation tool not found or not executable."
- echo >&2 "@PACKAGE@: Skipping validation... " \
-@@ -522,7 +522,7 @@ then
- else
-
- #do we have xsltproc tool?
-- if [ -z "`which "$XSLTPROC_PATH" 2>/dev/null`" ]
-+ if [ -z "`type -t $XSLTPROC_PATH`" ]
- then
- echo >&2 "@PACKAGE@: Can't continue, xsltproc tool not found or not executable."
- exit 3
---
-1.6.3.2
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list