[arch-commits] Commit in docbook2x/repos/community-x86_64 (4 files)

[Andreas Radke]

    Date: Thursday, April 1, 2021 @ 13:57:34
  Author: andyrtr
Revision: 910814

archrelease: copy trunk to community-x86_64

Added:
  docbook2x/repos/community-x86_64/PKGBUILD
    (from rev 910813, docbook2x/trunk/PKGBUILD)
  docbook2x/repos/community-x86_64/datadir.diff
    (from rev 910813, docbook2x/trunk/datadir.diff)
Deleted:
  docbook2x/repos/community-x86_64/PKGBUILD
  docbook2x/repos/community-x86_64/datadir.diff

--------------+
 PKGBUILD     |   83 ++++++++++++++++++++++++++++-----------------------------
 datadir.diff |   36 ++++++++++++------------
 2 files changed, 60 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-01 13:57:28 UTC (rev 910813)
+++ PKGBUILD	2021-04-01 13:57:34 UTC (rev 910814)
@@ -1,41 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
-
-pkgname=docbook2x
-pkgver=0.8.8
-pkgrel=17
-pkgdesc="A software package that converts DocBook documents into the traditional Unix man page format and the GNU Texinfo format."
-arch=('x86_64')
-url="http://docbook2x.sourceforge.net"
-license=("MIT")
-depends=('glibc' 'perl-sgmls' 'perl-xml-parser' 'perl-xml-sax' 'libxslt'
-	 'jade' 'perl-xml-sax-expat')
-makedepends=('texinfo')
-source=(https://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
-        datadir.diff)
-md5sums=('b9b76a6af198c4f44574cfd17a322f01'
-         '826fae88a435d9278c4f9614991d55a1')
-
-prepare() {
-  cd "$srcdir"/docbook2X-$pkgver
-  patch -p1 <"$srcdir"/datadir.diff
-  sed -e 's/AM_CONFIG_HEADER(/AC_CONFIG_HEADERS(/' -i configure.ac
-}
-
-build()  {
-  cd "$srcdir"/docbook2X-$pkgver
-  autoreconf -i -f
-  ./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --program-transform-name 's,2x-,2,' \
-  make
-}
-
-package() {
-  cd "$srcdir"/docbook2X-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m0644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/license
-  sed -i 's|http://docbook2x.sf.net/latest|/usr/share/docbook2X|g' \
-    "$pkgdir"/usr/bin/db2x_xsltproc
-}

Copied: docbook2x/repos/community-x86_64/PKGBUILD (from rev 910813, docbook2x/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-04-01 13:57:34 UTC (rev 910814)
@@ -0,0 +1,42 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+
+pkgname=docbook2x
+pkgver=0.8.8
+pkgrel=18
+pkgdesc="A software package that converts DocBook documents into the traditional Unix man page format and the GNU Texinfo format."
+arch=('x86_64')
+url="http://docbook2x.sourceforge.net"
+license=("MIT")
+depends=('glibc' 'perl-sgmls' 'perl-xml-parser' 'perl-xml-sax' 'libxslt'
+	 'jade' 'perl-xml-sax-expat')
+makedepends=('texinfo')
+source=(https://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
+        datadir.diff)
+md5sums=('b9b76a6af198c4f44574cfd17a322f01'
+         '826fae88a435d9278c4f9614991d55a1')
+
+prepare() {
+  cd "$srcdir"/docbook2X-$pkgver
+  patch -p1 <"$srcdir"/datadir.diff
+  sed -e 's/AM_CONFIG_HEADER(/AC_CONFIG_HEADERS(/' -i configure.ac
+  autoreconf -vfi
+}
+
+build()  {
+  cd docbook2X-$pkgver
+  # to avoid file conflicts with docbook2* from docbook-utils
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --program-transform-name 's,docbook2,db2x_docbook2,'
+  make
+}
+
+package() {
+  cd docbook2X-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -D -m0644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/license
+  sed -i 's|http://docbook2x.sf.net/latest|/usr/share/docbook2X|g' \
+    "$pkgdir"/usr/bin/db2x_xsltproc
+}

Deleted: datadir.diff
===================================================================
--- datadir.diff	2021-04-01 13:57:28 UTC (rev 910813)
+++ datadir.diff	2021-04-01 13:57:34 UTC (rev 910814)
@@ -1,18 +0,0 @@
-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=""

Copied: docbook2x/repos/community-x86_64/datadir.diff (from rev 910813, docbook2x/trunk/datadir.diff)
===================================================================
--- datadir.diff	                        (rev 0)
+++ datadir.diff	2021-04-01 13:57:34 UTC (rev 910814)
@@ -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=""