Merge branch 'master' of git://dev.alpinelinux.org/aports

author: Ted Trask <ttrask01@yahoo.com> 2009-11-05 21:10:53 +0000
committer: Ted Trask <ttrask01@yahoo.com> 2009-11-05 21:10:53 +0000
commit: 93d66cee3bb101d76748ca7d814204cbfb1d2284 (patch)
tree: 07caa3644848b8d6da8035d6353d17eae82f0c4e
parent: 8b6d2d806f1767023331ed07d4a2fff86cf3c666 (diff)
parent: 783a255238a7ad893471d9cdf0dfac5952bb8a95 (diff)
download: aports-93d66cee3bb101d76748ca7d814204cbfb1d2284.tar.bz2
aports-93d66cee3bb101d76748ca7d814204cbfb1d2284.tar.xz
32 files changed, 377 insertions, 167 deletions
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 0fe38ff91e..df42224053 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -2,14 +2,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
 pkgver=1.2.6
-pkgrel=0
+pkgrel=1
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 license="LGPL-2.1"
 depends=
-makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev"
+makedepends="libcap-dev zlib-dev openssl-dev bzip2-dev postgresql-dev
+	mysql-dev sqlite-dev"
 install="dovecot.pre-install"
-subpackages="$pkgname-doc $pkgname-dev"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-pgsql $pkgname-mysql
+	$pkgname-sqlite"
 source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz
 	dovecot.initd
 	"
