Fri Dec 27 23:54:04 UTC 2013

2 files changed, 18 insertions, 29 deletions

diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 909641caa..d7082d675 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 99408 2013-10-28 11:45:43Z arodseth $
+# $Id: PKGBUILD 102625 2013-12-16 21:54:40Z 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=20130927
-pkgrel=3
+pkgver=20131024
+pkgrel=2
 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
 arch=('x86_64' 'i686')
 url='http://swtch.com/plan9port/'
@@ -16,23 +16,25 @@ optdepends=('python2: for the codereview script')
 provides=('plan9')
 install='plan9.install'
 options=('!zipman' 'staticlibs')
-source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz"
+source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tgz"
         'plan9.sh')
-sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542'
+sha256sums=('5cba7856bdb35a96a923120e61d320d424fee1a6f09b7af3e87eb7814a747d4f'
             'c216efa3455ba0b22b1723ae62e4c1e21b3a776a760d8fcedb902ff994b701c1')
 
 package() {
-  cd plan9
+  cd "$pkgname"
 
-  d=/usr/local # /opt
+  # TODO: Find a way to install in a better directory than /usr/local/plan9
+
+  d=usr/local
 
   ./INSTALL -b
   install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh"
-  install -d "$pkgdir$d"
+  install -d "$pkgdir/$d"
   install -d "$pkgdir/usr/share/doc/$pkgname"
-  cp -r "$srcdir/plan9" "$pkgdir/$d/"
-  cd "$pkgdir$d/plan9"
-  ./INSTALL -c -r "$pkgdir$d/plan9"
+  cp -r "$srcdir/$pkgname" "$pkgdir/$d/plan9"
+  cd "$pkgdir/$d/plan9"
+  ./INSTALL -c -r "$pkgdir/$d/plan9"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Clean up
@@ -43,10 +45,10 @@ package() {
     LICENSE
 
   # Fix hardcoded paths
-  for f in `grep -H -r "$pkgdir$d/plan9" | cut -d: -f1`; do
-    echo -n "\t$f"
-    [ -e "$f" ] && sed -i "s:$pkgdir$d/plan9:$d/plan9:" "$f" || true
-  done
+  #for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do
+  #  echo -n "\t$f"
+  #  [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true
+  #done
 
   # Fix python scripts
   find "$pkgdir" -name '*.py' -print0 |xargs -0 \
@@ -60,7 +62,7 @@ package() {
   done
 
   # Decompress the plan9 man pages
-  for i in `find $pkgdir$d/plan9/man -type f`; do
+  for i in `find $pkgdir/$d/plan9/man -type f`; do
     if [ ${i##*.} = "gz" ]; then
       gunzip "$i"
     fi
diff --git a/community/plan9port/plan9.install b/community/plan9port/plan9.install
index 5c76552f3..1d361127f 100644
--- a/community/plan9port/plan9.install
+++ b/community/plan9port/plan9.install
@@ -6,16 +6,3 @@ post_install() {
   echo "==> Run '9 man 1 intro | less' to begin"
   source /etc/profile.d/plan9.sh
 }
-
-post_upgrade() {
-  post_install
-}
-
-pre_upgrade() {
-  post_remove
-}
-
-post_remove() {
-  #we had to unpack them so they won't get removed....
-  rm -rf /opt/plan9/man
-}