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

9 files changed, 141 insertions, 37 deletions

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/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/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..e75f788404 100644
--- a/x11/xinit/APKBUILD
+++ b/x11/xinit/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xinit
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 url="http://xorg.freedesktop.org/"
 license="GPL"
@@ -13,20 +13,22 @@ source="http://xorg.freedesktop.org/releases/individual/app/xinit-$pkgver.tar.bz
 	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 "$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