[csw-devel] SF.net SVN: gar:[10570] csw/mgar/pkg/asciidoc/trunk

[bdwalton at users.sourceforge.net]

Revision: 10570
          http://gar.svn.sourceforge.net/gar/?rev=10570&view=rev
Author:   bdwalton
Date:     2010-07-23 00:18:15 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
asciidoc: update patch (strip out some junk included in the last one)

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

Added Paths:
-----------
    csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch

Removed Paths:
-------------
    csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch

Modified: csw/mgar/pkg/asciidoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/Makefile	2010-07-23 00:11:28 UTC (rev 10569)
+++ csw/mgar/pkg/asciidoc/trunk/Makefile	2010-07-23 00:18:15 UTC (rev 10570)
@@ -25,7 +25,7 @@
 DISTFILES += $(AUTOFILES)
 
 PATCHFILES = handle-csw-etc-paths.patch
-PATCHFILES += add-csw-gnu-path-to-a2x.patch
+PATCHFILES += 0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67797

Modified: csw/mgar/pkg/asciidoc/trunk/checksums
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/checksums	2010-07-23 00:11:28 UTC (rev 10569)
+++ csw/mgar/pkg/asciidoc/trunk/checksums	2010-07-23 00:18:15 UTC (rev 10570)
@@ -1,3 +1,3 @@
-0f4502395f72632388628d3720bdfd42  add-csw-gnu-path-to-a2x.patch
+2eb00364bbc7660438507e630d5a5ac9  0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch
 7377872275c2a575151655b19ac6dd3e  asciidoc-8.5.3.tar.gz
 ec48eeea1eafdaa7e507bc11327f6eae  handle-csw-etc-paths.patch

Added: csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch	                        (rev 0)
+++ csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch	2010-07-23 00:18:15 UTC (rev 10570)
@@ -0,0 +1,30 @@
+From 5f2985d65ac801a12e44f0054543a476dc783f97 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Fri, 23 Jul 2010 02:14:34 +0200
+Subject: [PATCH] Add /opt/csw/{gnu,bin} to PATH in a2x.py
+
+This allows us to leverage the gnu tools which is what the app was
+written against.  It prevents blowups when non-gnu tools get gnu
+options passed.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ a2x.py |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/a2x.py b/a2x.py
+index 186ccdf..d117086 100755
+--- a/a2x.py
++++ b/a2x.py
+@@ -63,6 +63,8 @@ XSLTPROC_OPTS = ''
+ 
+ OPTIONS = None  # These functions read verbose and dry_run command options.
+ 
++os.environ["PATH"] = "/opt/csw/gnu:/opt/csw/bin:" + os.environ["PATH"]
++
+ def errmsg(msg):
+     sys.stderr.write('%s: %s\n' % (PROG,msg))
+ 
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch	2010-07-23 00:11:28 UTC (rev 10569)
+++ csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch	2010-07-23 00:18:15 UTC (rev 10570)
@@ -1,12 +0,0 @@
-diff -ru asciidoc-8.5.2.orig/a2x.py asciidoc-8.5.2/a2x.py
---- asciidoc-8.5.2.orig/a2x.py	2010-01-06 01:42:35.549886234 +0100
-+++ asciidoc-8.5.2/a2x.py	2010-01-06 01:53:47.076069410 +0100
-@@ -57,6 +57,8 @@
- 
- OPTIONS = None  # These functions read verbose and dry_run command options.
- 
-+os.environ["PATH"] = "/opt/csw/gnu:/opt/csw/bin:" + os.environ["PATH"]
-+
- def errmsg(msg):
-     sys.stderr.write('%s: %s\n' % (PROG,msg))
- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.