[csw-devel] SF.net SVN: gar:[6310] csw/mgar/pkg/xmlto/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Tue Sep 15 19:59:39 CEST 2009


Revision: 6310
          http://gar.svn.sourceforge.net/gar/?rev=6310&view=rev
Author:   bdwalton
Date:     2009-09-15 17:59:39 +0000 (Tue, 15 Sep 2009)

Log Message:
-----------
xmlto: update bash handling patch, autoconf tail and gcp selection

Modified Paths:
--------------
    csw/mgar/pkg/xmlto/trunk/Makefile
    csw/mgar/pkg/xmlto/trunk/checksums

Added 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

Removed Paths:
-------------
    csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch

Modified: csw/mgar/pkg/xmlto/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xmlto/trunk/Makefile	2009-09-15 10:19:44 UTC (rev 6309)
+++ csw/mgar/pkg/xmlto/trunk/Makefile	2009-09-15 17:59:39 UTC (rev 6310)
@@ -3,7 +3,7 @@
 CATEGORIES = utils
 
 PREREQUISITE_PKGS += CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt
-PREREQUISITE_PKGS += CSWflex CSWggetopt CSWgnulinks
+PREREQUISITE_PKGS += CSWflex CSWggetopt
 
 REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds
 REQUIRED_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m CSWmktemp
@@ -19,7 +19,9 @@
 MASTER_SITES = https://fedorahosted.org/releases/x/m/$(GARNAME)/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 
-PATCHFILES = no-hardcode-bash.patch
+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
 
 TEST_TARGET = check
 
@@ -36,18 +38,17 @@
 	@$(MAKECOOKIE)
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += BASH=/opt/csw/bin/bash
 CONFIGURE_ARGS += GETOPT=/opt/csw/bin/ggetopt
-CONFIGURE_ARGS += BASH=/opt/csw/bin/bash
 CONFIGURE_ARGS += FIND=/opt/csw/bin/gfind
+CONFIGURE_ARGS += TAIL=/usr/xpg4/bin/tail
+CONFIGURE_ARGS += GCP=/opt/csw/bin/gcp
 CONFIGURE_ARGS += MKTEMP=/opt/csw/bin/mktemp
 
 sysconfdir = /etc/opt/csw
 
 include gar/category.mk
 
-# We need this for 'tail -n'
-PATH := /opt/csw/gnu:/usr/xpg4/bin:/opt/csw/bin:$(PATH)
-
 #reset XML_CATALOG lookup (we rely on having packages that provide stylesheets
 #etc).  Having xsltproc not find them during build makes us blow up!!
 XML_CATALOG_FILES = /etc/opt/csw/xml/catalog

Modified: csw/mgar/pkg/xmlto/trunk/checksums
===================================================================
--- csw/mgar/pkg/xmlto/trunk/checksums	2009-09-15 10:19:44 UTC (rev 6309)
+++ csw/mgar/pkg/xmlto/trunk/checksums	2009-09-15 17:59:39 UTC (rev 6310)
@@ -1,2 +1,4 @@
-a39f8b6fdb2219dca513145a4fca63ac  download/no-hardcode-bash.patch
+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
 12f297dc7051e4fef08339980f88a1dd  download/xmlto-0.0.22.tar.bz2

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/xmlto/trunk/files/0001-add-support-for-selection-of-posix-tail-binary.patch	2009-09-15 17:59:39 UTC (rev 6310)
@@ -0,0 +1,48 @@
+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
+

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/xmlto/trunk/files/0002-add-handling-so-that-gnu-cp-can-be-specified.patch	2009-09-15 17:59:39 UTC (rev 6310)
@@ -0,0 +1,191 @@
+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
+

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/xmlto/trunk/files/0003-do-no-hardcode-bin-bash-to-override-env-check.patch	2009-09-15 17:59:39 UTC (rev 6310)
@@ -0,0 +1,24 @@
+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/no-hardcode-bash.patch
===================================================================
--- csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch	2009-09-15 10:19:44 UTC (rev 6309)
+++ csw/mgar/pkg/xmlto/trunk/files/no-hardcode-bash.patch	2009-09-15 17:59:39 UTC (rev 6310)
@@ -1,14 +0,0 @@
-diff --speed-large-files --minimal -Nru xmlto-0.0.22.orig/configure.in xmlto-0.0.22/configure.in
---- xmlto-0.0.22.orig/configure.in	2009-03-25 14:48:02.000000000 +0100
-+++ xmlto-0.0.22/configure.in	2009-09-09 02:43:47.431319471 +0200
-@@ -18,9 +18,8 @@
- 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])
-+AC_PATH_PROG([BASH], [bash],, [bash])
- 
- AC_ARG_VAR([GETOPT], [Name of the `getopt' program (requires longopt support).])
- AC_CHECK_PROG([GETOPT], [getopt],, [getopt])


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