x11-wm/dwm: Add XSession

svn path=/sunrise/; revision=1593

4 files changed, 40 insertions, 36 deletions

diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index ca9b1ee03..4b249a70a 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,12 +1,12 @@
-AUX dwm-1.9-makefile.patch 721 RMD160 7e6b585106d5b1e3ac7f9a2776aa68ba2c3fd0e8 SHA1 f2414f406ccb846efb9d0e9333d98b9f2db1c276 SHA256 79d8c51bb1192ef0179fb7f98dce87c096aa1bb16a9ae117ff3dd800899d085a
-MD5 4b524055488fa71d829e9c10ba4a0e31 files/dwm-1.9-makefile.patch 721
-RMD160 7e6b585106d5b1e3ac7f9a2776aa68ba2c3fd0e8 files/dwm-1.9-makefile.patch 721
-SHA256 79d8c51bb1192ef0179fb7f98dce87c096aa1bb16a9ae117ff3dd800899d085a files/dwm-1.9-makefile.patch 721
+AUX dwm-session 312 RMD160 6d3792a0f5374ba6bd8aeb84aa31a86b598e2416 SHA1 a87590c2cbb5a857e8875c88fa4d2e8090cf31d1 SHA256 bc0e60687f719f2613492f15180c3327b7b9560f53f09a52f0e763548f2221ac
+MD5 be5c842ec4259bd3546b8d6568a000f4 files/dwm-session 312
+RMD160 6d3792a0f5374ba6bd8aeb84aa31a86b598e2416 files/dwm-session 312
+SHA256 bc0e60687f719f2613492f15180c3327b7b9560f53f09a52f0e763548f2221ac files/dwm-session 312
 DIST dwm-1.9.tar.gz 17654 RMD160 9cef611c9d4435daf365e4fa3a35ca528f3dde69 SHA1 799d5b118c259c838dc5000d5e96f744e23a3cf4 SHA256 96bb186b060440767c750fac2e1784d7e97513213d54b3fbbc2aac6d5bac6986
-EBUILD dwm-1.9.ebuild 2046 RMD160 fc52771a668c81ab7fb89ea949c5bb4ea5f69794 SHA1 e37486d3b93610c6a2e82cc1e299df8bcff5b1cd SHA256 686f8962d65451acedeefec2aad6b11a0e45a6cb2ab8ccf26a10187c48ec83da
-MD5 3d40d1f270ccbe670084f18ac3b63eec dwm-1.9.ebuild 2046
-RMD160 fc52771a668c81ab7fb89ea949c5bb4ea5f69794 dwm-1.9.ebuild 2046
-SHA256 686f8962d65451acedeefec2aad6b11a0e45a6cb2ab8ccf26a10187c48ec83da dwm-1.9.ebuild 2046
+EBUILD dwm-1.9.ebuild 2388 RMD160 2672b04162e494200630e5e7f7dbfd319f209f2e SHA1 2ad14f0b848b858b47a6a2c91b449ca3ed295bd9 SHA256 410ee666c0350829f621044db8bcd9a68bc1bbebf6d79b581091e7283fb56bb9
+MD5 47314155f894d94aeaa5691bab8aaf07 dwm-1.9.ebuild 2388
+RMD160 2672b04162e494200630e5e7f7dbfd319f209f2e dwm-1.9.ebuild 2388
+SHA256 410ee666c0350829f621044db8bcd9a68bc1bbebf6d79b581091e7283fb56bb9 dwm-1.9.ebuild 2388
 MISC ChangeLog 4369 RMD160 4578149d740496d4ac37e159d7f516eb4359cd5b SHA1 cd04260c56a3f77f0e9f60a412fd773997a2ddac SHA256 ae62c051514bf48998fc291b96356a8b4e382e5759df86e63e5faea0863171a7
 MD5 327cb6f277f98bf13e791676d6a6e952 ChangeLog 4369
 RMD160 4578149d740496d4ac37e159d7f516eb4359cd5b ChangeLog 4369
diff --git a/x11-wm/dwm/dwm-1.9.ebuild b/x11-wm/dwm/dwm-1.9.ebuild
index c1bc3d643..5f50ba7f7 100644
--- a/x11-wm/dwm/dwm-1.9.ebuild
+++ b/x11-wm/dwm/dwm-1.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="a dynamic window manager for X11"
 HOMEPAGE="http://suckless.org/view/dynamic+window+manager"
@@ -14,13 +14,21 @@ KEYWORDS="~x86"
 IUSE="savedconfig"
 
 DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sys-apps/coreutils"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-makefile.patch"
+	sed -i \
+		-e "s/.*strip.*//" \
+		Makefile || die "sed failed"
+
+	sed -i \
+		-e "s/CFLAGS = -Os/CFLAGS +=/" \
+		-e "s/LDFLAGS =/LDFLAGS +=/" \
+		config.mk || die "sed failed"
 
 	if use savedconfig; then
 		local conf root
@@ -51,6 +59,9 @@ src_install() {
 	insinto /usr/share/${PN}
 	newins config.h ${PF}.config.h
 
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/dwm-session dwm
+
 	dodoc README
 }
 
@@ -73,4 +84,6 @@ pkg_postinst() {
 		elog "Installing ${PN} without x11-misc/dmenu"
 		einfo "To have a menu you can install x11-misc/dmenu"
 	fi
+	einfo "You can custom status bar with a script in HOME/.dwm/dwmrc"
+	einfo "the ouput is redirected to the standard input of dwm"
 }
diff --git a/x11-wm/dwm/files/dwm-1.9-makefile.patch b/x11-wm/dwm/files/dwm-1.9-makefile.patch
deleted file mode 100644
index f8555baa0..000000000
--- a/x11-wm/dwm/files/dwm-1.9-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru dwm-1.9~/config.mk dwm-1.9/config.mk
---- dwm-1.9~/config.mk	2006-10-06 22:10:44.000000000 +0200
-+++ dwm-1.9/config.mk	2006-10-06 22:11:13.000000000 +0200
-@@ -15,8 +15,8 @@
- LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
- 
- # flags
--CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
--LDFLAGS = ${LIBS}
-+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\"
-+LDFLAGS += ${LIBS}
- #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = -g ${LIBS}
- 
-diff -ru dwm-1.9~/Makefile dwm-1.9/Makefile
---- dwm-1.9~/Makefile	2006-10-06 22:10:44.000000000 +0200
-+++ dwm-1.9/Makefile	2006-10-06 22:11:00.000000000 +0200
-@@ -28,7 +28,6 @@
- dwm: ${OBJ}
- 	@echo LD $@
- 	@${LD} -o $@ ${OBJ} ${LDFLAGS}
--	@strip $@
- 
- clean:
- 	@echo cleaning
diff --git a/x11-wm/dwm/files/dwm-session b/x11-wm/dwm/files/dwm-session
new file mode 100644
index 000000000..a7e32f5b2
--- /dev/null
+++ b/x11-wm/dwm/files/dwm-session
@@ -0,0 +1,16 @@
+#!/bin/sh
+DIR=${HOME}/.dwm
+mkdir -p "${DIR}"
+if [ ! -p "${DIR}"/status ]; then
+	rm -f "${DIR}"/status
+	mkfifo "${DIR}"/status
+fi
+if [ -f "${DIR}"/dwmrc ]; then
+	/bin/sh "${DIR}"/dwmrc >"${DIR}"/status &
+else
+	(while true; do
+		echo `date`
+		sleep 1
+	done >"${DIR}"/status)&
+fi
+exec /usr/bin/dwm <"${DIR}"/status