Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=be84022facb1b291f44bd0d0b156c8487b6e2431

commit be84022facb1b291f44bd0d0b156c8487b6e2431
Author: Baste <[email protected]>
Date:   Thu Nov 7 09:35:08 2013 +0100

docbook-xsl-1.78.1-1-x86_64
* Version bump
* Use most often by makedepends

diff --git a/source/apps/docbook-xsl/FrugalBuild 
b/source/apps/docbook-xsl/FrugalBuild
index 2971054..07bf942 100644
--- a/source/apps/docbook-xsl/FrugalBuild
+++ b/source/apps/docbook-xsl/FrugalBuild
@@ -1,27 +1,31 @@
# Compiling Time: 0.01 SBU
# Maintainer: Christian Hamar alias krix <[email protected]>

+options+=('asneeded')
+
pkgname=docbook-xsl
-pkgver=1.76.1
+pkgver=1.78.1
pkgrel=1
pkgdesc="XML stylesheets for Docbook-xml transformations."
-rodepends=('docbook-xml' 'libxslt' 'sed')
-depends=()
+depends=('docbook-xml' 'libxslt')
+rodepends=('sed')
groups=('apps')
archs=('i686' 'x86_64' 'arm')
_F_sourceforge_dirname="docbook"
+_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
-sha1sums=('f19ea1991c607d0442e5502b4fb67dc882744721')
+sha1sums=('1d668c845bb43c65115d1a1d9542f623801cfb6f')

build() {
-       local installdir="/usr/share/xml/docbook/xsl-stylesheets"
-       Fcd
-       Fmkdir "$installdir"
-       for fn in VERSION common extensions fo html htmlhelp images javahelp 
lib \
-               manpages params profiling template tools xhtml xhtml-1_1
-       do
-               Fcprel $fn "$installdir"
-       done
+        local installdir="/usr/share/xml/docbook/xsl-stylesheets"
+        Fcd
+        Fmkdir "$installdir"
+        for fn in VERSION.xsl assembly common eclipse epub epub3 fo 
highlighting \
+                  html htmlhelp javahelp lib manpages params profiling 
roundtrip \
+                  template website xhtml xhtml-1_1 xhtml5
+        do
+                Fcprel $fn "$installdir"
+        done
+        Fmkdir /etc/xml
}

-# optimization OK
diff --git a/source/apps/docbook-xsl/docbook-xsl.install 
b/source/apps/docbook-xsl/docbook-xsl.install
index 8c2aba5..baaccba 100644
--- a/source/apps/docbook-xsl/docbook-xsl.install
+++ b/source/apps/docbook-xsl/docbook-xsl.install
@@ -1,55 +1,39 @@
-
-DOCBOOKDIR=/usr/share/xml/docbook/xsl-stylesheets
-
-post_install()
-{
-       _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
-
-       xmlcatalog --noout --add "rewriteSystem" \
-               "http://docbook.sourceforge.net/release/xsl/$_NEW"; \
-               "file://${DOCBOOKDIR}" /etc/xml/catalog
-       xmlcatalog --noout --add "rewriteURI" \
-               "http://docbook.sourceforge.net/release/xsl/$_NEW"; \
-               "file://${DOCBOOKDIR}" /etc/xml/catalog
-       xmlcatalog --noout --add "rewriteSystem" \
-               "http://docbook.sourceforge.net/release/xsl/current"; \
-               "file://${DOCBOOKDIR}" /etc/xml/catalog
-       xmlcatalog --noout --add "rewriteURI" \
-               "http://docbook.sourceforge.net/release/xsl/current"; \
-               "file://${DOCBOOKDIR}" /etc/xml/catalog
-       xmlcatalog --noout --add "delegateSystem" \
-               "http://docbook.sourceforge.net/release/xsl/"; \
-               "file:///etc/xml/docbook" /etc/xml/catalog &&
-       xmlcatalog --noout --add "delegateURI" \
-                "http://docbook.sourceforge.net/release/xsl/"; \
-                "file:///etc/xml/docbook" /etc/xml/catalog
+post_install() {
+        if [ ! -f /etc/xml/catalog ]; then
+                xmlcatalog --noout --create /etc/xml/catalog
+        fi
+        _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
+
+        xmlcatalog --noout --add "rewriteSystem" \
+                "http://docbook.sourceforge.net/release/xsl/${_NEW}"; \
+                "/usr/share/xml/docbook/xsl-stylesheets" \
+                /etc/xml/catalog
+
+        xmlcatalog --noout --add "rewriteURI" \
+                "http://docbook.sourceforge.net/release/xsl/${_NEW}"; \
+                "/usr/share/xml/docbook/xsl-stylesheets" \
+                /etc/xml/catalog
+
+        xmlcatalog --noout --add "rewriteSystem" \
+                "http://docbook.sourceforge.net/release/xsl/current"; \
+                "/usr/share/xml/docbook/xsl-stylesheets" \
+                /etc/xml/catalog
+        xmlcatalog --noout --add "rewriteURI" \
+                "http://docbook.sourceforge.net/release/xsl/current"; \
+                "/usr/share/xml/docbook/xsl-stylesheets" \
+                /etc/xml/catalog
}

post_upgrade() {
-# strategy is now to remove all lines added by post_install and add them
-# completely new. This is a bit much, since the only the firts two lines
-# change with new versions, but this way we can do it via the subroutines here
-# Also it is good to remove the lines after deinstallation to get meaningful
-# error messages by apps like conglomerate when docbook-xsl is NOT installed
-       pre_remove $1 $2
-       post_install $1
+        post_install $1
}

-pre_remove() {
-# this is to get rid of the outdated lines
-# line #1: remove all the lines added by a current install scriptlet, 
ATTENTION:
-# if other packages start to add lines to the catalog, this line needs to be 
more adjusted
-# maybe we need the _OLD variable here
-# line #2: kills the delegateURI and delegateSystem
-               xmlcatalog --noout --del "${DOCBOOKDIR}" /etc/xml/catalog &&
-               xmlcatalog --noout --del 
"http://docbook.sourceforge.net/release/xsl/"; /etc/xml/catalog
-
-# save that for later, maybe we need it when other packages add lines to the 
catalog
-# the we can remove stuff more precisely
-# _OLD=`echo $2 | sed 's|\(.*\)\-.*|\1|'`
+post_remove() {
+        xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets" 
/etc/xml/catalog
}

op=$1
shift
-
$op $*
+
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to