From f757be6cc8936ad483dc4cec386171a886275e68 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 13 Jan 2019 19:39:33 +0000
Subject: user/docbook2x: apply autoconf patch

---
 user/docbook2x/APKBUILD       |  2 ++
 user/docbook2x/autoconf.patch | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 user/docbook2x/autoconf.patch

(limited to 'user/docbook2x')

diff --git a/user/docbook2x/APKBUILD b/user/docbook2x/APKBUILD
index edd43eb3c..463e60300 100644
--- a/user/docbook2x/APKBUILD
+++ b/user/docbook2x/APKBUILD
@@ -11,6 +11,7 @@ depends="docbook-xml docbook-xsl libxml2-utils libxslt perl-xml-sax"
 makedepends="$depends_dev"
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/docbook2x/docbook2X-$pkgver.tar.gz
+	autoconf.patch
 	doc-typo.patch
 	manpage-comments.patch
 	refentry-whitespace.patch
@@ -42,6 +43,7 @@ package() {
 }
 
 sha512sums="cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c  docbook2X-0.8.8.tar.gz
+eec73ea9e5b626dbc7d0107226ea15dd1b84194f83d97bd93b52d61acc6e03e7d683c6b52d3bd191a995db034dd09044005a18b565b9f55fe5ec2824eec0b639  autoconf.patch
 a563b46e7eaa8052dc2daea6ad8b0f3b12780ef063fafd37a6345ae663f6229ccb0b52be5e7b1fd6584d31e56de89af391efb856bbabfed164353578b39fb458  doc-typo.patch
 f204384bb206324d813b36e4e87e6a96f8b5808bfb3d7396505c84efc6784d4950a87533a3be1c67fce5f7b1d2f76eee8cf57f3ae48e3df43cf0cdc6531fbe14  manpage-comments.patch
 10ce7f7da9bb2e05701a38d9e6900e87e62043604736eef5dbb52d8b143c8693463cffacf24453ec3d1e057b0b243d1c53952247f412e6f036c7067ad5840c1f  refentry-whitespace.patch
diff --git a/user/docbook2x/autoconf.patch b/user/docbook2x/autoconf.patch
new file mode 100644
index 000000000..f4a471d67
--- /dev/null
+++ b/user/docbook2x/autoconf.patch
@@ -0,0 +1,30 @@
+The evaluation of datadir results in "${prefix}/share" without
+evaluation of the ${prefix} variable with autoconf 2.60.
+
+Index: docbook2X-0.8.8/configure.ac
+===================================================================
+--- docbook2X-0.8.8.orig/configure.ac
++++ docbook2X-0.8.8/configure.ac
+@@ -148,7 +148,7 @@
+ dnl they will reside and should use these static_* values.
+ dnl Ensure that all static_* are fully expanded.
+ 
+-eval static_datadir="$datadir"
++eval eval static_datadir="$datadir"
+ 
+ eval static_bindir="$bindir"
+ old_val=""
+--- docbook2X-0.8.8/configure.old	2007-03-03 13:45:28.000000000 +0000
++++ docbook2X-0.8.8/configure	2019-01-13 19:36:53.820000000 +0000
+@@ -5266,6 +5266,11 @@
+ 
+ 
+ eval static_datadir="$datadir"
++old_val=""
++until test "$static_datadir" = "$old_val"; do
++	old_val="$static_datadir"
++	eval static_datadir="$static_datadir"
++done
+ 
+ eval static_bindir="$bindir"
+ old_val=""
-- 
cgit v1.2.3-70-g09d2