Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=079f6a6baebad0de0c8f43684710567f65549a1e
commit 079f6a6baebad0de0c8f43684710567f65549a1e
Author: crazy <cr...@frugalware.org>
Date: Wed Aug 16 21:04:43 2017 +0200
docbook2x-0.8.8-3-x86_64
* fix datadir since br0ken:
utf8trans:${prefix}/share/docbook2X/charmaps/roff.charmap: No such file or
directory
* also don't try to load stuff from sf.net but from installed source
* also install /man/ pages ..
diff --git a/source/apps-extra/docbook2x/FrugalBuild
b/source/apps-extra/docbook2x/FrugalBuild
index 8c19b26..8e8d8ba 100644
--- a/source/apps-extra/docbook2x/FrugalBuild
+++ b/source/apps-extra/docbook2x/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=docbook2x
pkgver=0.8.8
-pkgrel=2
+pkgrel=3
pkgdesc="Converts DocBook documents to man and Texinfo format."
_F_sourceforge_dirname="$pkgname"
_F_sourceforge_name="docbook2X"
@@ -11,14 +11,19 @@ Finclude sourceforge
depends=('perl-xml-writer' 'perl-xml-xslt' 'perl-sgmlspm' 'perl-xml-sax'
'libxslt')
groups=('apps-extra')
archs=('x86_64')
-source=($source utf-8-default.patch)
+## utf8trans:${prefix}/share/docbook2X/charmaps/roff.charmap: No such file or
directory
+source+=(utf-8-default.patch datadir.patch)
sha1sums=('7dc34d420f8aae2a0c0cdb39f52146ce005bf902' \
- 'f84ba25cf4139005b5b5aaf1d813fd3f5d14f92b')
+ 'f84ba25cf4139005b5b5aaf1d813fd3f5d14f92b' \
+ '043c284b43cf27574a96b79543ebddce6ed8dd51')
+_Fbuild_no_patch=yes
build()
{
Fcd $_F_sourceforge_name-$pkgver
- Fsed 'doc ' '' Makefile.am
+ ## don't damn load external stuff
+ Fsed 'http://docbook2x.sf.net/latest' '/usr/share/docbook2X'
perl/db2x_xsltproc.pl
+ Fpatchall
Fautoreconf
Fbuild --with-xslt-processor=libxslt
Fmakeinstall
diff --git a/source/apps-extra/docbook2x/datadir.patch
b/source/apps-extra/docbook2x/datadir.patch
new file mode 100644
index 0000000..04d94f3
--- /dev/null
+++ b/source/apps-extra/docbook2x/datadir.patch
@@ -0,0 +1,18 @@
+Upstream patch:
+http://docbook2x.cvs.sourceforge.net/viewvc/docbook2x/docbook2X/configure.ac?r1=1.21&r2=1.22&view=patch
+
+diff -ru docbook2X-0.8.8.orig/configure.ac docbook2X-0.8.8/configure.ac
+--- docbook2X-0.8.8.orig/configure.ac 2010-06-26 04:57:04.000000000 -0430
++++ docbook2X-0.8.8/configure.ac 2010-06-26 04:57:39.000000000 -0430
+@@ -149,6 +149,11 @@
+ dnl Ensure that all static_* are fully expanded.
+
+ 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=""
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
