SF.net SVN: gar:[24351] csw/mgar/pkg/asciidoc/trunk

[dmichelsen at users.sourceforge.net]

Revision: 24351
          http://sourceforge.net/p/gar/code/24351
Author:   dmichelsen
Date:     2014-11-15 10:21:31 +0000 (Sat, 15 Nov 2014)
Log Message:
-----------
asciidoc/trunk: Update to 8.6.9, forward-port patches

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

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

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

Modified: csw/mgar/pkg/asciidoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/Makefile	2014-11-15 00:28:45 UTC (rev 24350)
+++ csw/mgar/pkg/asciidoc/trunk/Makefile	2014-11-15 10:21:31 UTC (rev 24351)
@@ -1,6 +1,5 @@
 NAME = asciidoc
-VERSION = 8.6.6
-GARTYPE = v2
+VERSION = 8.6.9
 
 DESCRIPTION = A Documentation Generator
 define BLURB
@@ -13,30 +12,20 @@
 	SGML/XML markup) can be customized and extended by the user.
 endef
 
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES += $(NAME)-$(VERSION).tar.gz
+
+PATCHFILES += 0001-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch
+
 PACKAGES = CSWasciidoc
-CATALOGNAME_CSWasciidoc = asciidoc
-
 ARCHALL_CSWasciidoc = 1
+RUNTIME_DEP_PKGS_CSWasciidoc += CSWpython
+RUNTIME_DEP_PKGS_CSWasciidoc += CSWggetopt
+# This can not be detected by checkpkg
+CHECKPKG_OVERRIDES_CSWasciidoc += surplus-dependency|CSWpython
+CHECKPKG_OVERRIDES_CSWasciidoc += surplus-dependency|CSWggetopt
 
-RUNTIME_DEP_PKGS_CSWasciidoc = CSWpython CSWggetopt
-
-MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += $(AUTOFILES)
-
-PATCHFILES = handle-csw-etc-paths.patch
-PATCHFILES += 0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch
-
 TEST_TARGET = test
 
-INSTALL_ARGS = vimdir=/opt/csw/etc/vim
-
-CHECKPKG_OVERRIDES_CSWasciidoc += surplus-dependency|CSWggetopt
-
 include gar/category.mk
 
-# until the autoconf stuff is included upstream, we'll maintain and import our
-# own.
-pre-configure-modulated:
-	( cd $(WORKSRC); autoconf )
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/asciidoc/trunk/checksums
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/checksums	2014-11-15 00:28:45 UTC (rev 24350)
+++ csw/mgar/pkg/asciidoc/trunk/checksums	2014-11-15 10:21:31 UTC (rev 24351)
@@ -1 +1 @@
-44b872d9c300ffa5a8fe8b3c4d10957c  asciidoc-8.6.6.tar.gz
+c59018f105be8d022714b826b0be130a  asciidoc-8.6.9.tar.gz

Copied: csw/mgar/pkg/asciidoc/trunk/files/0001-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch (from rev 23923, csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch)
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/files/0001-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch	                        (rev 0)
+++ csw/mgar/pkg/asciidoc/trunk/files/0001-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch	2014-11-15 10:21:31 UTC (rev 24351)
@@ -0,0 +1,28 @@
+From 13342b50a2def0dbb346de9505b1a9a24b753d5b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 15 Nov 2014 10:53:34 +0100
+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.
+---
+ a2x.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/a2x.py b/a2x.py
+index c30e15b..4221742 100755
+--- a/a2x.py
++++ b/a2x.py
+@@ -66,6 +66,8 @@ BACKEND_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))
+ 
+-- 
+2.0.3
+

Deleted: 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	2014-11-15 00:28:45 UTC (rev 24350)
+++ csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch	2014-11-15 10:21:31 UTC (rev 24351)
@@ -1,30 +0,0 @@
-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
-

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