[arch-commits] Commit in plan9port/trunk (PKGBUILD plan9.install plan9.sh)

[Alexander Rødseth]

    Date: Tuesday, November 26, 2013 @ 00:32:03
  Author: arodseth
Revision: 101452

upgpkg: plan9port 20131024-1

Modified:
  plan9port/trunk/PKGBUILD
  plan9port/trunk/plan9.install
  plan9port/trunk/plan9.sh

---------------+
 PKGBUILD      |   24 ++++++++++++------------
 plan9.install |    5 -----
 plan9.sh      |    2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-25 21:16:44 UTC (rev 101451)
+++ PKGBUILD	2013-11-25 23:32:03 UTC (rev 101452)
@@ -5,8 +5,8 @@
 # Contributor: Chris Brannon <cmbrannon79 at gmail.com>
 
 pkgname=plan9port
-pkgver=20130927
-pkgrel=3
+pkgver=20131024
+pkgrel=1
 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,23 @@
 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'
-            'c216efa3455ba0b22b1723ae62e4c1e21b3a776a760d8fcedb902ff994b701c1')
+sha256sums=('5cba7856bdb35a96a923120e61d320d424fee1a6f09b7af3e87eb7814a747d4f'
+            '3d899c30f289c20eecedf9961d61c0c9dfe4c0dc9b1a7642aca25e0534883cf2')
 
 package() {
-  cd plan9
+  cd "$pkgname"
 
-  d=/usr/local # /opt
+  d=/usr/local
 
   ./INSTALL -b
   install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh"
   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/"
+  cd "$pkgdir$d/$pkgname"
+  ./INSTALL -c -r "$pkgdir$d/$pkgname"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Clean up
@@ -43,9 +43,9 @@
     LICENSE
 
   # Fix hardcoded paths
-  for f in `grep -H -r "$pkgdir$d/plan9" | cut -d: -f1`; do
+  for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do
     echo -n "\t$f"
-    [ -e "$f" ] && sed -i "s:$pkgdir$d/plan9:$d/plan9:" "$f" || true
+    [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true
   done
 
   # Fix python scripts

Modified: plan9.install
===================================================================
--- plan9.install	2013-11-25 21:16:44 UTC (rev 101451)
+++ plan9.install	2013-11-25 23:32:03 UTC (rev 101452)
@@ -14,8 +14,3 @@
 pre_upgrade() {
   post_remove
 }
-
-post_remove() {
-  #we had to unpack them so they won't get removed....
-  rm -rf /opt/plan9/man
-}

Modified: plan9.sh
===================================================================
--- plan9.sh	2013-11-25 21:16:44 UTC (rev 101451)
+++ plan9.sh	2013-11-25 23:32:03 UTC (rev 101452)
@@ -1,2 +1,2 @@
-export PLAN9=/usr/local/plan9
+export PLAN9=/usr/local/plan9port
 export PATH=$PATH:$PLAN9/bin