Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/virtualbox/PKGBUILD
	extra/live-media/PKGBUILD

9 files changed, 65 insertions, 54 deletions

diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD
index bbf9396f5..b7f2b1366 100644
--- a/community/csfml/PKGBUILD
+++ b/community/csfml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49432 2011-06-16 04:45:37Z svenstaro $
+# $Id: PKGBUILD 54271 2011-08-16 02:58:49Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=csfml
@@ -6,7 +6,7 @@ pkgname=csfml
 _git=true
 
 if [[ "${_git}" = "true" ]]; then
-    pkgver=1.99.git20110616
+    pkgver=1.99.git20110816
 fi
 
 pkgrel=1
@@ -17,8 +17,8 @@ license=('zlib')
 depends=('sfml')
 makedepends=('git' 'cmake' 'doxygen')
 
-_gitroot='https://github.com/LaurentGomila/SFML.git'
-_gitname='SFML'
+_gitroot='https://github.com/LaurentGomila/CSFML.git'
+_gitname='CSFML'
 
 build() {
   cd "$srcdir"
@@ -39,7 +39,6 @@ build() {
   cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"
 
-  cd bindings/c/
   mkdir build && cd build
   cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
         -DBUILD_DOC=true
@@ -48,7 +47,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_gitname-build/bindings/c/build/"
+  cd "$srcdir/$_gitname-build/build/"
 
   make DESTDIR="$pkgdir/" install
 
diff --git a/community/nethack/PKGBUILD b/community/nethack/PKGBUILD
index 9672a0980..a8b3a3279 100644
--- a/community/nethack/PKGBUILD
+++ b/community/nethack/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 36702 2011-01-06 09:48:20Z schuay $
+# $Id: PKGBUILD 54249 2011-08-15 09:38:46Z schuay $
 # Maintainer : schuay <jakob.gruber@gmail.com>
 # Contributor : kevin <kevin@archlinux.org>
 # Contributor : Christian Schmidt <mucknert@gmx.net>
 # Contributor : Markus Meissner <markus@meissna.de>
+# Contributor : Nick Erdmann <erdmann@date.upb.de>
 
 pkgname=nethack
 pkgver=3.4.3
-pkgrel=5
+pkgrel=6
 pkgdesc='A single player dungeon exploration game'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nethack.org/index.html"
 license=('custom')
 depends=('ncurses' 'gzip')
+install=nethack.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-${pkgver//.}-src.tgz")
 md5sums=('21479c95990eefe7650df582426457f9')
 
@@ -19,7 +21,7 @@ build(){
   cd $srcdir/$pkgname-$pkgver/
   sh sys/unix/setup.sh
 
-  sed -e '/define HACKDIR/ s|/usr/games/lib/nethackdir|/usr/share/nethack/|' \
+  sed -e '/define HACKDIR/ s|/usr/games/lib/nethackdir|/var/games/nethack/|' \
       -e '/^#define COMPRESS\s/ s|/usr/bin/compress|/bin/gzip|' \
       -e '/^#define COMPRESS_EXTENSION/ s|".Z"|".gz"|' \
       -e 's|^/\* \(#define DLB\) \*/|\1|' -i include/config.h
@@ -33,13 +35,13 @@ build(){
   # we are setting up for setgid games, so modify all necessary permissions
   # to allow full access for groups
 
-  sed -e '/^GAMEDIR\s*=/ s|/games/.*$|/share/$(GAME)|' \
+  sed -e '/^GAMEDIR\s*=/ s|/games/.*$|/var/games/$(GAME)|' \
       -e '/^GAMEUID\s*=/ s|games|root|' \
       -e '/^GAMEGRP\s*=/ s|bin|games|' \
       -e '/^GAMEPERM\s*=/ s|04755|02755|' \
       -e '/^FILEPERM\s*=/ s|0644|0664|' \
       -e '/^DIRPERM\s*=/ s|0755|0775|' \
-      -e '/^SHELLDIR\s*=/ s|/games|/bin|' -i Makefile
+      -e '/^SHELLDIR\s*=/ s|/games|/usr/bin|' -i Makefile
 
   sed -e "/^MANDIR\s*=/s|/usr/man/man6|$pkgdir/usr/share/man/man6|" -i doc/Makefile
 
@@ -50,13 +52,14 @@ package() {
   cd $srcdir/$pkgname-$pkgver/
 
   install -dm755 $pkgdir/usr/share/{man/man6,doc/nethack}
-  make PREFIX=$pkgdir/usr install manpages
-  sed -e "s|HACKDIR=$pkgdir/usr/|HACKDIR=/usr/|" \
+  install -dm775 $pkgdir/var/games/
+  make PREFIX=$pkgdir install manpages
+  sed -e "s|HACKDIR=$pkgdir/|HACKDIR=/|" \
       -e 's|HACK=$HACKDIR|HACK=/usr/lib/nethack|' \
       -i $pkgdir/usr/bin/nethack
 
   install -dm755 $pkgdir/usr/lib/nethack
-  mv $pkgdir/usr/share/nethack/{nethack,recover} $pkgdir/usr/lib/nethack/
+  mv $pkgdir/var/games/nethack/{nethack,recover} $pkgdir/usr/lib/nethack/
 
   install -Dm644 doc/Guidebook.txt $pkgdir/usr/share/doc/nethack/Guidebook.txt
       
diff --git a/community/nethack/nethack.install b/community/nethack/nethack.install
new file mode 100644
index 000000000..66ec2aeb5
--- /dev/null
+++ b/community/nethack/nethack.install
@@ -0,0 +1,12 @@
+pre_upgrade() {
+  if(test `vercmp '3.4.3-5' "$2"` -ge 0); then
+    mv /usr/share/nethack /tmp/nethack-backup
+  fi
+}
+
+post_upgrade() {
+  if(test `vercmp '3.4.3-5' "$2"` -ge 0); then
+    rm -rf /var/games/nethack
+    mv /tmp/nethack-backup /var/games/nethack
+  fi
+}
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index e363df9f6..a0cc7f14e 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id$
+# $Id: PKGBUILD 54260 2011-08-15 15:17:24Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=ntop
-pkgver=4.0.3
+pkgver=4.1.0
 pkgrel=1
 pkgdesc='A network traffic probe that shows the network usage.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,10 +12,10 @@ license=('GPL')
 depends=('libevent' 'libpcap' 'gd' 'glib' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua')
 options=('!libtool' '!makeflags')
 install='ntop.install'
-source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tgz"
+source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz"
         'ntop'
         'ntop.conf.d')
-md5sums=('f064393a2090e5bda102cd49c2707789'
+md5sums=('116df99cf548431393991ea15443c52f'
          '7b0d7bb57432e768ff387e9f7236f87c'
          '6a9371de1dcf31d8ef13a4cf349c02b3')
 
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index feb0fb1c1..b0d9ad03a 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 37601 2011-01-15 09:55:00Z giovanni $
+# $Id: PKGBUILD 54266 2011-08-16 00:37:12Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
 _pkgname=Sigil
-pkgver=0.3.4
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="A WYSIWYG ebook editor"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -15,7 +15,7 @@ makedepends=('cmake')
 install=sigil.install
 source=(http://${pkgname}.googlecode.com/files/${_pkgname}-${pkgver}-Code.zip
         ${pkgname}.desktop)
-md5sums=('6f83a8ee12d6f5918fe50b8314e63760'
+md5sums=('b36b8178446647f7dd320a6b335a40ba'
          'fef6aa492af487ccccd6b133635cee5a')
 
 build() {
@@ -36,13 +36,13 @@ build() {
 package() {
   cd ${_pkgname}-${pkgver}-Code/build
 
-  make install DESTDIR="${pkgdir}" || return 1
+  make install DESTDIR="${pkgdir}"
 
-  install -d -m 0755 "${pkgdir}"/usr/share/applications || return 1
-  install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications || return 1
+  install -d -m 0755 "${pkgdir}"/usr/share/applications
+  install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications
 
   for _pic in 16 32 48 128 256; do
     install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
-      "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png || return 1
+      "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png
   done
 }
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index d22d93518..16a9cf725 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=stone-soup
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://crawl.develz.org/'
@@ -14,13 +14,14 @@ install=('stone-soup.install')
 source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2"
         "${pkgname}.desktop")
 md5sums=('3f73fb051215df3633a554d81e67a452'
-         '98be780cddb2a0915bbab15ad93644f1')
+         'afdacb4c39342e75674efb88eeb3da21')
 
 build() {
 
     cd "${srcdir}/stone_soup-${pkgver}/source"
 
-    # adjust makefile to use /usr/bin, owner root:root, disable setgid on executable
+    # adjust makefile to use /usr/bin, owner root:root,
+    # disable setgid on executable
 
     sed -i 's|bin_prefix    := bin|bin_prefix    := usr/bin|' makefile
     sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' makefile
@@ -29,7 +30,7 @@ build() {
     # first build and install tiles version
 
     make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.stone-soup/" \
+         SAVEDIR="~/.crawl/" \
          DATADIR="/usr/share/${pkgname}/data" \
          USE_UNICODE=y \
          TILES=y \
@@ -42,19 +43,22 @@ build() {
     # then build and install console version
 
     make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.stone-soup/" \
+         SAVEDIR="~/.crawl/" \
          DATADIR="/usr/share/${pkgname}/data" \
          USE_UNICODE=y \
          install
 
     # install crawl license
 
-    install -D -m644 ../licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
+    install -D -m644 ../licence.txt \
+        "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
 
     # install icon and .desktop file
 
-    install -D -m644 dat/tiles/stone_soup_icon-32x32.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -D -m644 dat/tiles/stone_soup_icon-32x32.png \
+        "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -D -m644 "${srcdir}/${pkgname}.desktop" \
+        "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
 }
 
diff --git a/community/stone-soup/stone-soup.desktop b/community/stone-soup/stone-soup.desktop
index f87d084c8..f76343515 100644
--- a/community/stone-soup/stone-soup.desktop
+++ b/community/stone-soup/stone-soup.desktop
@@ -1,11 +1,8 @@
-#!/usr/bin/env xdg-open
 [Desktop Entry]
-Version=1.0
 Type=Application
-Name=Stone Soup
-GenericName=Crawl Stone Soup
+Name=Dungeon Crawl Stone Soup 
 Comment=An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting
 Icon=stone-soup.png
 Exec=/usr/bin/crawl-tiles
-Categories=Game;ArcadeGame
+Categories=Game;AdventureGame
 
diff --git a/community/stone-soup/stone-soup.install b/community/stone-soup/stone-soup.install
index 08cb7e01d..2320123e2 100644
--- a/community/stone-soup/stone-soup.install
+++ b/community/stone-soup/stone-soup.install
@@ -1,12 +1,11 @@
 post_upgrade() {
 
-    [[ $(vercmp $2 0.7.1) -ge 0 ]] && return
+    # return if old pkgver >= 0.9.0-2
+    [[ $(vercmp $2 0.9.0-2) -ge 0 ]] && return
 
     echo "---------------------------------------------------------------------
-    stone-soup saves have moved to ~/.stone-soup.
-    if you want to keep your old saves, move /var/games/stone-soup to
-    ~/.stone-soup with your user as owner.
-
-    stone-soup now also includes the tiles version (crawl-tiles)
+    stone-soup saves have moved to ~/.crawl.
+    If you want to keep your old saves, move ~/.stone-soup to
+    ~/.crawl.
 ---------------------------------------------------------------------"
 }
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 69b340f37..d501e1e05 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53837 2011-08-08 20:19:32Z ibiru $
+# $Id: PKGBUILD 54264 2011-08-15 19:54:32Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
-pkgver=4.1.0
-pkgrel=5
+pkgver=4.1.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -15,8 +15,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
         virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
-        change_default_driver_dir.patch
-        fix-kernel-panic.patch)
+        change_default_driver_dir.patch)
 _kernver=3.0-LIBRE
 
 build() {
@@ -26,7 +25,6 @@ build() {
     patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-    patch -Np2 -i "$srcdir/fix-kernel-panic.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -195,8 +193,8 @@ package_virtualbox-archlinux-modules(){
 
     sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-archlinux-modules.install"
 }
-md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
-         '24056c13ddbe2c9b5d135e8c96a53a11'
+md5sums=('945d2c94c15a4f47280be4b01b67e244'
+         'cc75a674add48f8b25af2b5e69530a6f'
          '44efb3c4be214daa453a317d527f1f30'
          '32a232b43852b9a08cb11a7bcd64b347'
          '5f85710e0b8606de967716ded7b2d351'
@@ -204,5 +202,4 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
          '4cf75d9c091199a47a7a1bc2f4e347d9'
          '78ffa67ff131680f1d2b6f06d4325c5b'
          '790a1456345fe74b6b714d71f90a1c6d'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '863107a852607b758b356cd53850679d')
+         '97e193f050574dd272a38e5ee5ebe62b')