Merge branch 'testing'

# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
  LinHES-config: during install don't kill off lirc.  This keeps the remote active all the way to the finish
  Change version numbers to 8.0  to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
  LinHES-conifig: mv_install.py  for the last partition don't go all the way to the end.  Gotta leave room for gpt tables.
  xf86-video-ati: xorg ati driver.
  LinHES-config: timezip.py  add syncing up of parental lvl passwords and starting level with MBE.
  LinHES-system: correct the logic for breaking out of the wmctrl loop.   As written it would break out of the inner loop..but not the 60 iteration loop.
  e16_theme_settings:  remove slide-in prop for new windows.   For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
  LinHES-config, mythinstall:  change  case of hd_pvr and   serial to all lower refs #902
  zilog-firmware:   firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters  but including the firmware just in case someone really wants to
  linhes-udev-rules:  added hdprv_lirc rule. All of these lirc rules are limited to exactly one device.  If more then one device is present then only the last device in init will get the symlink
  runit-scripts:  fix logging for igdeamon,   add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
  LinHES-system:   add lh_system_restore and lh_system_backup.  These scripts are called from the mythmenu. refs #900
  iguanair: rebuild with python 2.7
  LinHES-system: msg_daemon.py fix  init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
  linhes-udev-rules:  add rules for mce,streamzap,serial  lirc devices.
  mythinstall: recompile for matching libs
  mythtv:  latest .25-fixes  and change mythbackup/restore call lh_system_$op   to replace mythbackup/mythrestore.  mythbackup no longer works correctly with the new windowmanager
  linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
  LinHES-config, supplimental-web:  Fix proxy numbering for Ceton infiniTV
  linhes-system:  add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
  ...

4 files changed, 104 insertions, 305 deletions

diff --git a/abs/extra/docbook-xml/LICENSE b/abs/extra/docbook-xml/LICENSE
new file mode 100644
index 0000000..e3482f0
--- /dev/null
+++ b/abs/extra/docbook-xml/LICENSE
@@ -0,0 +1,24 @@
+     Copyright 1992-2006 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     See also http://docbook.org/specs/
+
+     Permission to use, copy, modify and distribute the DocBook XML DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
diff --git a/abs/extra/docbook-xml/PKGBUILD b/abs/extra/docbook-xml/PKGBUILD
index feac080..e5996d7 100644
--- a/abs/extra/docbook-xml/PKGBUILD
+++ b/abs/extra/docbook-xml/PKGBUILD
@@ -1,268 +1,273 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 151188 2012-02-25 07:07:26Z pierre $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=docbook-xml
 pkgver=4.5
-pkgrel=1
+pkgrel=5
 pkgdesc="A widely used XML scheme for writing documentation and help"
-arch=(i686 x86_64)
-url="http://scrollkeeper.sourceforge.net/docbook.shtml"
+arch=('any')
+url="http://www.oasis-open.org/docbook/"
+license=('MIT')
 depends=('libxml2')
-makedepends=('unzip')
 install=docbook-xml.install
-source=(http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
-        http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
-	http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
-	http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip
-	http://www.docbook.org/xml/4.1.2/docbkx412.zip)
+source=('http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip'
+        'http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip'
+        'http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip'
+        'http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip'
+        'http://www.docbook.org/xml/4.1.2/docbkx412.zip'
+        'LICENSE')
 noextract=('docbook-xml-4.5.zip' 'docbook-xml-4.4.zip' 'docbook-xml-4.3.zip' 'docbook-xml-4.2.zip' 'docbkx412.zip')
 md5sums=('03083e288e87a7e829e437358da7ef9e'
          'cbb04e9a700955d88c50962ef22c1634'
          'ab200202b9e136a144db1e0864c45074'
          '73fe50dfe74ca631c1602f558ed8961f'
-         '900d7609fb7e6d78901b357e4acfbc17')
+         '900d7609fb7e6d78901b357e4acfbc17'
+         '50e1eea70bc071b812e963e65af6707e')
 
