6 files changed, 30 insertions, 39 deletions

diff --git a/system/plan9port/README b/system/plan9port/README
index 23f712334a854..aa54f92013cee 100644
--- a/system/plan9port/README
+++ b/system/plan9port/README
@@ -1,8 +1,8 @@
 Plan 9 from User Space (aka plan9port).
 
-Plan 9 from User Space (aka plan9port) is a port of many
-Plan 9 programs from their native Plan 9 environment to
-Unix-like operating systems.
+Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs 
+from their native Plan 9 environment to Unix-like operating systems.
 
-Note: You can use CVS to updtae plan9port. See the cvs(1)
-man page ("9 man cvs") for details on using cvs.
+Note: You can use Mercurial to update plan9port, read
+http://9fans.net/archive/2009/12/108
+http://swtch.com/plan9port/man/man1/hg.html
diff --git a/system/plan9port/plan9port.SlackBuild b/system/plan9port/plan9port.SlackBuild
index 91f94bdd9556c..593860ba1589c 100644
--- a/system/plan9port/plan9port.SlackBuild
+++ b/system/plan9port/plan9port.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for plan9port 
 
-# Copyright (c) 2008, Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# Copyright (c) 2008, Antonio Hernández Blas <hba.nihilismus@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=plan9port
-VERSION=20080416
+VERSION=20091211
 ARCH=${ARCH:-i586}  # There's no use of cflags.
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -64,19 +64,21 @@ cd $TMP
 mv plan9 $PKG/opt
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 # man(1) from plan9port dislikes man pages compressed :)
 
 # To setup some environment variables:
-install -D -m 0755 $CWD/$PRGNAM.sh $PKG/etc/profile.d/$PRGNAM.sh
-install -m 0755 $CWD/$PRGNAM.csh $PKG/etc/profile.d/$PRGNAM.csh
+install -D -m 0755 $CWD/profile.d/$PRGNAM.sh $PKG/etc/profile.d/$PRGNAM.sh
+install -m 0755 $CWD/profile.d/$PRGNAM.csh $PKG/etc/profile.d/$PRGNAM.csh
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $PKG/opt/plan9
-cp -a CHANGES install.txt LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+mv CHANGES install.txt LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Add the window manager 'rio' to xwmconfig's list.
@@ -86,4 +88,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/plan9port/plan9port.info b/system/plan9port/plan9port.info
index f300a154504e3..51e8ff767e56b 100644
--- a/system/plan9port/plan9port.info
+++ b/system/plan9port/plan9port.info
@@ -1,8 +1,10 @@
 PRGNAM="plan9port"
-VERSION="20080416"
+VERSION="20091211"
 HOMEPAGE="http://swtch.com/plan9port/"
-DOWNLOAD="http://swtch.com/plan9port/plan9port-20080416.tgz"
-MD5SUM="2bb40a045666c9d7f23460852d44fdf8"
-MAINTAINER="Antonio Hernández Blas"
+DOWNLOAD="http://swtch.com/plan9port/plan9port-20091211.tgz"
+MD5SUM="d70df9e863d226cbdcb76037accd41db"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Antonio Hernández Blas"
 EMAIL="hba.nihilismus@gmail.com"
-APPROVED="David Somero"
+APPROVED="dsomero"
diff --git a/system/plan9port/plan9port.csh b/system/plan9port/profile.d/plan9port.csh
index f7ea8e2a3318c..f7ea8e2a3318c 100644
--- a/system/plan9port/plan9port.csh
+++ b/system/plan9port/profile.d/plan9port.csh
diff --git a/system/plan9port/plan9port.sh b/system/plan9port/profile.d/plan9port.sh
index 3596bafcc1464..3596bafcc1464 100644
--- a/system/plan9port/plan9port.sh
+++ b/system/plan9port/profile.d/plan9port.sh
diff --git a/system/plan9port/xinitrc.rio b/system/plan9port/xinitrc.rio
index 20cb1751fcd31..5fa29b3f386a5 100644
--- a/system/plan9port/xinitrc.rio
+++ b/system/plan9port/xinitrc.rio
@@ -1,28 +1,15 @@
 #!/bin/sh
-# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/usr/lib/X11/xinit/.Xresources
-sysmodmap=/usr/lib/X11/xinit/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
-    xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
-    xmodmap $usermodmap
-fi
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# Merge in defaults and keymaps
+[ -f $sysresources ] && xrdb -merge $sysresources
+[ -f $sysmodmap ] && xmodmap $sysmodmap
+[ -f $userresources ] && xrdb -merge $userresources
+[ -f $usermodmap ] && xmodmap $usermodmap
 
 # Start the window manager:
 exec rio