Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

2025-02-10 06:34:36 +08:00 · 2011-05-04 00:21:08 +00:00 · 2011-05-04 00:21:08 +00:00 · cbace0f979
commit cbace0f979
parent 5719d89bb5 6e07dd518a
9 changed files with 192 additions and 246 deletions
--- a/ffmpeg/PKGBUILD
+++ b/ffmpeg/PKGBUILD
@ -7,16 +7,15 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

-# FIXME libvpx
 pkgname=ffmpeg
 pkgver=20110330
 _head=HEAD-da3534b
-pkgrel=3
+pkgrel=4
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
 url="http://ffmpeg.org/"
-license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'faac' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libva>=1.0.7' 'openjpeg') # 'libvpx'
+license=('GPL3')
+depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libva>=1.0.7' 'openjpeg' 'libvpx')
 makedepends=('yasm')
 #remake snapshot with: http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=HEAD;sf=tgz
 source=(http://chakra-project.org/sources/ffmpeg/ffmpeg-${_head}.tar.gz)
@ -32,7 +31,6 @@ build() {
    --enable-gpl \
    --enable-libmp3lame \
    --enable-libvorbis \
-    --enable-libfaac \
    --enable-libxvid \
    --enable-libx264 \
    --enable-libtheora \
@ -45,9 +43,9 @@ build() {
    --enable-libschroedinger \
    --enable-libopenjpeg \
    --enable-version3 \
-    --enable-nonfree \
    --enable-runtime-cpudetect \
-    --disable-debug  # libfaac is nonfree  --enable-libvpx \
+    --enable-libvpx \
+    --disable-debug

  make
  make tools/qt-faststart
--- a/libvpx/PKGBUILD
+++ b/libvpx/PKGBUILD
@ -6,7 +6,7 @@

 pkgname=libvpx
 pkgver=0.9.6
-pkgrel=1
+pkgrel=2
 pkgdesc="The VP8 Codec SDK"
 arch=('i686' 'x86_64')
 url="http://www.webmproject.org/"
@ -26,6 +26,12 @@ build() {
        --disable-install-docs \
        --disable-install-srcs
    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-v${pkgver}"
+
    make DIST_DIR="$pkgdir/usr" install
-    install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" || return 1
-}
+    chmod -R o+r "${pkgdir}/usr/include/vpx"
+    install -D -m 0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+}
--- a/oss/PKGBUILD
+++ b/oss/PKGBUILD
@ -8,7 +8,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf

 pkgname=oss
-pkgver=4.2_2003
+pkgver=4.2_2004
 pkgrel=1
 pkgdesc="Open Sound System UNIX audio architecture"
 arch=('i686' 'x86_64')
@ -24,7 +24,7 @@ install=oss.install
 backup=('usr/lib/oss/soundon.user')
 source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2"
 	'oss.rm-init-scripts.patch' 'oss.rc' 'oss.soundon.patch' '50ossound')
-md5sums=('d5bcdc505f5ad140791b8d0051fda74d'
+md5sums=('256aba264d523fb8ee444aaacfb8d3da'
         'b9a380a0ac8896390d71ac13676f27e1'
         '8ca7cdf94c56ab02890eb4aba6a4995f'
         '65f07fe241bfbf912f76d8b6d8f276b5'
--- a/pyqt/PKGBUILD
+++ b/pyqt/PKGBUILD
@ -5,7 +5,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=pyqt
-pkgver=4.8.3
+pkgver=4.8.4
 pkgrel=1
 pkgdesc="A set of Python bindings for the Qt toolkit"
 arch=('i686' 'x86_64')
@ -21,7 +21,7 @@ provides=('pyqt4')
 replaces=('pyqt4')
 conflicts=('pyqt4')
 source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('d54fd1c37a74864faf42709c8102f254')
+md5sums=('97c5dc1042feb5b3fe20baabad055af1')

 build() {
  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
--- a/sip/PKGBUILD
+++ b/sip/PKGBUILD
@ -5,7 +5,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=sip
-pkgver=4.12.1
+pkgver=4.12.2
 pkgrel=1
 pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
 arch=('i686' 'x86_64')
@ -13,7 +13,7 @@ url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 depends=('python2' 'gcc-libs')
 source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0f8e8305b14c1812191de2e0ee22fea9')
+md5sums=('9df80f88e0e4022cdd8a8891c6c38048')

 build() {
  cd ${srcdir}/${pkgname}-${pkgver}
--- a/vim/PKGBUILD
+++ b/vim/PKGBUILD
@ -1,31 +1,35 @@
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: tobias [ tobias at archlinux org ]
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer (x86_64): Daniele Cocca <jmc@chakra-project.org>

-pkgname=(vim)
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+pkgbase=vim
+pkgname=(vim gvim vim-runtime)
 _topver=7.3
-_patchlevel=125
+_patchlevel=138
 pkgver=${_topver}.${_patchlevel}
-__hgrev=e44523d45b
+__hgrev=ea399ac2c1b9
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:vim')
 url="http://www.vim.org"
-makedepends=('gpm' 'perl' 'python2' 'ruby' 'libxt' 'desktop-file-utils'
+makedepends=('gpm' 'perl' 'python>=2.7.1' 'ruby' 'libxt' 'desktop-file-utils' 'lesstif'
             'gettext' 'pkgconfig' 'mercurial' 'rsync' 'sed')
-options=(force)
 source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
-        vimrc archlinux.vim)
-    
+        vimrc archlinux.vim gvim.desktop)
 md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
         'e57777374891063b9ca48a1fe392ac05'
-         '10353a61aadc3f276692d0e17db1478e')
+         '10353a61aadc3f276692d0e17db1478e'
+         '4b83e5fe0e534c53daaba91dd1cd4cbb')

 __hgroot='http://vim.googlecode.com/hg/'
 __hgrepo='vim'
 __hgbranch='default'

-_versiondir="vim${pkgver//./}"
+_versiondir="vim${_topver//./}"

 ##### Build #####

@ -37,9 +41,9 @@ build() {
  if [[ -d ${__hgrepo} ]]; then
    cd ${__hgrepo}
    hg pull -b ${__hgbranch}|| warning 'hg pull failed!'
-    hg update -r ${__hgrev} || return 1
+    hg update -r ${__hgrev}
  else
-    hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} || return 1
+    hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
    cd ${__hgrepo}
  fi

@ -51,19 +55,23 @@ build() {

  cd ..
  rm -rf vim-build gvim-build
-  rsync -a --exclude='.hg/' ${__hgrepo}/ vim-build || return 1
+  rsync -a --exclude='.hg/' ${__hgrepo}/ vim-build

  msg2 'Patching...'

  # define the place for the global (g)vimrc file (set to /etc/vimrc)
  sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
-    vim-build/src/feature.h || return 1
+    vim-build/src/feature.h
  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \
-    vim-build/src/feature.h || return 1
+    vim-build/src/feature.h
+  # fix python name
+  sed -i -e 's|vi_cv_path_python, python|vi_cv_path_python, python2|' \
+    vim-build/src/configure.in
+  (cd vim-build/src && autoconf)

  msg2 'Building...'

-  cp -a vim-build gvim-build || return 1
+  cp -a vim-build gvim-build

  cd ${srcdir}/vim-build

@ -72,20 +80,31 @@ build() {
    --with-features=big --enable-gpm --enable-acl --with-x=no \
    --disable-gui --enable-multibyte --enable-cscope \
    --disable-netbeans --enable-perlinterp --disable-pythoninterp \
-    --disable-rubyinterp || return 1
+    --disable-rubyinterp

-  make || return 1
+  make
+
+  cd ${srcdir}/gvim-build
+
+  ./configure --prefix=/usr --localstatedir=/var/lib/vim \
+    --mandir=/usr/share/man --with-compiledby=Chakra \
+    --with-features=big --enable-gpm --enable-acl --with-x=yes \
+    --enable-gui=motif --enable-multibyte --enable-cscope \
+    --enable-netbeans --enable-perlinterp --enable-pythoninterp \
+    --enable-rubyinterp
+
+  make
 }

 ##### Packaging #####

-package() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
-  depends=('gpm' 'perl')
-  backup=(etc/vimrc)
+package_vim() {
+  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor.'
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl')
+  conflicts=('gvim')

  cd ${srcdir}/vim-build
-  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install || return 1
+  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install

  # provided by (n)vi in core
  rm ${pkgdir}/usr/bin/{ex,view}
@ -98,18 +117,8 @@ package() {
    rm -f evim.1    # this does not make sense if we have no GUI
  done

-  # Don't forget logtalk.dict
-  install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \
-    ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict || return 1
-
-  # make Aaron happy
-  install -Dm644 ${srcdir}/pythoncomplete.vim \
-    ${pkgdir}/usr/share/vim/vim72/autoload/pythoncomplete.vim
-  
-  # rc files
-  install -Dm644 ${srcdir}/vimrc ${pkgdir}/etc/vimrc
-  install -Dm644 ${srcdir}/archlinux.vim \
-    ${pkgdir}/usr/share/vim/vimfiles/archlinux.vim
+  # Runtime provided by runtime package
+  rm -r ${pkgdir}/usr/share/vim

  # license
  install -dm755 ${pkgdir}/usr/share/licenses/vim
@ -117,5 +126,76 @@ package() {
    ${pkgdir}/usr/share/licenses/vim/license.txt
 }

+package_gvim() {
+  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI).'
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl' 'python>=2.7.1' 'ruby' 'libxt'
+           'desktop-file-utils' 'lesstif')
+  provides=("vim=${pkgver}-${pkgrel}")
+  conflicts=('vim')
+  install=gvim.install
+
+  cd ${srcdir}/gvim-build
+  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+
+  # provided by (n)vi in core
+  rm ${pkgdir}/usr/bin/{ex,view}
+
+  # delete some manpages
+  find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+    while read _mandir; do
+    cd ${_mandir}
+    rm -f ex.1 view.1 # provided by (n)vi
+  done
+
+  # Move the runtime for later packaging
+  mv ${pkgdir}/usr/share/vim ${srcdir}/runtime-install
+
+  # freedesktop links
+  install -Dm644 ${srcdir}/gvim.desktop \
+    ${pkgdir}/usr/share/applications/gvim.desktop
+  install -Dm644 runtime/vim48x48.png ${pkgdir}/usr/share/pixmaps/gvim.png
+
+  # license
+  install -dm755 ${pkgdir}/usr/share/licenses/gvim
+  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
+    ${pkgdir}/usr/share/licenses/gvim/license.txt
+}
+
+package_vim-runtime() {
+  pkgdesc='Runtime for vim and gvim.'
+  backup=(etc/vimrc)
+
+  # Install the runtime split from gvim
+  install -dm755 ${pkgdir}/usr/share
+  mv ${srcdir}/runtime-install ${pkgdir}/usr/share/vim
+
+  # Don't forget logtalk.dict
+  install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \
+    ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
+
+  # fix FS#17216
+  sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
+    ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+
+  # patch filetype.vim for better handling of pacman related files
+  sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
+    ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+  sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
+    ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
+
+  # make Aaron happy
+  install -Dm644 ${srcdir}/pythoncomplete.vim \
+    ${pkgdir}/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
+  
+  # rc files
+  install -Dm644 ${srcdir}/vimrc ${pkgdir}/etc/vimrc
+  install -Dm644 ${srcdir}/archlinux.vim \
+    ${pkgdir}/usr/share/vim/vimfiles/archlinux.vim
+
+  # license
+  install -dm755 ${pkgdir}/usr/share/licenses/vim-runtime
+  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
+    ${pkgdir}/usr/share/licenses/vim-runtime/license.txt
+}

 # vim:set sw=2 sts=2 et:
--- a/vim/gvim.desktop
+++ b/vim/gvim.desktop
@ -0,0 +1,42 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=gVim
+Name[eo]=VIM-fasado
+Name[sv]=gVim
+Name[xx]=xx
+Comment=GTK2 enhanced vim text editor
+Comment[ar]=محرر نصوص
+Comment[bg]=Текст Редактор
+Comment[de]=Texteditor
+Comment[el]=Διορθωτής Κειμένου
+Comment[eo]=Tekstredaktilo
+Comment[et]=Tekstiredaktor
+Comment[eu]=Testu Editorea
+Comment[fi]=Tekstieditori
+Comment[he]=עורך טקסט
+Comment[is]=Textaritill
+Comment[ja]=テキストエディタ
+Comment[lt]=Teksto redaktorius
+Comment[mt]=Editur tat-test
+Comment[pt_BR]=Editor de Texto
+Comment[ro]=Editor de text
+Comment[ru]=редактор
+Comment[sk]=Textový editor
+Comment[sl]=Urejevalnik besedil
+Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷
+Comment[tr]=Metin Düzenleyici
+Comment[uk]=Редактор текстів
+Comment[vi]=Trình soạn văn bản
+Comment[xx]=xx
+Comment[zh_CN]=文本编辑器
+Comment[zh_TW]=文字編輯器
+GenericName=Text Editor
+Type=Application
+TryExec=gvim
+Exec=gvim %u
+Icon=gvim
+Terminal=false
+X-MultipleArgs=false
+Categories=GTK;Application;Utility;TextEditor;
+MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-c;text/x-objc;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-php;text/x-php-source;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt;
--- a/vim/gvim.install
+++ b/vim/gvim.install
@ -0,0 +1,13 @@
+post_install() {
+  echo -n "Updating desktop and mime database..."
+  update-desktop-database -q
+  echo "done."
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
--- a/vim/xz.patch
+++ b/vim/xz.patch
@ -1,193 +0,0 @@
-diff -uNr vim72/autoload/getscript.vim vim72-xz/autoload/getscript.vim
--- vim72/autoload/getscript.vim	2010-05-16 22:33:59.000000000 +0200
-+++ vim72-xz/autoload/getscript.vim	2010-05-16 22:41:34.930283754 +0200
-@@ -557,6 +557,11 @@
-       exe "silent !gunzip ".shellescape(sname)
-       let sname= substitute(sname,'\.gz$','','')
- "      call Decho("decompress: new sname<".sname."> after gunzip")
-+     elseif sname =~ '\.xz$'
-+"      call Decho("decompress: attempt to unxz ".sname)
-+      exe "silent !unxz ".shellescape(sname)
-+      let sname= substitute(sname,'\.xz$','','')
-+"      call Decho("decompress: new sname<".sname."> after unxz")
-      else
- "      call Decho("no decompression needed")
-      endif
-diff -uNr vim72/autoload/netrw.vim vim72-xz/autoload/netrw.vim
--- vim72/autoload/netrw.vim	2010-05-16 22:33:59.000000000 +0200
-+++ vim72-xz/autoload/netrw.vim	2010-05-16 22:40:28.007276216 +0200
-@@ -163,7 +163,7 @@
- endif
- " Default values - d-g ---------- {{{3
- call s:NetrwInit("g:netrw_dirhist_cnt"      , 0)
-call s:NetrwInit("g:netrw_decompress"       , '{ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf"}')
-+call s:NetrwInit("g:netrw_decompress"       , '{ ".gz" : "gunzip", ".bz2" : "bunzip2", ".xz" : "unxz", ".zip" : "unzip", ".tar" : "tar -xf" }')
- call s:NetrwInit("g:netrw_dirhistmax"       , 10)
- call s:NetrwInit("g:netrw_fastbrowse"       , 1)
- call s:NetrwInit("g:netrw_ftp_browse_reject", '^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$')
-@@ -920,7 +920,7 @@
-    unlet b:netrw_method
-    unlet b:netrw_fname
-   endif
-  if s:FileReadable(tmpfile) && tmpfile !~ '.tar.bz2$' && tmpfile !~ '.tar.gz$' && tmpfile !~ '.zip' && tmpfile !~ '.tar' && readcmd != 't'
-+  if s:FileReadable(tmpfile) && tmpfile !~ '.tar.xz$' && tmpfile !~ '.tar.bz2$' && tmpfile !~ '.tar.gz$' && tmpfile !~ '.zip' && tmpfile !~ '.tar' && readcmd != 't'
- "   call Decho("cleanup by deleting tmpfile<".tmpfile.">")
-    call s:NetrwDelete(tmpfile)
-   endif
-@@ -1387,6 +1387,9 @@
-    elseif rfile =~ '\.tar\.bz2'
- "    call Decho("handling remote bz2-compressed tar file")
-     call tar#Browse(tfile)
-+   elseif rfile =~ '\.tar\.xz'
-+"    call Decho("handling remote xz-compressed tar file")
-+    call tar#Browse(tfile)
-    else
- "    call Decho("edit temporary file")
-     e!
-@@ -2312,7 +2315,7 @@
-    exe "sil! keepalt file ".fnameescape(s:method."://".s:user.s:machine."/".s:path)
-    exe "sil keepalt doau BufReadPre ".fnameescape(s:fname)
-    silent call netrw#NetRead(2,s:method."://".s:user.s:machine."/".s:path)
-   if s:path !~ '.tar.bz2$' && s:path !~ '.tar.gz'
-+   if s:path !~ '.tar.xz' && s:path !~ '.tar.bz2$' && s:path !~ '.tar.gz'
-     " netrw.vim and tar.vim have already handled decompression of the tarball; avoiding gzip.vim error
-     exe "sil keepalt doau BufReadPost ".fnameescape(s:fname)
-    endif
-@@ -4390,7 +4393,7 @@
- "                          using g:netrw_compress_suffix to know which to
- "                          do.  By default:
- "                            g:netrw_compress        = "gzip"
-"                            g:netrw_decompress      = { ".gz" : "gunzip" , ".bz2" : "bunzip2" , ".zip" : "unzip" , ".tar" : "tar -xf"}
-+"                            g:netrw_decompress      = { ".gz" : "gunzip" , ".bz2" : "bunzip2" , ".xz" : "unxz", ".zip" : "unzip" , ".tar" : "tar -xf"}
- fun! s:NetrwMarkFileCompress(islocal)
- "  call Dfunc("s:NetrwMarkFileCompress(islocal=".a:islocal.")")
-   let svpos    = netrw#NetrwSavePosn()
-@@ -7868,7 +7871,7 @@
-   if a:fname != ""
-    if a:fname =~ '\.[^./]\+$'
- "    call Decho("using fname<".a:fname.">'s suffix")
-    if a:fname =~ '.tar.gz' || a:fname =~ '.tar.bz2'
-+    if a:fname =~ '.tar.gz' || a:fname =~ '.tar.bz2' || a:fname =~ '.tar.xz'
-      let suffix = ".tar".substitute(a:fname,'^.*\(\.[^./]\+\)$','\1','e')
-     else
-      let suffix = substitute(a:fname,'^.*\(\.[^./]\+\)$','\1','e')
-diff -uNr vim72/autoload/tar.vim vim72-xz/autoload/tar.vim
--- vim72/autoload/tar.vim	2010-05-16 22:33:59.000000000 +0200
-+++ vim72-xz/autoload/tar.vim	2010-05-16 22:43:47.552260967 +0200
-@@ -164,6 +164,9 @@
-   elseif tarfile =~# '\.lzma$'
- "   call Decho("3: exe silent r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
-    exe "silent r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
-+  elseif tarfile =~# '\.xz$'
-+"   call Decho("3: exe silent r! xz -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
-+   exe "silent r! xz -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
-   else
-    if tarfile =~ '^\s*-'
-     " A file name starting with a dash is taken as an option.  Prepend ./ to avoid that.
-@@ -265,10 +268,13 @@
-   elseif  fname =~ '\.lzma$' && executable("lzcat")
-    let decmp= "|lzcat"
-    let doro = 1
-+  elseif  fname =~ '\.xz$' && executable("xzcat")
-+   let decmp= "|xzcat"
-+   let doro = 1
-   else
-    let decmp=""
-    let doro = 0
-   if fname =~ '\.bz2$\|\.gz$\|\.lzma$\|\.zip$\|\.Z$'
-+   if fname =~ '\.bz2$\|\.gz$\|\.lzma$\|\.xz$\|\.zip$\|\.Z$'
-     setlocal bin
-    endif
-   endif
-@@ -290,6 +296,9 @@
-   elseif tarfile =~# '\.lzma$'
- "   call Decho("7: exe silent r! lzma -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
-    exe "silent r! lzma -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-+  elseif tarfile =~# '\.xz$'
-+"   call Decho("7: exe silent r! xz -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
-+   exe "silent r! xz -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
-   else
-    if tarfile =~ '^\s*-'
-     " A file name starting with a dash is taken as an option.  Prepend ./ to avoid that.
-@@ -393,6 +402,11 @@
-    let tarfile = substitute(tarfile,'\.lzma','','e')
-    let compress= "lzma -- ".shellescape(tarfile,0)
- "   call Decho("compress<".compress.">")
-+  elseif tarfile =~# '\.xz'
-+   call system("xz -d -- ".shellescape(tarfile,0))
-+   let tarfile = substitute(tarfile,'\.xz','','e')
-+   let compress= "xz -- ".shellescape(tarfile,0)
-+"   call Decho("compress<".compress.">")
-   elseif tarfile =~# '\.tgz'
-    call system("gzip -d -- ".shellescape(tarfile,0))
-    let tarfile = substitute(tarfile,'\.tgz','.tar','e')
-diff -uNr vim72/autoload/vimball.vim vim72-xz/autoload/vimball.vim
--- vim72/autoload/vimball.vim	2010-05-16 22:33:59.000000000 +0200
-+++ vim72-xz/autoload/vimball.vim	2010-05-16 22:45:32.614510143 +0200
-@@ -505,6 +505,26 @@
-    exe "e ".escape(fname,' \')
-    if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
- 
-+  elseif expand("%") =~ '.*\.xz' && executable("unxz")
-+   " handle *.xz with unxz
-+   silent exe "!unxz ".shellescape(a:fname)
-+   if v:shell_error != 0
-+	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) unxz may have failed with <".a:fname.">")
-+   endif
-+   let fname= substitute(a:fname,'\.xz$','','')
-+   exe "e ".escape(fname,' \')
-+   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-+
-+  elseif expand("%") =~ '.*\.xz' && executable("xz")
-+   " handle *.xz with xz -d
-+   silent exe "!xz -d ".shellescape(a:fname)
-+   if v:shell_error != 0
-+	call vimball#ShowMesg(s:WARNING,'(vimball#Decompress) "xz -d" may have failed with <'.a:fname.">")
-+   endif
-+   let fname= substitute(a:fname,'\.xz$','','')
-+   exe "e ".escape(fname,' \')
-+   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-+
-   elseif expand("%") =~ '.*\.zip' && executable("unzip")
-    " handle *.zip with unzip
-    silent exe "!unzip ".shellescape(a:fname)
-diff -uNr vim72/filetype.vim vim72-xz/filetype.vim
--- vim72/filetype.vim	2010-05-16 22:34:09.000000000 +0200
-+++ vim72-xz/filetype.vim	2010-05-16 22:47:29.343285870 +0200
-@@ -37,7 +37,7 @@
- " Pattern used to match file names which should not be inspected.
- " Currently finds compressed files.
- if !exists("g:ft_ignore_pat")
-  let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
-+  let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|xz\|zip\|tgz\)$'
- endif
- 
- " Function used for patterns that end in a star: don't set the filetype if the
-diff -uNr vim72/plugin/tarPlugin.vim vim72-xz/plugin/tarPlugin.vim
--- vim72/plugin/tarPlugin.vim	2010-05-16 22:33:59.000000000 +0200
-+++ vim72-xz/plugin/tarPlugin.vim	2010-05-16 22:46:39.220270785 +0200
-@@ -39,8 +39,9 @@
-   au BufReadCmd   *.lrp			call tar#Browse(expand("<amatch>"))
-   au BufReadCmd   *.tar.bz2		call tar#Browse(expand("<amatch>"))
-   au BufReadCmd   *.tar.Z		call tar#Browse(expand("<amatch>"))
-+  au BufReadCmd   *.tar.lzma	        call tar#Browse(expand("<amatch>"))
-+  au BufReadCmd   *.tar.xz		call tar#Browse(expand("<amatch>"))
-   au BufReadCmd   *.tgz			call tar#Browse(expand("<amatch>"))
-  au BufReadCmd   *.tar.lzma	call tar#Browse(expand("<amatch>"))
- augroup END
- com! -nargs=? -complete=file Vimuntar call tar#Vimuntar(<q-args>)
- 
-diff -uNr vim72/plugin/vimballPlugin.vim vim72-xz/plugin/vimballPlugin.vim
--- vim72/plugin/vimballPlugin.vim	2010-05-16 22:33:59.000000000 +0200
-+++ vim72-xz/plugin/vimballPlugin.vim	2010-05-16 22:47:07.425260844 +0200
-@@ -26,8 +26,8 @@
- com! -na=? -complete=dir  UseVimball			call vimball#Vimball(1,<f-args>)
- com! -na=0                VimballList			call vimball#Vimball(0)
- com! -na=* -complete=dir  RmVimball				call vimball#SaveSettings()|call vimball#RmVimball(<f-args>)|call vimball#RestoreSettings()
-au SourceCmd  *.vba.gz,*.vba.bz2,*.vba.zip		call vimball#Decompress(expand("<amatch>"))|call vimball#Vimball(1)
-au BufEnter  *.vba,*.vba.gz,*.vba.bz2,*.vba.zip	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'| setlocal ma ff=unix noma |endif|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")
-+au SourceCmd  *.vba.gz,*.vba.bz2,*.vba.xz,*.vba.zip		call vimball#Decompress(expand("<amatch>"))|call vimball#Vimball(1)
-+au BufEnter  *.vba,*.vba.gz,*.vba.bz2,*.vba.xz,*.vba.zip	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'| setlocal ma ff=unix noma |endif|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")
- 
- " =====================================================================
- " Restoration And Modelines: {{{1