pwm to /usr

4 files changed, 52 insertions, 44 deletions

diff --git a/x11-wm/pwm/files/digest-pwm-1.0-r1 b/x11-wm/pwm/files/digest-pwm-1.0-r2
index 7b699abc4c66..7b699abc4c66 100644
--- a/x11-wm/pwm/files/digest-pwm-1.0-r1
+++ b/x11-wm/pwm/files/digest-pwm-1.0-r2
diff --git a/x11-wm/pwm/files/pwm b/x11-wm/pwm/files/pwm
deleted file mode 100755
index 78ad3a780b37..000000000000
--- a/x11-wm/pwm/files/pwm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/X11R6/bin/pwm
diff --git a/x11-wm/pwm/pwm-1.0-r1.ebuild b/x11-wm/pwm/pwm-1.0-r1.ebuild
deleted file mode 100644
index 9c9f3783160c..000000000000
--- a/x11-wm/pwm/pwm-1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ryan Tolboom <ryan@intphsys.com>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pwm/pwm-1.0-r1.ebuild,v 1.2 2001/06/03 09:54:22 achim Exp $
-
-S=${WORKDIR}/pwm-1.0
-SRC_URI="http://www.students.tut.fi/~tuomov/dl/pwm-1.0.tar.gz"
-
-HOMEPAGE="http://www.students.tut.fi/~tuomov/pwm"
-
-DESCRIPTION="A lightweight window manager"
-
-DEPEND=">=x11-base/xfree-4.0.1"
-
-
-src_unpack() {
-
-    unpack ${A}
-    cd ${S}
-    cp config.h config.orig
-    sed -e "s:PREFIX\"/etc/pwm/\":\"/etc/X11/pwm/\":" \
-        config.orig > config.h
-    cp system.mk system.orig
-    sed -e "s:-g -O2:${CFLAGS}:" -e 's:\$(WARN)::' system.orig > system.mk
-
-}
-
-src_compile() {
-
-    try make
-
-}
-
-src_install() {
-
-    try make PREFIX=${D}/usr/X11R6 ETCDIR=${D}/etc/X11 DOCDIR=${D}/usr/doc/${PF} install
-    dodoc config.txt
-    exeinto /usr/X11R6/bin/wm
-    doexe ${FILESDIR}/pwm
-
-}
diff --git a/x11-wm/pwm/pwm-1.0-r2.ebuild b/x11-wm/pwm/pwm-1.0-r2.ebuild
new file mode 100644
index 000000000000..d9357d505d80
--- /dev/null
+++ b/x11-wm/pwm/pwm-1.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Ryan Tolboom <ryan@intphsys.com>
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A lightweight window manager"
+SRC_URI="http://www.students.tut.fi/~tuomov/dl/${P}.tar.gz"
+HOMEPAGE="http://www.students.tut.fi/~tuomov/pwm"
+
+DEPEND=">=x11-base/xfree-4.0.1"
+
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	cp Makefile Makefile.orig
+	sed -e "s:\$(DOCDIR)/pwm:\$(DOCDIR)/${PF}:g" 			\
+	    Makefile.orig >Makefile
+	cp system.mk system.orig
+	sed -e "s:-g -O2:${CFLAGS}:"					\
+	    -e 's:\$(WARN)::'						\
+	    system.orig >system.mk
+}
+
+src_compile() {
+
+	make PREFIX=/usr						\
+	     MANDIR=/usr/share/man/man1					\
+	     DOCDIR=/usr/share/doc					\
+	     ETCDIR=/etc/X11						\
+	     CF_SYS_CONFIG_LOCATION=/etc/X11/pwm/			\
+	     || die
+}
+
+src_install() {
+
+	make PREFIX=${D}/usr						\
+	     MANDIR=${D}/usr/share/man/man1				\
+	     DOCDIR=${D}/usr/share/doc					\
+	     ETCDIR=${D}/etc/X11					\
+	     install || die
+
+	if [ "`use gnome`" ] ; then
+	
+		insinto /usr/share/gnome/wm-properties
+		doins support/PWM.desktop
+	fi
+
+	dodoc ChangeLog README
+}