Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/cegui/PKGBUILD
	community-testing/darktable/PKGBUILD
	community-testing/freewrl/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gource/PKGBUILD
	community-testing/luminancehdr/PKGBUILD
	community-testing/luxrays/PKGBUILD
	community-testing/luxrender/PKGBUILD
	community-testing/megaglest/PKGBUILD
	community-testing/openimageio/PKGBUILD
	community-testing/performous/PKGBUILD
	community-testing/projectm/PKGBUILD
	community-testing/rss-glx/PKGBUILD
	community-testing/sfml/PKGBUILD
	community-testing/spring/PKGBUILD
	community-testing/supertux/PKGBUILD
	community-testing/widelands/PKGBUILD
	community-testing/xbmc/PKGBUILD
	community-testing/xbmc/xbmc.install
	community/plan9port/PKGBUILD
	community/v8/PKGBUILD
	multilib/dev86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/bzflag/PKGBUILD
	testing/calligra/PKGBUILD
	testing/cinepaint/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/enblend-enfuse/PKGBUILD
	testing/gcc/PKGBUILD
	testing/gegl/PKGBUILD
	testing/glew/PKGBUILD
	testing/glibc/PKGBUILD
	testing/glibc/glibc.install
	testing/glibc/nscd.service
	testing/gnome-documents/PKGBUILD
	testing/hugin/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/opencv/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/tracker/PKGBUILD
	testing/transcode/PKGBUILD
	testing/transcode/ffmpeg-0.11.patch
	testing/xf86-video-nouveau/PKGBUILD
	testing/xine-lib/PKGBUILD

2 files changed, 30 insertions, 32 deletions

diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index fa8b45e8b..7d454558f 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,11 +1,13 @@
-# $Id: PKGBUILD 73814 2012-07-15 22:19:23Z cbrannon $
+# $Id: PKGBUILD 78790 2012-10-24 21:59:59Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
+
 pkgname=plan9port
-pkgver=20120715
+pkgver=20121022
 pkgrel=1
-pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems"
+pkgdesc='Port of many programs from Plan 9'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://swtch.com/plan9port/"
 license=('custom')
@@ -14,17 +16,28 @@ optdepends=('python2: for the codereview script')
 provides=('plan9')
 install=plan9.install
 source=(http://swtch.com/$pkgname/$pkgname-$pkgver.tgz plan9.sh)
+sha256sums=('1293b5d2e46d0d6f7be2adbdb285ce278a25c77e88b5cd7c230e16a47d0f8638'
+            '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d')
+
+build() {
+  cd "$srcdir/plan9"
+
+  ./INSTALL -b
+}
+
+package() {
+  cd "$srcdir/plan9"
 
-build()
-{
-  install -Dm755 "$srcdir/plan9.sh" "$pkgdir/etc/profile.d/plan9.sh" || return 1
+  install -Dm755 ../plan9.sh $pkgdir/etc/profile.d/plan9.sh
 
-  install -dm755 "$pkgdir/opt" "$pkgdir/usr/share/doc/$pkgname" || return 1
-  mv "$srcdir/plan9" "$pkgdir/opt"
+  mkdir -p "$pkgdir/opt"
+  cp -r $srcdir/plan9 $pkgdir/opt/
 
+  mkdir -p $pkgdir/usr/share/doc/$pkgname
   cd "$pkgdir/opt/plan9"
-  ./INSTALL || return 1
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1
+  ./INSTALL -c -r "$pkgdir/opt/plan9"
+
+  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
   # Don't need these under /opt/plan9.
   rm -rf .hg/
@@ -33,21 +46,18 @@ build()
   rm -f config install.log install.sum install.txt configure Makefile INSTALL \
     LICENSE
 
-  borkedfiles=`grep -r "$pkgdir"/opt/plan9 * | grep -v Binary | cut -d\: -f1`
-  for f in $borkedfiles; do
-    echo "fixing hardcoded paths in $f"
-    sed -i "s@$pkgdir/opt/plan9@/opt/plan9@" $f || return 1
+  msg2 "Fixing hardcoded paths..."
+  for f in `grep -H -r "$pkgdir/opt/plan9" | cut -d: -f1`; do
+    echo -n "\t$f"
+    [ -e "$f" ] && sed -i "s:$pkgdir/opt/plan9:/opt/plan9:" "$f" || true
   done
 
   find "$pkgdir" -name '*.py' -print0 |xargs -0 \
-    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
+    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/python2,' \
     -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
 
-  for i in CHANGES CONTRIBUTORS README TODO
-    do
-    install -m644 $i "$pkgdir/usr/share/doc/$pkgname" || return 1
+  for i in CHANGES CONTRIBUTORS README TODO; do
+    install -m644 $i "$pkgdir/usr/share/doc/$pkgname"
     rm -f $i
   done
 }
-md5sums=('1e0698aa5f652a1a47227be2b25fa8fd'
-         '9695eb15a247e23140e8a35ff52a5c20')
diff --git a/community/plan9port/plan9.install b/community/plan9port/plan9.install
index 63b8dd0da..97ca74fa6 100644
--- a/community/plan9port/plan9.install
+++ b/community/plan9port/plan9.install
@@ -1,7 +1,3 @@
-pre_install() {
-  /bin/true
-}
-
 post_install() {
   echo "==> Decompressing plan9 man pages"
   for i in `find /opt/plan9/man -type f`; do
@@ -17,26 +13,18 @@ post_install() {
   echo "==> Please log off or 'source /etc/profile.d/plan9.sh'"
   echo "==> Run '9 man 1 intro | less' to begin"
   source /etc/profile.d/plan9.sh
-  /bin/true
 }
 
 pre_upgrade() {
   post_remove
-  /bin/true
 }
 
 post_upgrade() {
   post_install
-  /bin/true
-}
-
-pre_remove() {
-  /bin/true
 }
 
 post_remove() {
   #we had to unpack them so they won't get removed....
   rm -rf /opt/plan9/man
-  /bin/true
 }