From fcef2ba09082de77818d19d7f566eb4c95b571ab Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Mon, 5 Jan 2009 01:11:08 +0200
Subject: [PATCH] asciidoc: Updated (8.2.5 -> 8.3.3)

---
 textproc/asciidoc/asciidoc.conf            | 33 ++-----------
 textproc/asciidoc/asciidoc.desc            |  6 +--
 textproc/asciidoc/hotfix-undefined_b.patch | 54 ----------------------
 3 files changed, 7 insertions(+), 86 deletions(-)
 delete mode 100644 textproc/asciidoc/hotfix-undefined_b.patch

diff --git a/textproc/asciidoc/asciidoc.conf b/textproc/asciidoc/asciidoc.conf
index 56be26aab..9c98e169d 100644
--- a/textproc/asciidoc/asciidoc.conf
+++ b/textproc/asciidoc/asciidoc.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../asciidoc/asciidoc.conf
-# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2007 - 2009 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -12,35 +12,10 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-makeopt=
-makeinstopt=
-
-sysconfdir=$sysconfdir/asciidoc
-
-vim_confdir=
 if pkginstalled vim; then
 	pkgprefix -t vim
 	vim_ver=$(pkgprefix ver vim | cut -d. -f'1,2' | tr -d '.' )
-	vim_confdir=$root$(pkgprefix datadir vim)/vim/vim$vim_ver
-fi
-
-hook_add preconf 5 'asciidoc_prepare'
-asciidoc_prepare() {
-	sed -i	-e "s,^BINDIR=.*,BINDIR=$root$bindir," \
-		-e "s,^MANDIR=.*,MANDIR=$root$mandir," \
-		-e "s,^CONFDIR=.*,CONFDIR=$root$sysconfdir," \
-		-e "s,^VIM_CONFDIR=.*,VIM_CONFDIR=$vim_confdir," \
-		install.sh
-}
-
-hook_add postmake 5 './install.sh'
-
-hook_add postmake 7 'asciidoc_doc'
-asciidoc_doc() {
-	cp -av examples doc $root$docdir
-
-	rm $root$docdir/doc/{images,docbook-xsl.css}
-	ln -snf $sysconfdir/images $root$docdir/doc
-	ln -snf $sysconfdir/docbook-xsl.css $root$docdir/doc
-}
+	vim_confdir=$(pkgprefix datadir vim)/vim/vim$vim_ver
 
+	var_append makeinstopt ' ' "vimdir=$vim_confdir"
+fi
diff --git a/textproc/asciidoc/asciidoc.desc b/textproc/asciidoc/asciidoc.desc
index e8f9a4d14..9b7e00a54 100644
--- a/textproc/asciidoc/asciidoc.desc
+++ b/textproc/asciidoc/asciidoc.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../asciidoc/asciidoc.desc
-[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
 [COPY] Copyright (C) 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -32,7 +32,7 @@
 [L] GPL
 
 [S] Stable
-[V] 8.2.5
+[V] 8.3.3
 [P] X -----5---9 160.900
 
-[D] 1690634935 asciidoc-8.2.5.tar.gz http://www.methods.co.nz/asciidoc/
+[D] 964950033 asciidoc-8.3.3.tar.gz http://www.methods.co.nz/asciidoc/
diff --git a/textproc/asciidoc/hotfix-undefined_b.patch b/textproc/asciidoc/hotfix-undefined_b.patch
deleted file mode 100644
index 72171ff9e..000000000
--- a/textproc/asciidoc/hotfix-undefined_b.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../asciidoc/hotfix-undefined_b.patch
-# Copyright (C) 2007 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-Taken from http://hg.sharesource.org/asciidoc/raw-rev/8b6d11203ed3
-
-# HG changeset patch
-# User Stuart Rackham <srackham@methods.co.nz>
-# Date 1197344594 -46800
-# Node ID 8b6d11203ed3729ed597fc7ca876bde205d271a1
-# Parent 386e75a49a1ae3437581fae97a5d5c27c82ba5fb
-b variable used before assignment
-
-An error is generated using the asciidoc -e option when
-there are no block definitions.
-
-Patch submitted by Alejandro Mery
-
---- a/asciidoc.py	Tue Dec 11 11:10:45 2007 +1300
-+++ b/asciidoc.py	Tue Dec 11 16:43:14 2007 +1300
-@@ -2061,16 +2061,13 @@ class AbstractBlocks:
-     def validate(self):
-         '''Validate the block definitions.'''
-         # Validate delimiters and build combined lists delimiter pattern.
-+        delimiters = []
-         for b in self.blocks:
-             assert b.__class__ is self.BLOCK_TYPE
-             b.validate()
--        if b.is_conf_entry('delimiter'):
--            delimiters = []
--            for b in self.blocks:
--                b.validate()
--                if b.delimiter:
--                    delimiters.append(b.delimiter)
--            self.delimiter = join_regexp(delimiters)
-+            if b.delimiter:
-+                delimiters.append(b.delimiter)
-+        self.delimiter = join_regexp(delimiters)
- 
- class Paragraph(AbstractBlock):
-     def __init__(self):
-