[102351] trunk/dports/textproc/xmlto

31 Jan 2013

Revision: 102351
          https://trac.macports.org/changeset/102351
Author:   jeremyhu@macports.org
Date:     2013-01-31 12:53:12 -0800 (Thu, 31 Jan 2013)
Log Message:
-----------
xmlto: Remove bogus local keyword (#37872)

Modified Paths:
--------------
    trunk/dports/textproc/xmlto/Portfile

Added Paths:
-----------
    trunk/dports/textproc/xmlto/files/searchpath_local.patch
    trunk/dports/textproc/xmlto/files/xml-catalog.patch

Removed Paths:
-------------
    trunk/dports/textproc/xmlto/files/patch-xmlto.in.diff

Modified: trunk/dports/textproc/xmlto/Portfile
===================================================================

--- trunk/dports/textproc/xmlto/Portfile	2013-01-31 20:06:26 UTC (rev 102350)
+++ trunk/dports/textproc/xmlto/Portfile	2013-01-31 20:53:12 UTC (rev 102351)
@@ -5,6 +5,7 @@
 
 name            xmlto
 version         0.0.25
+revision        1
 categories      textproc
 license         GPL-2+
 installs_libs   no
@@ -37,7 +38,8 @@
                 port:docbook-xsl \
                 port:fop
 
-patchfiles      patch-xmlto.in.diff
+patchfiles      searchpath_local.patch \
+                xml-catalog.patch
 
 configure.args  --mandir=${prefix}/share/man
 

Deleted: trunk/dports/textproc/xmlto/files/patch-xmlto.in.diff
===================================================================
--- trunk/dports/textproc/xmlto/files/patch-xmlto.in.diff	2013-01-31 20:06:26 UTC (rev 102350)
+++ trunk/dports/textproc/xmlto/files/patch-xmlto.in.diff	2013-01-31 20:53:12 UTC (rev 102351)
@@ -1,12 +0,0 @@
---- xmlto.in.orig	2008-05-30 07:41:31.000000000 -0600
-+++ xmlto.in	2008-10-19 19:41:28.000000000 -0600
-@@ -75,6 +75,9 @@
- # This can be over-ridden, but really we should detect the source
- # document type without needing any help.
- : ${SOURCE_FORMAT=docbook}
-+# use MacPorts' XML catalog if XML_CATALOG_FILES not set
-+: ${XML_CATALOG_FILES=${prefix}/etc/xml/catalog}
-+export XML_CATALOG_FILES
- 
- # Get absolute pathnames for FORMAT_DIR and OUTPUT_DIR.
- WD="$(pwd)"

Added: trunk/dports/textproc/xmlto/files/searchpath_local.patch
===================================================================
--- trunk/dports/textproc/xmlto/files/searchpath_local.patch	                        (rev 0)
+++ trunk/dports/textproc/xmlto/files/searchpath_local.patch	2013-01-31 20:53:12 UTC (rev 102351)
@@ -0,0 +1,11 @@
+--- xmlto.in.orig	2013-01-31 12:48:52.000000000 -0800
++++ xmlto.in	2013-01-31 12:49:03.000000000 -0800
+@@ -325,7 +325,7 @@ while [ "$#" -gt "0" ]; do
+ 	shift
+ 	;;
+   --searchpath)
+-	local oldIFS="${IFS}"
++	oldIFS="${IFS}"
+ 	IFS=":"
+ 	for asearchpath in "$2"; do
+ 	  # wrangle relative paths into absolute ones so that the user

Copied: trunk/dports/textproc/xmlto/files/xml-catalog.patch (from rev 102350, trunk/dports/textproc/xmlto/files/patch-xmlto.in.diff)
===================================================================
--- trunk/dports/textproc/xmlto/files/xml-catalog.patch	                        (rev 0)
+++ trunk/dports/textproc/xmlto/files/xml-catalog.patch	2013-01-31 20:53:12 UTC (rev 102351)
@@ -0,0 +1,12 @@
+--- xmlto.in.orig	2011-11-29 03:49:57.000000000 -0800
++++ xmlto.in	2013-01-31 12:47:51.000000000 -0800
+@@ -102,6 +102,9 @@ prefix=@prefix@
+ # This can be over-ridden, but really we should detect the source
+ # document type without needing any help.
+ : ${SOURCE_FORMAT=docbook}
++# use MacPorts' XML catalog if XML_CATALOG_FILES not set
++: ${XML_CATALOG_FILES=${prefix}/etc/xml/catalog}
++export XML_CATALOG_FILES
+ 
+ # Get absolute pathnames for FORMAT_DIR and OUTPUT_DIR.
+ WD="$(pwd)"

    

jeremyhu＠macports.org

tags

participants (1)