@@ -21,13 +23,47 @@ build() {
 		--sysconfdir=/etc/dovecot \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--with-sql=plugin \
+		--with-sql-drivers \
+		--with-mysql \
+		--with-sqlite \
+		--with-pgsql \
 		--with-ssl=openssl || return 1
 
 	make || return 1
-	make DESTDIR="$pkgdir" install
+}
 
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
+_mv() {
+	local i
+	while [ $# -gt 0 ]; do
+		local dir=${1%/*}
+		mkdir -p "$subpkgdir"/$dir
+		mv "$pkgdir/$1" "$subpkgdir/$dir/"
+		shift
+	done
+}
+
+
+pgsql() {
+	pkgdesc="postgresql driver for dovecot"
+	_mv $(cd "$pkgdir" && find usr -name '*pgsql.so')
+}
+
+mysql() {
+	pkgdesc="mysql driver for dovecot"
+	_mv $(cd "$pkgdir" && find usr -name '*mysql.so')
+}
+
+sqlite() {
+	pkgdesc="sqlite driver for dovecot"
+	_mv $(cd "$pkgdir" && find usr -name '*sqlite.so')
+}
+
 md5sums="807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd"
diff --git a/testing/iftop/APKBUILD b/main/iftop/APKBUILD
index db210d4933..db210d4933 100644
--- a/testing/iftop/APKBUILD
+++ b/main/iftop/APKBUILD
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 292d1942e4..efaeaaf9cb 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
-pkgver=1.5.2
-pkgrel=7
+pkgver=1.5.3
+pkgrel=0
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -10,10 +10,10 @@ pkggroups="kamailio"
 license="GPL"
 depends=
 makedepends="bison flex expat-dev postgresql-dev mysql-dev pcre-dev
-	libxml2-dev curl-dev"
+	libxml2-dev curl-dev unixodbc-dev"
 install=
 subpackages="$pkgname-doc $pkgname-mysql $pkgname-postgres $pkgname-pcre
-	$pkgname-presence $pkgname-mediaproxy"
+	$pkgname-presence $pkgname-mediaproxy $pkgname-unixodbc"
 source="http://www.kamailio.org/pub/kamailio/$pkgver/src/$pkgname-$pkgver-notls_src.tar.gz
 	kamailio.cfg
 	kamailio.initd
@@ -41,7 +41,7 @@ build() {
 		MODS_PRESENCE=yes \
 		MODS_RADIUS= \
 		TLS= \
-		include_modules="db_postgres mediaproxy" \
+		include_modules="db_postgres mediaproxy db_unixodbc" \
 		all || return 1
 	make prefix=/usr \
 		cfg-dir=/etc/kamailio/ \
@@ -50,7 +50,7 @@ build() {
 		MODS_PRESENCE=yes \
 		MODS_RADIUS= \
 		TLS= \
-		include_modules="db_postgres mediaproxy" \
+		include_modules="db_postgres mediaproxy db_unixodbc" \
 		basedir="$pkgdir" install || return 1
 
 	# move default config to -doc package and use our own default config
@@ -108,7 +108,13 @@ mediaproxy() {
 	_mv_mod mediaproxy
 }
 
-md5sums="6c6f4ed6fbcb4d008b8ac3de5b99ce99  kamailio-1.5.2-notls_src.tar.gz
+unixodbc() {
+	pkgdesc="UnixODBC support for kamailio"
+	depends="kamailio"
+	_mv_mod db_unixodbc
+}
+
+md5sums="17eeea5cdc2fdd28b2f9a1bad6598de2  kamailio-1.5.3-notls_src.tar.gz
 eb665248ee39cf755a247286affc5cbb  kamailio.cfg
 81100c479890a2a8c2628db22fdd1a0c  kamailio.initd
 c646af2dd31f5c4289a2f802c873d98f  kamailio.pre-install
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index ea564c225b..76c10fab30 100644
--- a/main/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
@@ -1,32 +1,39 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mysql
-pkgver=5.0.83
-pkgrel=1
+pkgver=5.1.40
+pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mysql.com/"
 license='GPL'
 depends=
-makedepends="libtool uclibc++-dev readline-dev openssl-dev ncurses-dev zlib-dev"
-source="http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.0/${pkgname}-${pkgver}.tar.gz
-$pkgname.initd
-$pkgname.mycnf"
+makedepends="libtool readline-dev openssl-dev ncurses-dev zlib-dev"
+source="http://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-5.1/mysql-$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.mycnf"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-test libmysqlclient $pkgname-client"
 
 build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure --prefix=/usr --libexecdir=/usr/sbin \
+		--localstatedir=/var/lib/mysql \
+		--disable-assembler \
+		--with-pthread \
+		--without-libwrap \
+		--without-pstack \
+		--without-docs \
+		--without-embedded-server \
+		--with-ssl \
+		--without-debug \
+		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+		--mandir=/usr/share/man \
+		|| return 1
+
+        make
+}
+
+package() {
         cd "$srcdir/$pkgname-$pkgver"
-	export CXX=g++-uc
-        ./configure --prefix=/usr --libexecdir=/usr/sbin \
-        --localstatedir=/var/lib/mysql \
-        --disable-assembler --with-pthread \
-        --without-raid --without-libwrap \
-        --without-pstack --without-docs \
-        --without-embedded-server --with-openssl \
-        --without-mysqlfs --without-vio \
-        --without-bench --without-debug \
-	--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-        --with-innodb --mandir=/usr/share/man || return 1
-        make || return 1
         make -j1 DESTDIR="$pkgdir/" install
         install -Dm 755 "$startdir"/$pkgname.initd $pkgdir/etc/init.d/$pkgname
         install -Dm 644 "$startdir"/$pkgname.mycnf $pkgdir/etc/mysql/my.cnf
@@ -65,6 +72,6 @@ client() {
 	done
 }
 
-md5sums="051392064a1e32cca5c23a593908b10e  mysql-5.0.83.tar.gz
+md5sums="32e7373c16271606007374396e6742ad  mysql-5.1.40.tar.gz
 25d08b02bff6aa379dc45859b7a3f28a  mysql.initd
 15a7e3ddd6a40bf5a1eb3a8c69d9c34c  mysql.mycnf"
diff --git a/x11/gtk+/APKBUILD b/x11/gtk+/APKBUILD
index d265461db8..4dd9de118a 100644
--- a/x11/gtk+/APKBUILD
+++ b/x11/gtk+/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk+
 pkgver=2.18.3
-pkgrel=0
+pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 url="http://www.gtk.org/"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
 triggers="$pkgname.trigger:/usr/share/icons/*"
 license="LGPL"
 subpackages="$pkgname-dev $pkgname-doc"
-depends=
+depends="shared-mime-info"
 makedepends="pkgconfig 
 	atk-dev
 	cairo-dev
diff --git a/x11/midori/APKBUILD b/x11/midori/APKBUILD
index ffc50da66e..db8eea7a99 100644
--- a/x11/midori/APKBUILD
+++ b/x11/midori/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=midori
-pkgver=0.1.10
+pkgver=0.2.0
 pkgrel=0
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -22,10 +22,9 @@ makedepends="
 	paxctl
 	"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://archive.xfce.org/src/apps/midori/0.1/$pkgname-$pkgver.tar.bz2"
+source="http://archive.xfce.org/src/apps/midori/${pkgver%.*}/midori-$pkgver.tar.bz2"
 
-build () 
-{ 
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	./configure --prefix=/usr \
 		--jobs=${MAKEFLAGS/-j/} \
@@ -36,9 +35,13 @@ build ()
 		--disable-unique \
 		--enable-nls \
 		|| return 1
-	make || return 1
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	# PAX does not like the JIT
 	paxctl -c -m "$pkgdir"/usr/bin/midori
 }
-md5sums="97b6a3a3ccb8458c68c335b2ee8e9197  midori-0.1.10.tar.bz2"
+md5sums="805e2e59a93a0a4b7652d6547b2bd923  midori-0.2.0.tar.bz2"
diff --git a/x11/shared-mime-info/APKBUILD b/x11/shared-mime-info/APKBUILD
new file mode 100644
index 0000000000..551093e2e3
--- /dev/null
+++ b/x11/shared-mime-info/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=shared-mime-info
+pkgver=0.70
+pkgrel=0
+pkgdesc="Freedesktop.org Shared MIME Info"
+url="http://freedesktop.org/Software/shared-mime-info"
+license="GPL"
+makedepends="libxml2-dev glib-dev intltool"
+depends=
+install="$pkgname.post-deinstall"
+triggers="$pkgname.trigger:/usr/share/mime"
+subpackages="$pkgname-doc"
+source="http://freedesktop.org/~hadess/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--disable-update-mimedb || return 1
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+}
+md5sums="9032d98f14b8e13e0fea4bf45ca23401  shared-mime-info-0.70.tar.bz2"
diff --git a/x11/shared-mime-info/shared-mime-info.post-deinstall b/x11/shared-mime-info/shared-mime-info.post-deinstall
new file mode 100644
index 0000000000..afb88818c7
--- /dev/null
+++ b/x11/shared-mime-info/shared-mime-info.post-deinstall
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+[ -d usr/share/mime ] || exit 0
+
+cd /usr/share/mime
+rm -rf globs globs2 icons treemagic generic-icons types magic XMLnamespaces \
+	subclasses aliases mime.cache \
+	application audio image inode message model multipart text video \
+	x-content x-epoc
+rmdir packages
+cd /
+rmdir usr/share/mime 2>/dev/null
+
+exit 0
diff --git a/x11/shared-mime-info/shared-mime-info.trigger b/x11/shared-mime-info/shared-mime-info.trigger
new file mode 100644
index 0000000000..51a3e4953e
--- /dev/null
+++ b/x11/shared-mime-info/shared-mime-info.trigger
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in "$@"; do
+	if [ -d "$i" ]; then
+		update-mime-database "$i" > /dev/null 2>&1
+	fi
+done
diff --git a/x11/slim/APKBUILD b/x11/slim/APKBUILD
index b6f193f404..6476730e12 100644
--- a/x11/slim/APKBUILD
+++ b/x11/slim/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=slim
 pkgver=1.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Desktop-independent graphical login manager for X11"
 url="http://slim.berlios.de/"
 license="GPL-2"
@@ -11,20 +11,41 @@ depends=""
 install=
 source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
 	$pkgname.logrotate
-	$pkgname-restart.patch"
+	$pkgname.initd
+	slim-1.3.1-gcc4.4.patch
+	slim-restart.patch"
 
-build () 
-{ 
+prepare() {
+	cd "$srcdir/slim-$pkgver"
+	for i in ../*.patch; do
+		patch -p1 -i $i || return 1
+	done
+	sed -i -e 's|#xserver_arguments.*|xserver_arguments   -nolisten tcp vt07|'\
+		-e 's|/var/run/slim.lock|/var/lock/slim.lock|' \
+		-e 's|halt_cmd.*|halt_cmd            /sbin/poweroff|'\
+		-e 's|reboot_cmd.*|reboot_cmd          /sbin/reboot|'\
+		-e 's|console_cmd.*|console_cmd         /usr/bin/terminal|'\
+		-e 's|login_cmd.*|login_cmd           exec /bin/sh -l /etc/X11/xinit/xinitrc|' \
+		-e 's|screenshot_cmd.*|screenshot_cmd      scrot /slim.png|' \
+		-e 's|imagemagick|scrot|' \
+		slim.conf || return 1
+}
+
+build() {
 	cd "$srcdir/slim-$pkgver"
-	patch -Np1 -i "$srcdir/slim-restart.patch" || return 1
 	make CXX="${CXX:-g++}" CC="${CC:-gcc}" || return 1
-	make DESTDIR="$pkgdir" MANDIR=/usr/share/man install || return 1
+}
 
-	install -D -m644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim" || return 1
-	sed -i 's|#xserver_arguments.*|xserver_arguments   -nolisten tcp vt07|' "$pkgdir/etc/slim.conf" || return 1
-	sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "$pkgdir/etc/slim.conf" || return 1
+package() {
+	cd "$srcdir/slim-$pkgver"
+	make DESTDIR="$pkgdir" MANDIR=/usr/share/man install || return 1
 
+	install -D -m755 ../slim.initd "$pkgdir"/etc/init.d/slim || return 1
+	install -D -m644 ../slim.logrotate "$pkgdir"/etc/logrotate.d/slim
 }
+
 md5sums="727d0acb24c0fbf0751134c37a9c895f  slim-1.3.1.tar.gz
 43da096480bf72c3ccec8ad8400f34f0  slim.logrotate
+6ee3a023e56052528295034be809cfc6  slim.initd
+a00df4316e2392fff7e75daf5c826cae  slim-1.3.1-gcc4.4.patch
 648d871fe7d2a97b7d7b928019e2feee  slim-restart.patch"
diff --git a/x11/slim/slim-1.3.1-gcc4.4.patch b/x11/slim/slim-1.3.1-gcc4.4.patch
new file mode 100644
index 0000000000..5708d70717
--- /dev/null
+++ b/x11/slim/slim-1.3.1-gcc4.4.patch
@@ -0,0 +1,17 @@
+Patch to allow compilation with gcc-4.4
+
+Notified by Daniel J. - from Debian bug tracker
+
+http://bugs.gentoo.org/252745
+
+--- a/switchuser.h	2008-11-11 19:40:18.000000000 +0000
++++ b/switchuser.h	2008-11-11 19:40:28.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <paths.h>
++#include <cstdio>
+ #include <iostream>
+ #include "const.h"
+ #include "cfg.h"
+
diff --git a/x11/xf86-video-ark/APKBUILD b/x11/xf86-video-ark/APKBUILD
index 58d66e5edc..b9a51a69de 100644
--- a/x11/xf86-video-ark/APKBUILD
+++ b/x11/xf86-video-ark/APKBUILD
@@ -1,25 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ark
-pkgver=0.7.1
-pkgrel=1
+pkgver=0.7.2
+pkgrel=0
 pkgdesc="X.Org driver for ark cards"
 url="http://xorg.freedesktop.org/"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc"
-makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto
+depends=
+makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
 source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 	./configure --prefix=/usr || return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="be91391f061863617018403cdbd2944f  xf86-video-ark-0.7.1.tar.bz2"
+md5sums="4745f5c722b030962cc56eb2443894a0  xf86-video-ark-0.7.2.tar.bz2"
diff --git a/x11/xf86-video-ati/APKBUILD b/x11/xf86-video-ati/APKBUILD
index 5a7ca0c402..21f6e1957f 100644
--- a/x11/xf86-video-ati/APKBUILD
+++ b/x11/xf86-video-ati/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ati
-pkgver=6.12.2
-pkgrel=3
+pkgver=6.12.4
+pkgrel=0
 pkgdesc="ATI video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -12,19 +12,21 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	xineramaproto
 	"
 
-source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 
 	./configure --prefix=/usr \
 		--enable-dri \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="2bf50461378771497501ca7f678d36f3  xf86-video-ati-6.12.2.tar.bz2"
+md5sums="e662348f6f957fcedf52818d668ab9f5  xf86-video-ati-6.12.4.tar.bz2"
diff --git a/x11/xf86-video-geode/APKBUILD b/x11/xf86-video-geode/APKBUILD
index 1c06ab46a5..c3587c167a 100644
--- a/x11/xf86-video-geode/APKBUILD
+++ b/x11/xf86-video-geode/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-geode
-pkgver=2.11.3
+pkgver=2.11.6
 pkgrel=0
 pkgdesc="AMD Geode GX and LX video driver"
 url="http://xorg.freedesktop.org/"
@@ -10,16 +10,18 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto xf86dgaproto"
 
-source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 	./configure --prefix=/usr || return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="de1d3fe56ae50168d56ea727c4455f2d  xf86-video-geode-2.11.3.tar.bz2"
+md5sums="3ff0dfb4b3bd8872c6efb70371cb6b98  xf86-video-geode-2.11.6.tar.bz2"
diff --git a/x11/xf86-video-intel/APKBUILD b/x11/xf86-video-intel/APKBUILD
index 3655e2f96a..f03952e91a 100644
--- a/x11/xf86-video-intel/APKBUILD
+++ b/x11/xf86-video-intel/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-intel
-pkgver=2.8.1
+pkgver=2.9.1
 pkgrel=0
 pkgdesc="X.Org driver for Intel cards"
 url="http://xorg.freedesktop.org/"
@@ -16,11 +16,10 @@ source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 	./configure --prefix=/usr || return 1
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="7c348fcd8032dc952872e5855920b227  xf86-video-intel-2.8.1.tar.bz2"
+md5sums="8951d0366c16991badb7f9050556f4f3  xf86-video-intel-2.9.1.tar.bz2"
diff --git a/x11/xf86-video-nv/APKBUILD b/x11/xf86-video-nv/APKBUILD
index 72201b0688..210fe15584 100644
--- a/x11/xf86-video-nv/APKBUILD
+++ b/x11/xf86-video-nv/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-nv
-pkgver=2.1.14
-pkgrel=1
+pkgver=2.1.15
+pkgrel=0
 pkgdesc="Nvidia video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -12,14 +12,17 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 
 source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 
 	./configure --prefix=/usr || return 1
-	make || return 1
+	make 
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="118637515155624f8846c481a637c8c2  xf86-video-nv-2.1.14.tar.bz2"
+md5sums="1b22188bd9012a148206940708b52ea6  xf86-video-nv-2.1.15.tar.bz2"
diff --git a/x11/xf86-video-r128/APKBUILD b/x11/xf86-video-r128/APKBUILD
index 0291bc531b..a8645d12ef 100644
--- a/x11/xf86-video-r128/APKBUILD
+++ b/x11/xf86-video-r128/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-r128
 pkgver=6.8.1
-pkgrel=0
+pkgrel=1
 pkgdesc="ATI Rage128 video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -17,8 +17,7 @@ source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 	./configure --prefix=/usr \
 		--enable-dri \
 		|| return 1
diff --git a/x11/xf86-video-radeonhd/APKBUILD b/x11/xf86-video-radeonhd/APKBUILD
index c718234753..500be478b5 100644
--- a/x11/xf86-video-radeonhd/APKBUILD
+++ b/x11/xf86-video-radeonhd/APKBUILD
@@ -1,25 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-radeonhd
-pkgver=1.2.5
-pkgrel=1
+pkgver=1.3.0
+pkgrel=0
 pkgdesc="Experimental Radeon HD video driver."
 url="http://xorg.freedesktop.org/"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc"
-makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto
+depends=
+makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
 source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 	./configure --prefix=/usr || return 1
-	make || return 1
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="10669b08101cb6d69894cc44b47e5094  xf86-video-radeonhd-1.2.5.tar.bz2"
+md5sums="7b6641aa9d836f1621b9b220ad6771b8  xf86-video-radeonhd-1.3.0.tar.bz2"
diff --git a/x11/xf86-video-rendition/APKBUILD b/x11/xf86-video-rendition/APKBUILD
index 9d1e2f2802..8f6f78d316 100644
--- a/x11/xf86-video-rendition/APKBUILD
+++ b/x11/xf86-video-rendition/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-rendition
-pkgver=4.2.2
+pkgver=4.2.3
 pkgrel=0
 pkgdesc="Rendition video driver"
 url="http://xorg.freedesktop.org/"
@@ -12,14 +12,16 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 
 source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 	./configure --prefix=/usr || return 1
-	make || return 1
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="562955e5c0abb19e5f050a100be2c920  xf86-video-rendition-4.2.2.tar.bz2"
+md5sums="9a0a916fe1e7b5c81cd4c80a08e646cc  xf86-video-rendition-4.2.3.tar.bz2"
diff --git a/x11/xf86-video-s3/APKBUILD b/x11/xf86-video-s3/APKBUILD
index edd3483b43..d5d11fb9ef 100644
--- a/x11/xf86-video-s3/APKBUILD
+++ b/x11/xf86-video-s3/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-s3
-pkgver=0.6.2
+pkgver=0.6.3
 pkgrel=0
 pkgdesc="X.Org driver for s3 cards"
 url="http://xorg.freedesktop.org/"
@@ -12,14 +12,16 @@ makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 
 source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 	./configure --prefix=/usr || return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="723f9fc2de66805c1984a37c6d41580e  xf86-video-s3-0.6.2.tar.bz2"
+md5sums="5eb06d88533fb327d067928faeb20860  xf86-video-s3-0.6.3.tar.bz2"
diff --git a/x11/xf86-video-tseng/APKBUILD b/x11/xf86-video-tseng/APKBUILD
index de9726f97d..a5e8140719 100644
--- a/x11/xf86-video-tseng/APKBUILD
+++ b/x11/xf86-video-tseng/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-tseng
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=0
 pkgdesc="Tseng Labs video driver"
 url="http://xorg.freedesktop.org/"
@@ -10,16 +10,18 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
-source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 	./configure --prefix=/usr || return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="f55df4cb0e6cffcd3721164f35dfc88d  xf86-video-tseng-1.2.2.tar.bz2"
+md5sums="79f63999c88477801ae54dc486272ad6  xf86-video-tseng-1.2.3.tar.bz2"
diff --git a/x11/xf86-video-vesa/APKBUILD b/x11/xf86-video-vesa/APKBUILD
index f037858314..c62a0a83c9 100644
--- a/x11/xf86-video-vesa/APKBUILD
+++ b/x11/xf86-video-vesa/APKBUILD
@@ -1,26 +1,28 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vesa
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.2.1
+pkgrel=0
 pkgdesc="X.org vesa video driver"
 url="http://xorg.freedesktop.org/"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc"
-makedepends="pkgconfig g++ xorg-server-dev libxi-dev fontsproto randrproto
+depends=
+makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
 source="http://xorg.freedesktop.org//releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs
-	export GCC_SPECS="$srcdir"/gcc-specs
+	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
 
 	./configure --prefix=/usr || return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="9a86b683f73f3806f55d05cd804a6f4a  xf86-video-vesa-2.2.0.tar.bz2"
+md5sums="61a1dc9a22991bd04d0ff98f800775c1  xf86-video-vesa-2.2.1.tar.bz2"
diff --git a/x11/xfce-utils/APKBUILD b/x11/xfce-utils/APKBUILD
index 450a98d016..c702096d9e 100644
--- a/x11/xfce-utils/APKBUILD
+++ b/x11/xfce-utils/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce-utils
 pkgver=4.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Utilities for Xfce"
 url="http://www.xfce.org/"
 license="GPL2"
@@ -9,9 +9,8 @@ subpackages=
 depends="hicolor-icon-theme"
 makedepends="pkgconfig libxfcegui4-dev intltool gettext-dev libiconv-dev
 	libsm-dev expat-dev e2fsprogs-dev"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
-	$install"
+install=
+source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
 
 build () 
 { 
@@ -26,7 +25,4 @@ build ()
 	make || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="1aa2362b11e79e56d52ce0d265faf1b6  xfce-utils-4.6.1.tar.bz2
-db51db79681eadc47be4932355a77c25  xfce-utils.post-install
-db51db79681eadc47be4932355a77c25  xfce-utils.post-upgrade
-db51db79681eadc47be4932355a77c25  xfce-utils.post-deinstall"
+md5sums="1aa2362b11e79e56d52ce0d265faf1b6  xfce-utils-4.6.1.tar.bz2"
diff --git a/x11/xfce-utils/xfce-utils.post-deinstall b/x11/xfce-utils/xfce-utils.post-deinstall
deleted file mode 120000
index ff279d8222..0000000000
--- a/x11/xfce-utils/xfce-utils.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfce-utils.post-install
-\ No newline at end of file
diff --git a/x11/xfce-utils/xfce-utils.post-install b/x11/xfce-utils/xfce-utils.post-install
deleted file mode 100644
index c523d78da0..0000000000
--- a/x11/xfce-utils/xfce-utils.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/x11/xfce-utils/xfce-utils.post-upgrade b/x11/xfce-utils/xfce-utils.post-upgrade
deleted file mode 120000
index ff279d8222..0000000000
--- a/x11/xfce-utils/xfce-utils.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfce-utils.post-install
-\ No newline at end of file
diff --git a/x11/xfce4-session/APKBUILD b/x11/xfce4-session/APKBUILD
index ec03ece0db..a7c42b9b1d 100644
--- a/x11/xfce4-session/APKBUILD
+++ b/x11/xfce4-session/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-session
 pkgver=4.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A session manager for Xfce"
 url="http://www.xfce.org/"
 license="GPL2"
@@ -10,15 +10,16 @@ makedepends="pkgconfig libxfcegui4-dev libwnck-dev libglade-dev intltool
 	gettext-dev libiconv-dev iceauth libice-dev libsm-dev expat-dev
 	e2fsprogs-dev zlib-dev"
 depends="hicolor-icon-theme"
-install="xfce4-session.post-install xfce4-session.post-deinstall"
+install=
 source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
-	$install"
+	busybox-shutdown.patch"
 
 depends_dev="libxfcegui4-dev xfconf-dev"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
+	patch -p1 -i ../busybox-shutdown.patch || return 1
+
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
@@ -27,11 +28,18 @@ build ()
 		--enable-legacy-sm \
 		--disable-gnome \
 		--enable-session-screenshots \
-		--with-shutdown-style=auto || return 1
+		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
+	# tips doesnt work and i dont like them.
+	# just remove to save space
+	rm -f "$pkgdir"/etc/xdg/autostart/xfce4-tips-autostart.desktop \
+		"$pkgdir"/usr/bin/xfce4-tips
 }
 
 md5sums="7628be41ed3511a20cff5673d9d39858  xfce4-session-4.6.1.tar.bz2
-db51db79681eadc47be4932355a77c25  xfce4-session.post-install
-db51db79681eadc47be4932355a77c25  xfce4-session.post-deinstall"
+bfd9132f08f4a92efbe982fb911c511c  busybox-shutdown.patch"
diff --git a/x11/xfce4-session/busybox-shutdown.patch b/x11/xfce4-session/busybox-shutdown.patch
new file mode 100644
index 0000000000..37423618f0
--- /dev/null
+++ b/x11/xfce4-session/busybox-shutdown.patch
@@ -0,0 +1,13 @@
+--- a/xfsm-shutdown-helper/main.c	Thu Nov  5 17:34:17 2009
++++ b/xfsm-shutdown-helper/main.c	Thu Nov  5 17:36:56 2009
+@@ -64,8 +64,8 @@
+ #define POWEROFF_CMD  "/usr/sbin/shutdown -i 5 -g 0 -y"
+ #define REBOOT_CMD    "/usr/sbin/shutdown -i 6 -g 0 -y"
+ #else
+-#define POWEROFF_CMD  "/sbin/shutdown -h now"
+-#define REBOOT_CMD    "/sbin/shutdown -r now"
++#define POWEROFF_CMD  "/sbin/poweroff"
++#define REBOOT_CMD    "/sbin/reboot"
+ #endif
+ 
+ 
diff --git a/x11/xfce4-settings/APKBUILD b/x11/xfce4-settings/APKBUILD
index aa617d76c1..a16cad84f8 100644
--- a/x11/xfce4-settings/APKBUILD
+++ b/x11/xfce4-settings/APKBUILD
@@ -1,26 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-settings
 pkgver=4.6.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Settings manager for xfce"
 url="http://www.xfce.org/"
 license="GPL-2"
 depends=
 makedepends="exo-dev libnotify-dev libxfcegui4-dev libxklavier-dev libwnck-dev
 	libglade-dev pkgconfig intltool gettext-dev libiconv-dev expat-dev
-	libxi-dev libsm-dev e2fsprogs-dev libxkbfile-dev"
+	libxi-dev libsm-dev e2fsprogs-dev libxkbfile-dev libxrandr-dev"
 source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
 		--enable-libxklavier \
+		--enable-xrandr \
 		--enable-sound-settings
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
 
diff --git a/x11/xinit/APKBUILD b/x11/xinit/APKBUILD
index 20b65c1b71..be135ed7a7 100644
--- a/x11/xinit/APKBUILD
+++ b/x11/xinit/APKBUILD
@@ -1,32 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xinit
 pkgver=1.1.1
-pkgrel=1
+pkgrel=3
 pkgdesc="X.Org initialisation program "
 url="http://xorg.freedesktop.org/"
 license="GPL"
 subpackages="$pkgname-doc"
-depends="libx11 xauth uclibc"
+depends="xauth"
 makedepends="pkgconfig libx11-dev"
 source="http://xorg.freedesktop.org/releases/individual/app/xinit-$pkgver.tar.bz2
 	xinitrc
 	xsession
 	xserverrc"
 
-build () 
-{ 
+build() { 
 	cd "$srcdir"/xinit-$pkgver
 	./configure --prefix=/usr || return 1
 	make XINITDIR=/etc/X11/xinit || return 1
+}
+
+package() {
+	cd "$srcdir"/xinit-$pkgver
 	make XINITDIR=/etc/X11/xinit DESTDIR="$pkgdir" install || return 1
 	chmod +x "$pkgdir"/usr/bin/startx
 	install -m755 -d "$pkgdir"/etc/skel
-	install -m755 -d "$pkgdir"/etc/X11/xinit
-	install -m755 "$srcdir"/xinitrc "$pkgdir"/etc/skel/.xinitrc || return 1
+	install -m755 -D "$srcdir"/xinitrc "$pkgdir"/etc/X11/xinit/xinitrc
 	install -m755 "$srcdir"/xsession "$pkgdir"/etc/skel/.xsession || return 1
 	install -m755 "$srcdir"/xserverrc "$pkgdir"/etc/X11/xinit/xserverrc || return 1
 }
 md5sums="93c73705ed9eb1e1a6b6938405672f2b  xinit-1.1.1.tar.bz2
-cee2d70748a089fbc7db64a4a6e8fdb1  xinitrc
-7873d97db30d6c279ed37e3559e7c59d  xsession
+af322d72972d5722b7fc0a9e8f025b15  xinitrc
+4f04d2891ea87f50fde518267b7a1154  xsession
 bb550d3b9a2d2b6cbe6e2667a3a7cd03  xserverrc"
diff --git a/x11/xinit/xinitrc b/x11/xinit/xinitrc
index a5a3527135..0055713592 100644
--- a/x11/xinit/xinitrc
+++ b/x11/xinit/xinitrc
@@ -1,10 +1,49 @@
 #!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+xinitdir=/etc/X11
+sysresources=$xinitdir/Xresources
+sysmodmap=$xinitdir/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
+
+# First try ~/.xinitrc
+if [ -f "$HOME/.xinitrc" ]; then
+	XINITRC="$HOME/.xinitrc"
+	if [ -x $XINITRC ]; then
+		# if the x bit is set on .xinitrc
+		# it means the xinitrc is not a
+		# shell script but something else
+		exec $XINITRC "$@"
+	else
+		exec /bin/sh "$HOME/.xinitrc" "$@"
+	fi
+fi
+
+# If not present, try the system default
+exec startxfce4
+
+
+# Fall back to fluxbox
+exec startfluxbox
+
+# Start only terminal as last resort
+exec terminal || exec aterm
diff --git a/x11/xinit/xsession b/x11/xinit/xsession
index a16dc0b842..819c248cd5 100644
--- a/x11/xinit/xsession
+++ b/x11/xinit/xsession
@@ -6,5 +6,5 @@
 # Executed by xdm/gdm/kdm at login
 #
 
-/bin/bash --login -i ~/.xinitrc
+/bin/sh -l ~/.xinitrc
author	Ted Trask <ttrask01@yahoo.com>	2009-11-05 21:10:53 +0000
committer	Ted Trask <ttrask01@yahoo.com>	2009-11-05 21:10:53 +0000
commit	93d66cee3bb101d76748ca7d814204cbfb1d2284 (patch)
tree	07caa3644848b8d6da8035d6353d17eae82f0c4e
parent	8b6d2d806f1767023331ed07d4a2fff86cf3c666 (diff)
parent	783a255238a7ad893471d9cdf0dfac5952bb8a95 (diff)
download	aports-93d66cee3bb101d76748ca7d814204cbfb1d2284.tar.bz2 aports-93d66cee3bb101d76748ca7d814204cbfb1d2284.tar.xz