Date: Monday, August 31, 2020 @ 18:09:37 Author: andyrtr Revision: 395022
archrelease: copy trunk to extra-any Added: docbook-utils/repos/extra-any/PKGBUILD (from rev 395021, docbook-utils/trunk/PKGBUILD) docbook-utils/repos/extra-any/db2html (from rev 395021, docbook-utils/trunk/db2html) docbook-utils/repos/extra-any/docbook-utils-0.6.14-grep_fix-1.patch (from rev 395021, docbook-utils/trunk/docbook-utils-0.6.14-grep_fix-1.patch) Deleted: docbook-utils/repos/extra-any/PKGBUILD docbook-utils/repos/extra-any/docbook-utils-0.6.14-grep_fix-1.patch ---------------------------------------+ PKGBUILD | 99 +++++++++++++++++--------------- db2html | 59 +++++++++++++++++++ docbook-utils-0.6.14-grep_fix-1.patch | 66 ++++++++++----------- 3 files changed, 145 insertions(+), 79 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-08-31 18:09:26 UTC (rev 395021) +++ PKGBUILD 2020-08-31 18:09:37 UTC (rev 395022) @@ -1,46 +0,0 @@ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -# Contributor: Chris Severance aur.severach aATt spamgourmet dott com -# Contributor: Andreas B. Wagner <andreasbwag...@pointfree.net> -# Contributor: Suat SARIALP <muhendis.s...@gmail.com> - -pkgname=docbook-utils -pkgver=0.6.14 -pkgrel=10 -pkgdesc='Shell scripts to manage DocBook documents' -arch=('any') -url="https://www.sourceware.org/docbook-tools/" -license=('GPL2') -depends=('openjade' 'docbook-dsssl' 'docbook-sgml31') -makedepends=('perl-sgmls') -optdepends=('perl-sgmls: for conversion to man and texinfo' - 'lynx: for conversion to txt' - 'texlive-htmlxml: for conversion to pdf') -conflicts=('docbook2x') -source=(ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${pkgname}-${pkgver}.tar.gz - docbook-utils-0.6.14-grep_fix-1.patch) -sha256sums=('48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9' - 'ddf0ddca0a540fd4f34f38b7b9090f96746e37da12b4e2bf8f4174c5ad61f54a') - -prepare() { - cd "${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}"/docbook-utils-0.6.14-grep_fix-1.patch -} - -build() { - cd "${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man - make -} - -package() { - cd "${pkgname}-${pkgver}" - make install DESTDIR="${pkgdir}" htmldir="/usr/share/doc/${pkgname}/html" - - #common alternative names - for doctype in 'html' 'ps' 'dvi' 'man' 'pdf' 'rtf' 'tex' 'texi' 'txt'; do - ln -svf "docbook2${doctype}" "${pkgdir}/usr/bin/db2${doctype}" - done -} Copied: docbook-utils/repos/extra-any/PKGBUILD (from rev 395021, docbook-utils/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-08-31 18:09:37 UTC (rev 395022) @@ -0,0 +1,53 @@ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +# Contributor: Chris Severance aur.severach aATt spamgourmet dott com +# Contributor: Andreas B. Wagner <andreasbwag...@pointfree.net> +# Contributor: Suat SARIALP <muhendis.s...@gmail.com> + +pkgname=docbook-utils +pkgver=0.6.14 +pkgrel=11 +pkgdesc='Shell scripts to manage DocBook documents' +arch=('any') +url="https://www.sourceware.org/docbook-tools/" +license=('GPL2') +depends=('openjade' 'docbook-dsssl' 'docbook-sgml31') +makedepends=('perl-sgmls') +optdepends=('perl-sgmls: for conversion to man and texinfo' + 'lynx: for conversion to txt' + 'texlive-htmlxml: for conversion to pdf') +conflicts=('docbook2x') +source=(ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${pkgname}-${pkgver}.tar.gz + db2html # script taken from Fedora + docbook-utils-0.6.14-grep_fix-1.patch) +sha256sums=('48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9' + '10b9c29ad659cce5036871a6e85598fd33cc52c0c38cf059eeb485382a5d90d7' + 'ddf0ddca0a540fd4f34f38b7b9090f96746e37da12b4e2bf8f4174c5ad61f54a') + +prepare() { + cd "${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}"/docbook-utils-0.6.14-grep_fix-1.patch +} + +build() { + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man + make +} + +package() { + cd "${pkgname}-${pkgver}" + make install DESTDIR="${pkgdir}" htmldir="/usr/share/doc/${pkgname}/html" + + #common alternative names + for doctype in 'html' 'ps' 'dvi' 'man' 'pdf' 'rtf' 'tex' 'texi' 'txt'; do + ln -sv "docbook2${doctype}" "${pkgdir}/usr/bin/db2${doctype}" + ln -sv "jw.1" "${pkgdir}/usr/share/man/man1/db2${doctype}" + done + + # db2html is not just a symlink, as it has to create the output directory - FS#67758 + rm "${pkgdir}/usr/bin/db2html" + install -p -m 755 ../db2html "${pkgdir}/usr/bin/db2html" +} Copied: docbook-utils/repos/extra-any/db2html (from rev 395021, docbook-utils/trunk/db2html) =================================================================== --- db2html (rev 0) +++ db2html 2020-08-31 18:09:37 UTC (rev 395022) @@ -0,0 +1,59 @@ +#! /bin/sh + +ADMON_GRAPHICS=/usr/share/sgml/docbook/dsssl-stylesheets/images/*.gif + +output=docbook2html-dir +skip=0 +dbdircleanup=1 +outputdone=0 +for arg in "$@" +do + if [ $skip -gt 0 ] + then + skip=$(($skip - 1)) + continue + fi + case $arg in + -h|--help|-v|--version) break + ;; + -n|--nostd|-u|--nochunks) ;; + -o|--output) outputdone=1 + ;; + + -*) skip=1 + ;; + *) dbdircleanup=0 + if [ ${outputdone} -eq 1 ]; + then + output="$(echo $arg | sed 's,\.sgml$,,;s,\.sgm$,,;s,\.xml,,')" + outputfile="$basename "$output"" + outputdone=2 + elif [ ${outputdone} -eq 2 ]; + then + outputfile="$(echo $arg | sed 's,\.sgml$,,;s,\.sgm$,,;s,\.xml,,' | \ + rev | cut -d'/' -f1 | rev)" + else + output="$(echo $arg | sed 's,\.sgml$,,;s,\.sgm$,,;s,\.xml,,')" + outputfile=$(basename "$output") + fi + ;; + esac +done + +if [ ${dbdircleanup} -eq 0 ]; +then + echo "Output is $output/$outputfile.html" +fi +if [ -d ${output} ] +then + rm -rf ${output}.junk + mv ${output} ${output}.junk +fi +mkdir ${output} +mkdir ${output}/stylesheet-images +cp ${ADMON_GRAPHICS} ${output}/stylesheet-images +jw -f docbook -b html -o ${output} "$@" +if [ ${dbdircleanup} -eq 1 ]; +then + rm -rf ${output} +fi Deleted: docbook-utils-0.6.14-grep_fix-1.patch =================================================================== --- docbook-utils-0.6.14-grep_fix-1.patch 2020-08-31 18:09:26 UTC (rev 395021) +++ docbook-utils-0.6.14-grep_fix-1.patch 2020-08-31 18:09:37 UTC (rev 395022) @@ -1,33 +0,0 @@ -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> -Date: 2011-01-01 -Initial Package Version: 0.6.14 -Upstream Status: unknown -Origin: fedora -Description: Grep-2.7 errors out on the 'space' syntax, causing -docbook2html to fail. Fixed up by hand (the fedora version depends -on a different patch which adds --color=never). - -diff -Naur docbook-utils-0.6.14.orig/bin/jw.in docbook-utils-0.6.14//bin/jw.in ---- docbook-utils-0.6.14.orig/bin/jw.in 2003-04-30 17:21:49.000000000 +0100 -+++ docbook-utils-0.6.14//bin/jw.in 2011-01-01 18:43:21.558959786 +0000 -@@ -80,9 +80,9 @@ - SGML_CATALOGS_DIR="/etc/sgml" - if [ -f "$SGML_CONF" ] - then -- RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*' -+ RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*' - SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` -- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*' -+ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*' - SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` - fi - -@@ -312,7 +312,7 @@ - SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG - else - SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog` -- SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :` -+ SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [[:space:]] :` - fi - ;; - no) SGML_CATALOG_FILES="" Copied: docbook-utils/repos/extra-any/docbook-utils-0.6.14-grep_fix-1.patch (from rev 395021, docbook-utils/trunk/docbook-utils-0.6.14-grep_fix-1.patch) =================================================================== --- docbook-utils-0.6.14-grep_fix-1.patch (rev 0) +++ docbook-utils-0.6.14-grep_fix-1.patch 2020-08-31 18:09:37 UTC (rev 395022) @@ -0,0 +1,33 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2011-01-01 +Initial Package Version: 0.6.14 +Upstream Status: unknown +Origin: fedora +Description: Grep-2.7 errors out on the 'space' syntax, causing +docbook2html to fail. Fixed up by hand (the fedora version depends +on a different patch which adds --color=never). + +diff -Naur docbook-utils-0.6.14.orig/bin/jw.in docbook-utils-0.6.14//bin/jw.in +--- docbook-utils-0.6.14.orig/bin/jw.in 2003-04-30 17:21:49.000000000 +0100 ++++ docbook-utils-0.6.14//bin/jw.in 2011-01-01 18:43:21.558959786 +0000 +@@ -80,9 +80,9 @@ + SGML_CATALOGS_DIR="/etc/sgml" + if [ -f "$SGML_CONF" ] + then +- RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*' + SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` +- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*' + SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` + fi + +@@ -312,7 +312,7 @@ + SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG + else + SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog` +- SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :` ++ SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [[:space:]] :` + fi + ;; + no) SGML_CATALOG_FILES=""