From ff560295097626ea55bb75a4c552f9ffb9eb618a Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 23 Jan 2010 21:52:32 +0100
Subject: Maj xorg-xinit#1.2.0-1

---
 xorg/xorg-xinit/.md5sum       |  3 ++-
 xorg/xorg-xinit/Pkgfile       |  6 ++++--
 xorg/xorg-xinit/xinitrc.patch | 20 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 xorg/xorg-xinit/xinitrc.patch

(limited to 'xorg')

diff --git a/xorg/xorg-xinit/.md5sum b/xorg/xorg-xinit/.md5sum
index d649dc921..ad461ba7d 100644
--- a/xorg/xorg-xinit/.md5sum
+++ b/xorg/xorg-xinit/.md5sum
@@ -1 +1,2 @@
-9144097186c3d2454beffe8ac3b53c6e  xinit-1.1.0.tar.bz2
+fe1696cab2fbed6fa059d0cd1c53ac13  xinit-1.2.0.tar.bz2
+07d8d9b81cf35cb6741ace6226c2e8b7  xinitrc.patch
diff --git a/xorg/xorg-xinit/Pkgfile b/xorg/xorg-xinit/Pkgfile
index b5995e5c3..761595946 100644
--- a/xorg/xorg-xinit/Pkgfile
+++ b/xorg/xorg-xinit/Pkgfile
@@ -4,9 +4,10 @@
 # Depends on: xorg-server
 
 name=xorg-xinit
-version=1.1.0
+version=1.2.0
 release=1
-source=(http://xorg.freedesktop.org/releases/individual/app/xinit-$version.tar.bz2)
+source=(http://xorg.freedesktop.org/releases/individual/app/xinit-$version.tar.bz2\
+	xinitrc.patch)
 
 build() {
 	cd xinit-$version
@@ -14,5 +15,6 @@ build() {
 	./configure --prefix=/usr
 
 	make
+	patch -Np1 -i ../xinitrc.patch
 	make DESTDIR=$PKG install
 }
diff --git a/xorg/xorg-xinit/xinitrc.patch b/xorg/xorg-xinit/xinitrc.patch
new file mode 100644
index 000000000..51887a87f
--- /dev/null
+++ b/xorg/xorg-xinit/xinitrc.patch
@@ -0,0 +1,20 @@
+--- xinit-1.2.0/xinitrc.old	2010-01-23 20:42:36.000000000 +0000
++++ xinit-1.2.0/xinitrc	2010-01-23 15:23:09.000000000 +0000
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+ 
+ userresources=$HOME/.Xresources
+ usermodmap=$HOME/.Xmodmap
+@@ -44,7 +45,7 @@
+ 
+ 
+ twm &
+-xclock -geometry 50x50-1+1 &
+-xterm -geometry 80x50+494+51 &
+-xterm -geometry 80x20+494-0 &
+-exec xterm -geometry 80x66+0+0 -name login
++xclock -geometry 50x50-1+1
++#xterm -geometry 80x50+494+51 &
++#xterm -geometry 80x20+494-0 &
++#exec xterm -geometry 80x66+0+0 -name login
-- 
cgit v1.2.3-70-g09d2