forgot to update some time

21 files changed, 543 insertions, 180 deletions

diff --git a/eaccelerator/PKGBUILD b/eaccelerator/PKGBUILD
new file mode 100644
index 0000000..fc5abac
--- /dev/null
+++ b/eaccelerator/PKGBUILD
@@ -0,0 +1,34 @@
+# Contributor: Florian Pritz <f-p@gmx.at>
+pkgname=eaccelerator
+pkgver=0.9.5.3
+pkgrel=1
+pkgdesc=""
+arch=('i686' 'x86_64')
+url=""
+license=('GPL')
+groups=()
+depends=('php')
+makedepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+source=(http://bart.eaccelerator.net/source/$pkgver/$pkgname-$pkgver.tar.bz2)
+noextract=()
+md5sums=()
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  phpize || return 1
+  ./configure \
+  --enable-eaccelerator=shared \
+  --with-php-config=/usr/bin/php-config
+
+  make || return 1
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/firefox-nightly/ChangeLog b/firefox-nightly/ChangeLog
new file mode 100644
index 0000000..73c9911
--- /dev/null
+++ b/firefox-nightly/ChangeLog
@@ -0,0 +1,23 @@
+firefox-nightly 3.6a1pre-1
+	+ Update to nightly build 3.6 alpha 1
+
+firefox-nightly 3.2a1pre-1
+	+ Update to nightly build 3.2 alpha 1
+	+ Both x86 and x86_64 pkgs download from latest-trunk dir
+
+firefox-nightly 3.1b2pre-1
+	+ Change installation directory to /opt/firefox-$pkgver
+
+firefox-nightly 3.1b2.20081109-1
+	+ Update to nightly build 2008-11-09
+
+firefox-nightly 3.1b2.2008110202-1
+	+ Update to nightly build 2008-11-02-02
+
+firefox-nightly 3.1b2_20081020-1
+	+ Update to nightly build 2008-10-20 (Lastest versions are buggy)
+	+ Add firefox md5sums
+
+firefox-nightly 3.1b2-2
+	+ Remove IM error fix (Tested with new builds)
+	+ Change installation directory to /opt/mozilla/firefox-$pkgver
diff --git a/firefox-nightly/PKGBUILD b/firefox-nightly/PKGBUILD
new file mode 100644
index 0000000..9d84ecf
--- /dev/null
+++ b/firefox-nightly/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: coderoar <coderoar@gmail.com>
+
+arch=('i686' 'x86_64')
+depends=('desktop-file-utils' 'libxt' 'mime-types' 'nss' 'shared-mime-info')
+license=('MPL' 'GPL' 'LGPL')
+md5sums=('940233ba24a2de784ea6c610872f01e4' '488e66c72fb678d2b99a22fe87bc5974' '')
+pkgdesc='Standalone web browser from mozilla.org, nightly build.'
+pkgname=firefox-nightly
+pkgrel=1
+pkgver=3.6a1pre
+if [[ ${CARCH} = 'i686' ]]; then
+	source=('firefox-nightly.desktop' 'firefox-nightly-safe.desktop' 'ftp://ftp.mozilla.org/pub/firefox/nightly/latest-trunk/firefox-3.6a1pre.en-US.linux-i686.tar.bz2')
+else
+	source=('firefox-nightly.desktop' 'firefox-nightly-safe.desktop' 'ftp://ftp.mozilla.org/pub/firefox/nightly/latest-trunk/firefox-3.6a1pre.en-US.linux-x86_64.tar.bz2')
+fi
+url='http://www.mozilla.org/projects/firefox'
+
+build() {
+	cd ${srcdir}
+
+#	uncomment this line to remove them if you want
+#	rm -rf firefox/{extensions,plugins,searchplugins} || return 1
+
+	mkdir -p ${pkgdir}/{usr/{bin,share/{applications,pixmaps}},opt} || return 1
+	cp -r firefox ${pkgdir}/opt/firefox-${pkgver} || return 1
+
+	ln -s /opt/firefox-${pkgver}/firefox ${pkgdir}/usr/bin/firefox-nightly || return 1
+	install -m644 ${srcdir}/{firefox-nightly.desktop,firefox-nightly-safe.desktop} ${pkgdir}/usr/share/applications/ || return 1
+	install -m644 ${srcdir}/firefox/icons/mozicon128.png ${pkgdir}/usr/share/pixmaps/${pkgname}-icon.png || return 1
+}
diff --git a/firefox-nightly/firefox-nightly-safe.desktop b/firefox-nightly/firefox-nightly-safe.desktop
new file mode 100644
index 0000000..34d98e6
--- /dev/null
+++ b/firefox-nightly/firefox-nightly-safe.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Minefield - Safe Mode
+GenericName=Web Browser - Safe Mode
+Icon=firefox-nightly-icon
+Type=Application
+Categories=Application;Network;
+MimeType=text/html
+Encoding=UTF-8
+Exec=firefox-nightly -safe-mode %u
+Terminal=false
+MultipleArgs=false
+StartupNotify=false
diff --git a/firefox-nightly/firefox-nightly.desktop b/firefox-nightly/firefox-nightly.desktop
new file mode 100644
index 0000000..e1545c6
--- /dev/null
+++ b/firefox-nightly/firefox-nightly.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Minefield
+GenericName=Web Browser
+Icon=firefox-nightly-icon
+Type=Application
+Categories=Application;Network;
+MimeType=text/html
+Encoding=UTF-8
+Exec=firefox-nightly %u
+Terminal=false
+MultipleArgs=false
+StartupNotify=false
diff --git a/gvim/PKGBUILD b/gvim/PKGBUILD
index 1adb7d5..797b42d 100644
--- a/gvim/PKGBUILD
+++ b/gvim/PKGBUILD
@@ -3,18 +3,15 @@
 
 pkgname=gvim
 _srcver=7.2
-_patchlevel=132
+_patchlevel=166
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="the vim text editor with advanced features enabled, such as a gui mode"
 arch=(i686 x86_64)
 license=('custom:vim')
 url="http://www.vim.org"
-depends=("vim>=${pkgver}" 'perl' 'acl' 'libxt' 'gtk2' 'desktop-file-utils' 'python')
-makedepends=('pkgconfig')
-backup=(etc/gvimrc)
-conflicts=('gvim-devel')
-provides=('gvim-devel')
+depends=("vim=${pkgver}" 'perl' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2')
+makedepends=('pkgconfig' 'sed')
 install=${pkgname}.install
 source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
@@ -23,68 +20,49 @@ source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
 
 build()
 {
+  _versiondir="vim"$(echo ${_srcver} | sed "s/\.//")
   # patch party
   # pull in patches from vim.org (or the src cache alternatively)
-  . ${startdir}/src/fetch_patches.sh
+  . ${srcdir}/fetch_patches.sh
   get_patches || return 1
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
+  cd ${srcdir}/${_versiondir}
    # define the place for the global (g)vimrc file (set to /etc/vimrc)
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h
   ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \
     --with-compiledby=ArchLinux --with-features=big \
-    --with-x=yes --disable-gpm --with-x=yes --enable-gui=gtk2 \
-    --with-global-runtime=/usr/share/vim --with-vim-name=gvim \
+    --with-x=yes --disable-gpm --enable-gui=gtk2 \
     --enable-multibyte --enable-cscope \
-    --enable-perlinterp --enable-pythoninterp 
+    --enable-perlinterp --enable-pythoninterp --enable-rubyinterp
   make || return 1
-  # install everything first ...
-  make VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install
+   # install everything first ...
+  make VIMRCLOC=/etc DESTDIR=${pkgdir} install
 
    # ... and clean up what vim already has for us
-   # move the binary and fix the (g)* related symlinks
-  find ${startdir}/pkg/usr/bin -type l 2> /dev/null | while read symlink; do
-    rm ${symlink}
-  done
-  cd ${startdir}/pkg/usr/bin
-  rm -f gvimtutor xxd
-  ln -s gvim evim
-  ln -s gvim egview
-  ln -s gvim gview
-  ln -s gvim gvimdiff
-  ln -s gvim rgview
-  ln -s gvim rgvim
+  cd ${pkgdir}/usr/bin
+  rm -f xxd ex view vimtutor vimdiff rview rvim
+  mv vim vim-big
+  # ... make g* related symlinks point directly to the actual binary
+  ln -sf vim-big eview
+  ln -sf vim-big evim
+  ln -sf vim-big gview
+  ln -sf vim-big gvim
+  ln -sf vim-big gvimdiff
+  ln -sf vim-big rgview
+  ln -sf vim-big rgvim
 
-   # delete the manpages/symlinks provided by vi package
-  find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \
-   while read mandir; do
-    cd ${mandir}
-    rm -f *.1
-    ln -s evi.1.gz evim.1.gz
-    ln -s vi.1.gz egview.1.gz
-    ln -s vi.1.gz gview.1.gz
-    ln -s vi.1.gz gvim.1.gz
-    ln -s vimdiff.1.gz gvimdiff.1.gz
-    ln -s vi.1.gz rgvim.1.gz
-    ln -s vi.1.gz rgview.1.gz
+   # delete the manpages/symlinks provided by vim and (n)vi package
+  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
+      rm -f rvim.1 rview.1 vim.1 vimtutor.1 vimdiff.1 xxd.1  # provided by vim
   done
 
-  install -Dm644 ${startdir}/pkg/usr/share/vim/gvimrc_example.vim \
-    ${startdir}/pkg/etc/gvimrc
-   # clean all settings and controls -  served by vi package
-  rm -rf ${startdir}/pkg/usr/share/vim
+   # clean all settings and controls -  served by vim package
+  rm -rf ${pkgdir}/usr/share/vim
    # freedesktop links
-  install -D -m644 ${startdir}/src/${pkgname}.desktop \
+  install -D -m644 ${srcdir}/${pkgname}.desktop \
     ${startdir}/pkg/usr/share/applications/gvim.desktop
-  install -D -m644 ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")/runtime/vim48x48.png \
-    ${startdir}/pkg/usr/share/pixmaps/gvim.png
+  install -D -m644 ${srcdir}/${_versiondir}/runtime/vim48x48.png \
+    ${pkgdir}/usr/share/pixmaps/gvim.png
 }
-md5sums=('f0901284b338e448bfd79ccca0041254'
-         '35e04482f07c57221c9a751aaa3b8dac'
-         'd8884786979e0e520c112faf2e176f05'
-         '2be104c0372dd6dae19cb7968c03cd4f'
-         'f16f81339ea02b6e1a736264861b7fad')
-sha256sums=('914db0f2205ebd6f02878295ec2506036ea7500399db112c61a01491cd9a1d86'
-            '20894ac79672160bfc4f1d2f9f9775b34d944762d655307a91ca96d358faa04d'
-            '11607f539a4518b550bf1606b7d3a6f36c1ffdf566c058e7d94bced78034cd5b'
-            '5f2d65e755424f688b990b20bce6bd84718b9d5f7944a5332b5dee72f09493f7'
-            'ca1318de5f37712afa532e87e0a201ad4dadcfe6d3b1382d571ea4c621bd07ed')
diff --git a/gvim/gvim.install b/gvim/gvim.install
index f49c345..f52c82e 100644
--- a/gvim/gvim.install
+++ b/gvim/gvim.install
@@ -1,4 +1,11 @@
 post_install() {
+
+  echo "Create gvim related symlinks..."
+  cd usr/bin
+  rm -f vim
+  ln -sf vim-big vim
+  cd ${OLDPWD}
+
   echo "Updating desktop and mime database..."
   update-desktop-database -q
   echo -n "Updating vim help tags..."
@@ -12,6 +19,18 @@ post_upgrade() {
 }
 
 post_remove() {
+  # we recover what pacmans database knows about gvim
+  # is vim installed and well?
+  if [ -f usr/bin/vim-normal ] ; then
+    cd usr/bin
+    rm -f vim
+    ln -sf vim-normal vim
+    cd ${OLDPWD}
+    echo "Recover vim related symlinks ..."
+  else
+    # Should never be the case because gvim depends on vim
+    rm -f usr/bin/vim
+  fi
   echo -n "Updating desktop and mime database..."
   update-desktop-database
   echo "done."
diff --git a/mpd-git/PKGBUILD b/mpd-git/PKGBUILD
new file mode 100644
index 0000000..0364c8b
--- /dev/null
+++ b/mpd-git/PKGBUILD
@@ -0,0 +1,103 @@
+# Contributor: Slash <demodevil5[at]yahoo[dot]com>
+
+pkgname=mpd-git
+pkgver=20090425
+pkgrel=1
+pkgdesc="music daemon that plays mp3, flac, aac, mod, wav, mpc and ogg files"
+url="http://musicpd.org"
+depends=(
+    'alsa-lib' 'audiofile' 'curl' 'faad2>=2.6.1' 'ffmpeg' 'flac>=1.1.3' 'glib2'
+    'libao' 'libcdio' 'libid3tag' 'libmad' 'libmikmod' 'libmodplug' 
+    'libmpcdec>=1.2.5' 'libsamplerate' 'libshout' 'wavpack' 'zziplib'
+)
+makedepends=('autoconf' 'automake' 'git' 'libtool' 'pkgconfig')
+optdepends=(
+    'avahi: Support for Avahi Zeroconf Backend'
+    'jack-audio-connection-kit: Support for JACK Audio'
+    'libao-pulse: Support for the PulseAudio Sound Server'
+    'libcue: Support for embedded cuesheets'
+    'libmms: Support for MMS Protocol'
+    'sqlite3: Support for SQLite Database'
+)
+license=('GPL')
+arch=('i686' 'x86_64')
+conflicts=('mpd')
+provides=('mpd')
+replaces=('mpd-svn')
+install=mpd.install
+source=('mpd.init' 'mpd.install')
+md5sums=('b1fd15de359db08e4b9ae4b199640f0e'
+         '332e0a4569ace3a5854070625a04f788')
+
+_gitroot="git://git.musicpd.org/master/mpd.git"
+_gitname="mpd"
+
+build() {
+    cd $srcdir
+
+    msg "Connecting to GIT server..."
+
+    if [ -d $srcdir/$_gitname ] ; then
+        cd $_gitname && git pull origin
+        msg "The local files are updated."
+    else
+        git clone $_gitroot
+    fi
+
+    msg "GIT checkout done or server timeout"
+    msg "Starting make..."
+
+    # Copy Latest files to Build Directory
+    cp -r $srcdir/$_gitname $srcdir/$_gitname-build
+    cd $srcdir/$_gitname-build
+
+    # Configure Source
+    ./autogen.sh \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --enable-ao \
+        --enable-bzip2 \
+        --enable-iso9660 \
+        --enable-lastfm \
+        --enable-modplug \
+        --enable-zip \
+        --disable-jack \
+        --disable-pulse \
+        --with-zeroconf=no \
+        --enable-lsr 
+        #--enable-cue \
+        #--enable-sqlite \
+        #--enable-mms \
+        #--enable-mvp \
+
+    # Build Source
+    make || return 1
+
+    # Install Source
+    make prefix=$pkgdir/usr install
+
+    # Remove Build Directory
+    rm -r $srcdir/$_gitname-build/
+
+    # Create Directories
+    install -d $pkgdir/var/{log/mpd,run/mpd,lib/mpd/playlists}
+
+    # Install init Script
+    install -D -m755 $srcdir/mpd.init \
+        $pkgdir/etc/rc.d/mpd
+
+    # Install Sample Config
+    install -D -m644 $srcdir/mpd/doc/mpdconf.example \
+        $pkgdir/etc/mpd.conf.example
+
+    # Modify Sample Config with Proper Directories and User Settings
+    /bin/sed -i 's|music_directory.*$|#music_directory "path_to_your_music_collection"|1' $pkgdir/etc/mpd.conf.example
+    /bin/sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' $pkgdir/etc/mpd.conf.example
+    /bin/sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' $pkgdir/etc/mpd.conf.example
+    /bin/sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' $pkgdir/etc/mpd.conf.example
+    /bin/sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' $pkgdir/etc/mpd.conf.example
+    /bin/sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' $pkgdir/etc/mpd.conf.example
+    /bin/sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' $pkgdir/etc/mpd.conf.example
+    /bin/sed -i 's|#user.*$|user "mpd"|1' $pkgdir/etc/mpd.conf.example
+}
+
diff --git a/mpd-git/mpd.init b/mpd-git/mpd.init
new file mode 100644
index 0000000..76ec1c0
--- /dev/null
+++ b/mpd-git/mpd.init
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting Music Player Daemon"
+    /usr/bin/mpd /etc/mpd.conf &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon mpd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Music Player Daemon"
+    /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon mpd
+      stat_done
+    fi
+    ;;
+  create-db)
+    stat_busy "Creating mpd's database ..."
+	logpath="/var/log/mpd/mpd.db-creation"
+    /usr/bin/mpd --create-db /etc/mpd.conf > $logpath \
+        && stat_busy "Output written to $logpath"
+              stat_done
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart|create-db}"
+esac
+exit 0
diff --git a/mpd-git/mpd.install b/mpd-git/mpd.install
new file mode 100644
index 0000000..b9d6851
--- /dev/null
+++ b/mpd-git/mpd.install
@@ -0,0 +1,27 @@
+# arg 1:  the new package version
+post_install() {
+  echo "==> mpd: Create a config under /etc/mpd.conf before using MPD (Example: /etc/mpd.conf.example)"
+  groupadd -g 45 mpd &>/dev/null
+  useradd -u 45 -g mpd -d /var/lib/mpd -s /bin/true mpd &>/dev/null
+  gpasswd -a mpd audio &>/dev/null
+  chown mpd:mpd -R /var/{lib,log,run}/mpd
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  echo "==> mpd: upgrade from 0.11 -> 0.12: configuration file syntax changed, "
+  echo "==> mpd: make sure to update your configuration file! See example conf: /etc/mpd.conf.example"
+  echo "==> mpd: If you install any of the optional dependencies, you will have to rebuild this package."
+  post_install $1
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  userdel mpd &>/dev/null
+}
+
+op=$1
+shift
+
+$op $*
diff --git a/ncdu/PKGBUILD b/ncdu/PKGBUILD
new file mode 100644
index 0000000..e15c81b
--- /dev/null
+++ b/ncdu/PKGBUILD
@@ -0,0 +1,19 @@
+# Contributor: lp76 <l.peduto@gmail.com>
+pkgname=ncdu
+pkgver=1.5
+pkgrel=1
+pkgdesc="An NCurses version of the famous old 'du' unix command"
+arch=('i686' 'x86_64')
+url="http://dev.yorhel.nl/ncdu/"
+license=('MIT')
+depends=('ncurses')
+source=(http://dev.yorhel.nl/download/$pkgname-$pkgver.tar.gz)
+md5sums=('90a69cc3b2e9f0324eb14e6ce1df0f22')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make || return 1
+  make DESTDIR=$pkgdir install || return 1
+  install -D COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/siege/PKGBUILD b/siege/PKGBUILD
index dfd7def..b21733d 100644
--- a/siege/PKGBUILD
+++ b/siege/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Sven Kauber <celeon@gmail.com>
 
 pkgname=siege
-pkgver=2.67
+pkgver=2.68
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -20,5 +20,5 @@ build() {
   mv ${pkgdir}/{bin,man} ${pkgdir}/usr/
   find ${pkgdir} -name '*.la' -delete;
 }
-md5sums=('ea7b07b4323c2ae13a070e85fad18bbe')
-sha256sums=('0a65b0c4bc449dd262490faeb05f674ed8359d9971faf4c5a905a1c85752dac6')
+md5sums=('ad7f5a456f6d46cc319b6196819edb31')
+sha256sums=('4bfc4e846ad924d06f459b1cd84314929a8f59ea65ab74b728b9c41791966c14')
diff --git a/stfl/ChangeLog b/stfl/ChangeLog
new file mode 100644
index 0000000..d838703
--- /dev/null
+++ b/stfl/ChangeLog
@@ -0,0 +1,10 @@
+* 2009-05-02 by pfleidi
+	- update to 0.20
+* 2008-02-09 by hrist
+	- update to 0.18
+* 2008-01-04 by hrist
+	- fixed the make command invocation (thanks to byte for the hint)
+* 2007-09-28 by hrist
+	- removed the patch (thanks to xio for the hint)
+* 2007-06-01 by STiAT
+	- made package build (patchfile global_stfl.patch)
diff --git a/stfl/PKGBUILD b/stfl/PKGBUILD
new file mode 100644
index 0000000..ad962de
--- /dev/null
+++ b/stfl/PKGBUILD
@@ -0,0 +1,20 @@
+# Contributor: Sven Pfleiderer <pfleidi@roothausen.de>
+pkgname=stfl
+pkgver=0.20
+pkgrel=1
+pkgdesc="It's a library which implements a curses-based widget set for text terminals."
+url="http://clifford.at/stfl/"
+license=('GPL')
+depends=('ncurses')
+arch=('i686' 'x86_64')
+options=('!libtool')
+source=(http://clifford.at/stfl/$pkgname-$pkgver.tar.gz stfl-archlinux.patch)
+md5sums=('905e0b8f81fe1b5c95b8d78f56df966b' '075895965f877ac1718096760dcd1e3f')
+
+build() {
+  cd $startdir/src/$pkgname-$pkgver
+  patch -p0 < $startdir/stfl-archlinux.patch || return 1
+  make prefix=/usr Makefile.deps || return 1
+  make prefix=/usr || return 1
+  make prefix=/usr DESTDIR=$startdir/pkg install
+}
diff --git a/stfl/stfl-archlinux.patch b/stfl/stfl-archlinux.patch
new file mode 100644
index 0000000..9161308
--- /dev/null
+++ b/stfl/stfl-archlinux.patch
@@ -0,0 +1,52 @@
+diff -Naur ./Makefile.cfg ../stfl-0.19-patched/Makefile.cfg
+--- ./Makefile.cfg	2007-09-20 01:24:14.000000000 +0200
++++ ../stfl-0.19-patched/Makefile.cfg	2008-09-16 02:05:58.000000000 +0200
+@@ -18,11 +18,11 @@
+ #  MA 02110-1301 USA
+ #
+ 
+-export prefix ?= /usr/local
++export prefix ?= /usr
+ export DESTDIR ?= /
+ 
+ ifneq ($(shell spl-config --cflags 2>/dev/null),)
+-FOUND_SPL = 1
++FOUND_SPL = 0
+ else
+ FOUND_SPL = 0
+ endif
+@@ -34,19 +34,19 @@
+ endif
+ 
+ ifneq ($(shell perl -le 'print 1' 2>/dev/null),)
+-FOUND_PERL5 = 1
++FOUND_PERL5 = 0
+ else
+ FOUND_PERL5 = 0
+ endif
+ 
+ ifneq ($(shell python -c 'print 1' 2>/dev/null),)
+-FOUND_PYTHON = 1
++FOUND_PYTHON = 0
+ else
+ FOUND_PYTHON = 0
+ endif
+ 
+ ifneq ($(shell ruby -e 'puts 1' 2>/dev/null),)
+-FOUND_RUBY = 1
++FOUND_RUBY = 0
+ else
+ FOUND_RUBY = 0
+ endif
+diff -Naur ./stfl_internals.h ../stfl-0.19-patched/stfl_internals.h
+--- ./stfl_internals.h	2008-05-06 11:44:36.000000000 +0200
++++ ../stfl-0.19-patched/stfl_internals.h	2008-09-16 02:08:04.000000000 +0200
+@@ -28,7 +28,7 @@
+ #endif
+ 
+ #include "stfl.h"
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #include <pthread.h>
+ 
+ struct stfl_widget_type;
diff --git a/tcc-git/PKGBUILD b/tcc-git/PKGBUILD
index de73113..efbe871 100644
--- a/tcc-git/PKGBUILD
+++ b/tcc-git/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=tcc-git
-pkgver=20090327
+pkgver=20090406
 pkgrel=1
 pkgdesc="Tiny C Compiler - small, simple, and fast single-pass C compiler"
 arch=('i686' 'x86_64')
diff --git a/vi/PKGBUILD b/vi/PKGBUILD
index 23bbe4a..4aa7877 100644
--- a/vi/PKGBUILD
+++ b/vi/PKGBUILD
@@ -1,73 +1,30 @@
 # $Id$
-# Maintainer: tobias [ tobias at archlinux org ]
+# Maintainer: tobias [ tobias funnychar archlinux org ]
+# Contributor: flx <effelleks@googlemail.com>
 
 pkgname=vi
-_srcver=7.2
-_patchlevel=132
-pkgver=${_srcver}.${_patchlevel}
+_pkgname=nvi
+pkgver=1.81.6
 pkgrel=1
-pkgdesc="a highly configurable, improved version of the vi text editor (basic version)"
-arch=(i686 x86_64)
-license=('custom:vim')
-url="http://www.vim.org"
+pkgdesc='A reimplementation of the ex/vi text editors with unicode support.'
+arch=('i686' 'x86_64')
+url='http://www.kotnet.org/~skimo/nvi/'
+license=('custom:nvi')
 groups=('base')
-depends=('glibc' 'ncurses' 'coreutils')
-makedepends=('wget' 'sed' 'grep' 'gettext')
-backup=(etc/virc)
-install=${pkgname}.install
-# we need the extra-stuff to get all patches applied smoothly
-source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
-        fetch_patches.sh fetch_runtime.sh)
+conflicts=('nvi-unicode')
+depends=('bash' 'db')
+options=(!libtool force)
+source=(http://www.kotnet.org/~skimo/nvi/devel/${_pkgname}-${pkgver}.tar.bz2 \
+        db47-hack.patch)
+md5sums=('88d1e23115ee9f2961186b62e55f5704' 'f9dd0ee3b00e1a9915c49acc5a241a6d')
 
-build()
-{
-  # pull in patches from vim.org (or the src cache alternatively)
-  . ${startdir}/src/fetch_patches.sh
-  . ${startdir}/src/fetch_runtime.sh
-  get_patches || return 1
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
-  # set the virc different from vimrc
-  sed -i 's|^.*\(#define SYS_VIMRC_FILE.*"\) .*$|\1|' src/feature.h
-  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' src/feature.h
-  sed -i 's|^.*\(#define USR_VIMRC_FILE\t"\).*$|\1$HOME/.virc"|' src/feature.h
-  sed -i 's|/etc/vimrc|/etc/virc|' src/feature.h
-  sed -i 's|\.vimrc|.virc|' src/feature.h
-  # build party
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \
-    --with-compiledby=ArchLinux --with-features=normal \
-    --with-global-runtime=/usr/share/vim --with-vim-name=vi \
-    --disable-gpm --disable-acl --with-x=no --disable-gui --enable-multibyte
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}/
+  patch -p1 <../db47-hack.patch
+  cd ./build.unix
+  ../dist/configure --prefix=/usr --program-prefix= --enable-widechar
   make || return 1
-  make  VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install
-  cd ${startdir}/pkg/usr/bin
-  rm -f vim rvim view rview vidiff
-  ln -s vi evi
-
-  # delete the manpages for vidiff, we don't bother with that symlink since vidiff doesn't work
-  find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \
-   while read mandir; do
-    cd ${mandir}
-    rm -f vidiff.1
-  done
-
-  _runtimedir="${startdir}/pkg/usr/share/vim/"
-  update_runtime
-  install -Dm644 ${startdir}/pkg/usr/share/vim/vimrc_example.vim \
-    ${startdir}/pkg/etc/virc
-  rm -f ${startdir}/pkg/usr/share/vim/gvimrc_example.vim
-  install -dm755 ${startdir}/pkg/usr/share/licenses/vim
-  cd ${startdir}/pkg/usr/share/licenses/vim
-  ln -s ../../vim/doc/uganda.txt license.txt
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
-md5sums=('f0901284b338e448bfd79ccca0041254'
-         '35e04482f07c57221c9a751aaa3b8dac'
-         'd8884786979e0e520c112faf2e176f05'
-         'e19a99604b96080b0dc6e17c643b411f'
-         '92e3dc8844d446c1ecd28e7257a47cb7')
-sha256sums=('914db0f2205ebd6f02878295ec2506036ea7500399db112c61a01491cd9a1d86'
-            '20894ac79672160bfc4f1d2f9f9775b34d944762d655307a91ca96d358faa04d'
-            '11607f539a4518b550bf1606b7d3a6f36c1ffdf566c058e7d94bced78034cd5b'
-            'f7f113c0469f452081987b62b7af795462bf6aaf879693e8118f8f178727351c'
-            '43660a058e62b88777971abace58d1a9ffddd895123cd204fd503eb496cd11af')
+## vim:set ts=2 sw=2 et:
diff --git a/vi/db47-hack.patch b/vi/db47-hack.patch
new file mode 100644
index 0000000..f2f206b
--- /dev/null
+++ b/vi/db47-hack.patch
@@ -0,0 +1,27 @@
+diff --git a/cl/cl_main.c b/cl/cl_main.c
+index 0ecbe44..87feb28 100644
+--- a/cl/cl_main.c
++++ b/cl/cl_main.c
+@@ -57,6 +57,9 @@ main(int argc, char **argv)
+ 	int rval;
+ 	char **p_av, **t_av, *ttype;
+ 
++	/* Hack for db-4.7. */
++	unsetenv("LANG");
++	unsetenv("LC_ALL");
+ 	/* If loaded at 0 and jumping through a NULL pointer, stop. */
+ 	if (reenter++)
+ 		abort();
+diff --git a/common/db.h b/common/db.h
+index fd1dc64..00a7ce7 100644
+--- a/common/db.h
++++ b/common/db.h
+@@ -18,7 +18,7 @@
+ 
+ #if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+ #define db_open(db,file,type,flags,mode)				\
+-    (db)->open(db, NULL, file, NULL, type, flags, mode)
++    (db)->open(db, NULL, file, NULL, type, flags | DB_CREATE, mode)
+ #else
+ #define db_open(db,file,type,flags,mode)				\
+     (db)->open(db, file, NULL, type, flags, mode)
\ No newline at end of file
diff --git a/vim/PKGBUILD b/vim/PKGBUILD
index 6831c1c..715ba02 100644
--- a/vim/PKGBUILD
+++ b/vim/PKGBUILD
@@ -3,67 +3,66 @@
 
 pkgname=vim
 _srcver=7.2
-_patchlevel=132
+_patchlevel=166
 pkgver=${_srcver}.${_patchlevel}
-pkgrel=1.1
-pkgdesc="a highly configurable, improved version of the vi text editor"
+pkgrel=1
+pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
 arch=(i686 x86_64)
 license=('custom:vim')
 url="http://www.vim.org"
-depends=("vi>=${pkgver}" 'perl' 'acl' 'gpm>=1.20.4' 'libxt' 'python')
-makedepends=('wget' 'sed' 'grep')
+groups=('base')
+depends=('gpm' 'coreutils')
+makedepends=('wget' 'sed' 'grep' 'gettext' 'perl')
+optdepends=('perl:    the runtime provides a view useful perl scripts')
 backup=(etc/vimrc)
 install=${pkgname}.install
 # we need the extra-stuff to get all patches applied smoothly
 source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
-        fetch_patches.sh)
+        fetch_patches.sh fetch_runtime.sh)
 
 build()
 {
+  _versiondir="vim"$(echo ${_srcver} | sed "s/\.//")
   # pull in patches from vim.org (or the src cache alternatively)
-  . ${startdir}/src/fetch_patches.sh
+  . ${srcdir}/fetch_patches.sh
+  . ${srcdir}/fetch_runtime.sh
   get_patches || return 1
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
+  cd ${srcdir}/${_versiondir}
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h
+  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' src/feature.h
   # build party
   ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \
     --with-compiledby=ArchLinux --with-features=big \
-    --with-x=yes --disable-gui \
-    --with-global-runtime=/usr/share/vim --with-vim-name=vim \
+    --enable-gpm --enable-acl --with-x=no --disable-gui \
     --enable-multibyte --enable-cscope \
-    --enable-perlinterp --enable-pythoninterp 
+    --enable-perlinterp
+    #--with-global-runtime=/usr/share/vim --with-vim-name=vim \
   make || return 1
-  make  VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install
-  cd ${startdir}/pkg/usr/bin
-  rm -f ex view rview xxd vimtutor
-  ln -s vitutor vimtutor
+  make  VIMRCLOC=/etc DESTDIR=${pkgdir} install
+  cd ${pkgdir}/usr/bin
+  rm ex view          # provided by (n)vi in core
+  mv vim vim-normal   # we create a vim-symlink on post_install
+  ln -sf vim-normal vim
+  # ... make g* related symlinks point directly to the actual binary
+  ln -sf vim-normal rview
+  ln -sf vim-normal rvim
+  ln -sf vim-normal vimdiff
 
-   # delete the manpages/symlinks provided by vi package
-  find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \
+  # delete some manpages
+  find ${pkgdir}/usr/share/man -type d -name 'man1' 2> /dev/null | \
    while read mandir; do
     cd ${mandir}
-    mv vimdiff.1 vimdiff.org
-    rm -f *.1
-    ln -s rvi.1.gz rvim.1.gz
-    ln -s vi.1.gz vim.1.gz
-    ln -s vitutor.1.gz vimtutor.1.gz
-    mv vimdiff.org vimdiff.1
+    rm -f ex.1 view.1       # provided by (n)vi
+    rm -f evim.1            # this does not make sense in the console version
   done
 
-  # kill the nobackup parts
-  sed -i '/vms/,+4 d' ${startdir}/pkg/usr/share/vim/vimrc_example.vim
-  install -Dm644 ${startdir}/pkg/usr/share/vim/vimrc_example.vim \
-    ${startdir}/pkg/etc/vimrc
-  # clean all settings and controls -  served by vi package
-  rm -rf ${startdir}/pkg/usr/share/vim
+  _runtimedir="${pkgdir}/usr/share/vim/${_versiondir}/"
+  update_runtime
+  install -Dm644 ${_runtimedir}/vimrc_example.vim \
+    ${pkgdir}/etc/vimrc
+  install -dm755 ${pkgdir}/usr/share/licenses/vim
+  cd ${pkgdir}/usr/share/licenses/vim
+  ln -s ../../vim/${_versiondir}/doc/uganda.txt license.txt
 }
-md5sums=('f0901284b338e448bfd79ccca0041254'
-         '35e04482f07c57221c9a751aaa3b8dac'
-         'd8884786979e0e520c112faf2e176f05'
-         'f16f81339ea02b6e1a736264861b7fad')
-sha256sums=('914db0f2205ebd6f02878295ec2506036ea7500399db112c61a01491cd9a1d86'
-            '20894ac79672160bfc4f1d2f9f9775b34d944762d655307a91ca96d358faa04d'
-            '11607f539a4518b550bf1606b7d3a6f36c1ffdf566c058e7d94bced78034cd5b'
-            'ca1318de5f37712afa532e87e0a201ad4dadcfe6d3b1382d571ea4c621bd07ed')
diff --git a/vim/vim.install b/vim/vim.install
index 1d46e19..0666b3b 100644
--- a/vim/vim.install
+++ b/vim/vim.install
@@ -1,37 +1,36 @@
 post_install() {
-  # if we have an existing gvim installation - relocate binaries and symlinks
-  if [ -f usr/bin/vim ] ; then
+  # if gvim is installed make vim a symlink to vim-big
+  if [ -f usr/bin/vim-big ] ; then
     cd usr/bin
-    rm -f view rview
-    ln -s vim view
-    ln -s vim rview
+    rm -f vim
+    ln -sf vim-big vim
     cd ${OLDPWD}
-    echo "Create vim related symlinks..."
+    echo "Create gvim related symlinks..."
   fi
-  echo -n "Updating vim help tags..."
-  usr/bin/vim --noplugins -u NONE -U NONE \
+  echo -n "Updating vi help tags..."
+  usr/bin/vi --noplugins -u NONE -U NONE \
     --cmd ":helptags usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
   echo "done."
 }
 
-pre_remove() {
-  cd usr/bin
-  rm -f view rview
-  if [ -f usr/bin/vi ] ; then
-    ln -s vi view
-    ln -s vi rview
-    echo "Create vi related symlinks..."
+post_remove() {
+  # By all dependencies in the world, that shall never happen, because
+  # gvim depends on vim ... but then there is always pacman -Rd ...
+
+  # if gvim is installed make vim a symlink to vim-big
+  if [ -f usr/bin/vim-big ] ; then
+    cd usr/bin
+    rm -f vim
+    ln -sf vim-big vim
+    cd ${OLDPWD}
+    echo "Create gvim related symlinks..."
   fi
-  cd ${OLDPWD}
 }
 
 post_upgrade() {
   post_install $1
 }
 
-pre_upgrade() {
-  pre_remove $2
-}
 
 op=$1
 shift
diff --git a/vlc-git/PKGBUILD b/vlc-git/PKGBUILD
index ed2174f..c94dd85 100644
--- a/vlc-git/PKGBUILD
+++ b/vlc-git/PKGBUILD
@@ -1,7 +1,7 @@
 #Contributor: MacWolf <macwolf@archlinux.de>
 
 pkgname=vlc-git
-pkgver=20090326
+pkgver=20090425
 pkgrel=1
 pkgdesc="VideoLAN Client is a multi-platform MPEG, VCD/DVD, and DivX player.Development GIT Version."
 depends=('libmad' 'libmpeg2' 'ffmpeg' \