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

[Alexander Rødseth]

    Date: Monday, December 16, 2013 @ 22:54:30
  Author: arodseth
Revision: 102624

upgpkg: plan9port 20131024-2

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

---------------+
 PKGBUILD      |   26 ++++++++++++++------------
 plan9.install |    8 --------
 plan9.sh      |    2 +-
 3 files changed, 15 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-16 20:12:56 UTC (rev 102623)
+++ PKGBUILD	2013-12-16 21:54:30 UTC (rev 102624)
@@ -6,7 +6,7 @@
 
 pkgname=plan9port
 pkgver=20131024
-pkgrel=1
+pkgrel=2
 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
 arch=('x86_64' 'i686')
 url='http://swtch.com/plan9port/'
@@ -19,20 +19,22 @@
 source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tgz"
         'plan9.sh')
 sha256sums=('5cba7856bdb35a96a923120e61d320d424fee1a6f09b7af3e87eb7814a747d4f'
-            '3d899c30f289c20eecedf9961d61c0c9dfe4c0dc9b1a7642aca25e0534883cf2')
+            'c216efa3455ba0b22b1723ae62e4c1e21b3a776a760d8fcedb902ff994b701c1')
 
 package() {
   cd "$pkgname"
 
-  d=/usr/local
+  # 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/$pkgname" "$pkgdir/$d/"
-  cd "$pkgdir$d/$pkgname"
-  ./INSTALL -c -r "$pkgdir$d/$pkgname"
+  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 @@
     LICENSE
 
   # Fix hardcoded paths
-  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
+  #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 @@
   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

Modified: plan9.install
===================================================================
--- plan9.install	2013-12-16 20:12:56 UTC (rev 102623)
+++ plan9.install	2013-12-16 21:54:30 UTC (rev 102624)
@@ -6,11 +6,3 @@
   echo "==> Run '9 man 1 intro | less' to begin"
   source /etc/profile.d/plan9.sh
 }
-
-post_upgrade() {
-  post_install
-}
-
-pre_upgrade() {
-  post_remove
-}

Modified: plan9.sh
===================================================================
--- plan9.sh	2013-12-16 20:12:56 UTC (rev 102623)
+++ plan9.sh	2013-12-16 21:54:30 UTC (rev 102624)
@@ -1,2 +1,2 @@
-export PLAN9=/usr/local/plan9port
+export PLAN9=/usr/local/plan9
 export PATH=$PATH:$PLAN9/bin