-build() {
+package() {
   for ver in 4.2 4.3 4.4 4.5; do
     mkdir docbook-xml-${ver}
     pushd docbook-xml-${ver}
-    unzip ${startdir}/src/docbook-xml-${ver}.zip
-    mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-${ver}
-    cp -af docbook.cat *.dtd ent/ *.mod \
-              ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-${ver}/
+    bsdtar xf "${srcdir}/docbook-xml-${ver}.zip"
+    mkdir -p "${pkgdir}/usr/share/xml/docbook/xml-dtd-${ver}"
+    cp -dRf docbook.cat *.dtd ent/ *.mod \
+        "${pkgdir}/usr/share/xml/docbook/xml-dtd-${ver}/"
     popd
   done
   mkdir docbook-xml-4.1.2
   pushd docbook-xml-4.1.2
-  unzip ${startdir}/src/docbkx412.zip
-  mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-4.1.2
-  cp -af docbook.cat *.dtd ent/ *.mod \
-            ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-4.1.2/
+  bsdtar xf "${srcdir}/docbkx412.zip"
+  mkdir -p "${pkgdir}/usr/share/xml/docbook/xml-dtd-4.1.2"
+  cp -dRf docbook.cat *.dtd ent/ *.mod \
+      "${pkgdir}/usr/share/xml/docbook/xml-dtd-4.1.2/"
   popd
 
-  mkdir -p ${startdir}/pkg/etc/xml
-  xmlcatalog --noout --create ${startdir}/pkg/etc/xml/docbook-xml
+  mkdir -p "${pkgdir}/etc/xml"
+  xmlcatalog --noout --create "${pkgdir}/etc/xml/docbook-xml"
 
   # V4.1.2
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.1.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.1.2" \
     "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.1.2" \
     "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
 
   # V4.2
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook CALS Table Model V4.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook Notations V4.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.2/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" \
     "http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.2" \
     "file:///usr/share/xml/docbook/xml-dtd-4.2" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.2" \
     "file:///usr/share/xml/docbook/xml-dtd-4.2" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
 
   # V4.3
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.3//EN" \
     "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook CALS Table Model V4.3//EN" \
     "http://www.oasis-open.org/docbook/xml/4.3/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "http://www.oasis-open.org/docbook/xml/4.3/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" \
     "http://www.oasis-open.org/docbook/xml/4.3/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" \
     "http://www.oasis-open.org/docbook/xml/4.3/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" \
     "http://www.oasis-open.org/docbook/xml/4.3/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook Notations V4.3//EN" \
     "http://www.oasis-open.org/docbook/xml/4.3/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" \
     "http://www.oasis-open.org/docbook/xml/4.3/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.3" \
     "file:///usr/share/xml/docbook/xml-dtd-4.3" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.3" \
     "file:///usr/share/xml/docbook/xml-dtd-4.3" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
 
   # V4.4
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.4//EN" \
     "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \
     "http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \
     "http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \
     "http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \
     "http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \
     "http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook Notations V4.4//EN" \
     "http://www.oasis-open.org/docbook/xml/4.4/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \
     "http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.4" \
     "file:///usr/share/xml/docbook/xml-dtd-4.4" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.4" \
     "file:///usr/share/xml/docbook/xml-dtd-4.4" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
 
   # V4.5
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML V4.5//EN" \
     "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "public" \
     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/4.5" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
   xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/4.5" \
     "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    ${startdir}/pkg/etc/xml/docbook-xml
+    "${pkgdir}/etc/xml/docbook-xml"
+
+# license
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/abs/extra/docbook-xml/docbook-xml.install b/abs/extra/docbook-xml/docbook-xml.install
index c62f65f..97a6243 100644
--- a/abs/extra/docbook-xml/docbook-xml.install
+++ b/abs/extra/docbook-xml/docbook-xml.install
@@ -40,7 +40,3 @@ post_upgrade() {
 post_remove() {
   xmlcatalog --noout --del file:///etc/xml/docbook-xml etc/xml/catalog
 }
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/docbook-xml/docbook.patch b/abs/extra/docbook-xml/docbook.patch
deleted file mode 100644
index 1932f19..0000000
--- a/abs/extra/docbook-xml/docbook.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -Naur docbookx412-orig/Makefile docbookx412/Makefile
---- docbookx412-orig/Makefile	2002-02-16 11:08:29.000000000 -0800
-+++ docbookx412/Makefile	2002-08-24 12:03:31.000000000 -0700
-@@ -1,7 +1,7 @@
- SHELL=/bin/sh
- VERSION=4.1.2-9
--DESTDIR=/usr/share/xml/docbook/xml-dtd-$(VERSION)
--CATALOG=/usr/share/xml/docbook/catalog
-+DESTDIR=$(ROOT)/usr/share/xml/docbook/xml-dtd-$(VERSION)
-+CATALOG=$(ROOT)/usr/share/xml/docbook/catalog
- OPENJADEVER=1.3
- 
- all:
-@@ -24,7 +24,7 @@
- 	#
-         #
- 	# DocBook XML V4.1.2
--	@./buildDocBookCatalog
-+	@./buildDocBookCatalog $(ROOT)
- 
- uninstall:
- 	#
-diff -Naur docbookx412-orig/buildDocBookCatalog docbookx412/buildDocBookCatalog
---- docbookx412-orig/buildDocBookCatalog	2002-02-17 09:32:45.000000000 -0800
-+++ docbookx412/buildDocBookCatalog	2002-08-24 12:15:23.000000000 -0700
-@@ -28,16 +28,20 @@
- # Modifications made to Daniel Veillard's catalog build script at 
- # http://xmlsoft.org/buildDocBookCatalog.
- 
--if [ ! -d /etc/xml -a -w /etc ]
-+DESTDIR=$1
-+echo "DESTDIR is $DESTDIR"
-+mkdir $DESTDIR/etc
-+
-+if [ ! -d $DESTDIR/etc/xml -a -w $DESTDIR/etc ]
- then
-     echo Directory /etc/xml missing creating it
--    mkdir /etc/xml
--    chmod 755 /etc/xml
-+    mkdir $DESTDIR/etc/xml
-+    chmod 755 $DESTDIR/etc/xml
- fi
--if [ -w /etc/xml ]
-+if [ -w $DESTDIR/etc/xml ]
- then
--    ROOTCATALOG=/etc/xml/catalog
--    CATALOG=/etc/xml/docbook
-+    ROOTCATALOG=$DESTDIR/etc/xml/catalog
-+    CATALOG=$DESTDIR/etc/xml/docbook
- else
-     echo Unable to update root catalog /etc/xml/catalog
-     echo Using $HOME/xmlcatalog as the root catalog
-@@ -69,16 +73,7 @@
- #
- # find the prefix for DocBook DTD
- #
--found=`find /usr/share/xml -name docbookx.dtd`
--if [ "$found" = "" ] ; then
--    found=`find $HOME -name docbookx.dtd`
--fi
--if [ "$found" = "" ] ; then
--    found=`find /usr/local -name docbookx.dtd`
--fi
--if [ "$found" = "" ] ; then
--    found=`find /usr/share/sgml -name docbookx.dtd`
--fi
-+found=`find $DESTDIR/usr/share/xml -name docbookx.dtd`
- if [ "$found" = "" ] ; then
-     echo could not locate docbookx.dtd for DocBook XML
-     exit 1
-@@ -105,49 +100,52 @@
- #    exit 2
- #fi
- 
-+fakedocbookdir=`echo $docbookdir | sed "s|^$DESTDIR||"`
-+FAKECATALOG=`echo $CATALOG | sed "s|^$DESTDIR||"`
-+
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
--    "file://$docbookdir/dbpoolx.mod" $CATALOG
-+    "file://$fakedocbookdir/dbpoolx.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//DTD DocBook XML V4.1.2//EN" \
--    "file://$docbookdir/docbookx.dtd" $CATALOG
-+    "file://$fakedocbookdir/docbookx.dtd" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
--    "file://$docbookdir/dbcentx.mod" $CATALOG
-+    "file://$fakedocbookdir/dbcentx.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
--    "file://$docbookdir/dbnotnx.mod" $CATALOG
-+    "file://$fakedocbookdir/dbnotnx.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
--    "file://$docbookdir/dbgenent.mod" $CATALOG
-+    "file://$fakedocbookdir/dbgenent.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
--    "file://$docbookdir/dbhierx.mod" $CATALOG
-+    "file://$fakedocbookdir/dbhierx.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
--    "file://$docbookdir/soextblx.dtd" $CATALOG
-+    "file://$fakedocbookdir/soextblx.dtd" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
--    "file://$docbookdir/calstblx.dtd" $CATALOG
-+    "file://$fakedocbookdir/calstblx.dtd" $CATALOG
- xmlcatalog --noout --add "rewriteSystem" \
-     "http://www.oasis-open.org/docbook/xml/4.1.2" \
--    "file://$docbookdir" $CATALOG
-+    "file://$fakedocbookdir" $CATALOG
- xmlcatalog --noout --add "rewriteURI" \
-     "http://www.oasis-open.org/docbook/xml/4.1.2" \
--    "file://$docbookdir" $CATALOG
-+    "file://$fakedocbookdir" $CATALOG
- 
- xmlcatalog --noout --add "delegatePublic" \
-     "-//OASIS//ENTITIES DocBook XML" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- xmlcatalog --noout --add "delegatePublic" \
-     "-//OASIS//DTD DocBook XML" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- xmlcatalog --noout --add "delegateSystem" \
-     "http://www.oasis-open.org/docbook/" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- xmlcatalog --noout --add "delegateURI" \
-     "http://www.oasis-open.org/docbook/" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- 
- #
- # find the prefix for ISO DocBook entities
-@@ -187,66 +185,68 @@
- isodir=`dirname $entxml`
- echo Found ISO DocBook entities in $isodir
- 
-+fakeisodir=`echo $isodir | sed "s|^$DESTDIR||"`
-+
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Publishing//EN" \
--    "file://$isodir/iso-pub.ent" $CATALOG
-+    "file://$fakeisodir/iso-pub.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
--    "file://$isodir/iso-grk1.ent" $CATALOG
-+    "file://$fakeisodir/iso-grk1.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
--    "file://$isodir/iso-box.ent" $CATALOG
-+    "file://$fakeisodir/iso-box.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
--    "file://$isodir/iso-grk3.ent" $CATALOG
-+    "file://$fakeisodir/iso-grk3.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
--    "file://$isodir/iso-amsn.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsn.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
--    "file://$isodir/iso-num.ent" $CATALOG
-+    "file://$fakeisodir/iso-num.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
--    "file://$isodir/iso-grk4.ent" $CATALOG
-+    "file://$fakeisodir/iso-grk4.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
--    "file://$isodir/iso-dia.ent" $CATALOG
-+    "file://$fakeisodir/iso-dia.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
--    "file://$isodir/iso-grk2.ent" $CATALOG
-+    "file://$fakeisodir/iso-grk2.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
--    "file://$isodir/iso-amsa.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsa.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
--    "file://$isodir/iso-amso.ent" $CATALOG
-+    "file://$fakeisodir/iso-amso.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
--    "file://$isodir/iso-cyr1.ent" $CATALOG
-+    "file://$fakeisodir/iso-cyr1.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES General Technical//EN" \
--    "file://$isodir/iso-tech.ent" $CATALOG
-+    "file://$fakeisodir/iso-tech.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
--    "file://$isodir/iso-amsc.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsc.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
--    "file://$isodir/iso-lat1.ent" $CATALOG
-+    "file://$fakeisodir/iso-lat1.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
--    "file://$isodir/iso-amsb.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsb.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
--    "file://$isodir/iso-lat2.ent" $CATALOG
-+    "file://$fakeisodir/iso-lat2.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
--    "file://$isodir/iso-amsr.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsr.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
--    "file://$isodir/iso-cyr2.ent" $CATALOG
-+    "file://$fakeisodir/iso-cyr2.ent" $CATALOG
- 
- xmlcatalog --noout --add "delegatePublic" \
-     "ISO 8879:1986" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- #
- #