The long-standing gtk2 flicker problem is now fixed and the wmfpo.patch has been added for single-click window raising and shading vs. maximizing at the titlebar.

7 files changed, 490 insertions, 7 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index db07ac0c873e..cd1a7bf0dee8 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.9 2004/04/27 21:48:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.10 2004/06/07 13:38:27 raker Exp $
+
+*windowmaker-0.80.2-r4 (07 Jun 2004)
+
+  07 Jun 2004; Nick Hadaway <raker@gentoo.org> 
+  windowmaker-0.80.2-r4.ebuild, files/wmfpo.patch, 
+  files/gtk2flickerfix.patch:
+  A new release of WindowMaker coming from upstream cvs will be real 
+  soon now but these two updates are very nice.  Pretty soon
+  windowmaker will be more popular than gnome and kde combined! muhaha!
+  GTK+2 applications should no longer fight for focus and the wmfpo patch
+  adds options in WPrefs.app for single-click window raising and window 
+  maximizing instead of shading.  Thanks to bug submitters and testers 
+  on #38481 and #49804.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   windowmaker-0.80.2-r1.ebuild, windowmaker-0.80.2-r2.ebuild:
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 3dee8e4fce33..19c040010958 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,11 +1,14 @@
-MD5 aea858abe20303eaf46395cbe9dceda2 windowmaker-0.80.2-r1.ebuild 3408
 MD5 3dd18c4446212e84b4124b7f62df0f98 windowmaker-0.80.2-r2.ebuild 3437
-MD5 75e534512bf308e26143c01b1e0c6fb6 ChangeLog 5267
+MD5 58b49f1768692b8a580bf1713ddd9afe windowmaker-0.80.2-r4.ebuild 3900
+MD5 aea858abe20303eaf46395cbe9dceda2 windowmaker-0.80.2-r1.ebuild 3408
 MD5 3edf301cda1c3aac6cff22e2381bc4b2 windowmaker-0.80.2-r3.ebuild 3750
+MD5 75e534512bf308e26143c01b1e0c6fb6 ChangeLog 5267
+MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/trance.patch.WM-0.80.2.diff 9738
+MD5 c8eb68627dc7b53b10143626018ff597 files/gtk2flickerfix.patch 1969
+MD5 915c0fe65c24d54a1507f662d7b24114 files/xinerama.patch 26662
+MD5 a062e261bd5aaca39bc17be01f07f1b6 files/wlist.patch 2776
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r1 144
-MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/windowmaker-0.80.2-r1-gentoo.patch 4331
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r2 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r3 144
-MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/trance.patch.WM-0.80.2.diff 9738
-MD5 a062e261bd5aaca39bc17be01f07f1b6 files/wlist.patch 2776
-MD5 915c0fe65c24d54a1507f662d7b24114 files/xinerama.patch 26662
+MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r4 144
+MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/windowmaker-0.80.2-r1-gentoo.patch 4331
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.80.2-r4 b/x11-wm/windowmaker/files/digest-windowmaker-0.80.2-r4
new file mode 100644
index 000000000000..4ef83da7e63a
--- /dev/null
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.80.2-r4
@@ -0,0 +1,2 @@
+MD5 e4b71ee2b35a4e16b371ab9595e7335f WindowMaker-0.80.2.tar.gz 2532831
+MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018
diff --git a/x11-wm/windowmaker/files/gtk2flickerfix.patch b/x11-wm/windowmaker/files/gtk2flickerfix.patch
new file mode 100644
index 000000000000..188c6e3a031d
--- /dev/null
+++ b/x11-wm/windowmaker/files/gtk2flickerfix.patch
@@ -0,0 +1,59 @@
+diff -urN WindowMaker-0.80.2/src/actions.c WindowMaker-0.80.2-modified/src/actions.c
+--- WindowMaker-0.80.2/src/actions.c	2002-07-02 01:30:25.000000000 +0100
++++ WindowMaker-0.80.2-modified/src/actions.c	2004-01-08 20:52:01.384657458 +0000
+@@ -144,14 +144,21 @@
+       old_scr=scr;
+     old_focused=old_scr->focused_window;
+ 
++    /*
++     * Safeguard: make sure the timestamp is monotonically increasing
++     * (very unlikely that this will be needed, still a safeguard)
++     */
++    if (timestamp <= LastFocusChange)
++	    timestamp = LastFocusChange + 1;
++
+     LastFocusChange = timestamp;
+ 
+ /*
+  * This is a hack, because XSetInputFocus() should have a proper
+  * timestamp instead of CurrentTime but it seems that some times
+  * clients will not receive focus properly that way.
+-    if (ignoreTimestamp)
+ */
++    if (ignoreTimestamp)
+       timestamp = CurrentTime;
+ 
+     if (old_focused)
+diff -urN WindowMaker-0.80.2/src/event.c WindowMaker-0.80.2-modified/src/event.c
+--- WindowMaker-0.80.2/src/event.c	2002-01-08 13:45:13.000000000 +0000
++++ WindowMaker-0.80.2-modified/src/event.c	2004-01-08 20:52:35.321986539 +0000
+@@ -402,7 +402,6 @@
+ static void
+ saveTimestamp(XEvent *event)
+ {
+-    LastTimestamp = CurrentTime;
+ 
+     switch (event->type) {
+      case ButtonRelease:
+diff -urN WindowMaker-0.80.2/src/workspace.c WindowMaker-0.80.2-modified/src/workspace.c
+--- WindowMaker-0.80.2/src/workspace.c	2002-01-08 13:45:33.000000000 +0000
++++ WindowMaker-0.80.2-modified/src/workspace.c	2004-01-08 20:55:00.691545736 +0000
+@@ -574,11 +574,13 @@
+                               &foo, &foo, &foo, &foo, &mask)) {
+ 		tmp = wWindowFor(win);
+ 	    }
+-	    if (!tmp && wPreferences.focus_mode == WKF_SLOPPY) {
+-		wSetFocusTo(scr, foc);
+-	    } else {
+-		wSetFocusTo(scr, tmp);
+-	    }
++	    if (!tmp) {
++		if (wPreferences.focus_mode == WKF_SLOPPY) {
++		    wSetFocusTo(scr, foc);
++	        } else {
++		    wSetFocusTo(scr, tmp);
++		}
++            }
+ 	}
+     }
+ 
diff --git a/x11-wm/windowmaker/files/wmfpo.patch b/x11-wm/windowmaker/files/wmfpo.patch
new file mode 100644
index 000000000000..662e4949ee18
--- /dev/null
+++ b/x11-wm/windowmaker/files/wmfpo.patch
@@ -0,0 +1,233 @@
+diff -ur WindowMaker-0.80.0/WPrefs.app/Expert.c WindowMaker-0.80.0fpo1/WPrefs.app/Expert.c
+--- WindowMaker-0.80.0/WPrefs.app/Expert.c	Mon May 21 18:11:17 2001
++++ WindowMaker-0.80.0fpo1/WPrefs.app/Expert.c	Sat Jan  5 03:08:10 2002
+@@ -33,7 +33,7 @@
+     
+     WMWidget *parent;
+ 
+-    WMButton *swi[8];
++    WMButton *swi[10];
+ 
+ } _Panel;
+ 
+@@ -54,6 +54,8 @@
+     WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling"));
+     WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));
+     WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking"));
++    WMSetButtonSelected(panel->swi[7], GetBoolForKey("DCMaximize"));
++    WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch"));
+ }
+ 
+ 
+@@ -66,10 +68,10 @@
+     panel->box = WMCreateBox(panel->parent);
+     WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
+ 
+-    for (i=0; i<7; i++) {
++    for (i=0; i<9; i++) {
+ 	panel->swi[i] = WMCreateSwitchButton(panel->box);
+ 	WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
+-	WMMoveWidget(panel->swi[i], 20, 20+i*25);
++	WMMoveWidget(panel->swi[i], 20, 20+i*23);
+     }
+     
+     WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."));
+@@ -79,6 +81,8 @@
+     WMSetButtonText(panel->swi[4], _("Use Windoze style cycling."));
+     WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command."));
+     WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons."));
++    WMSetButtonText(panel->swi[7], _("Double click on title bar maximize"));
++    WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click"));
+ 
+     WMRealizeWidget(panel->box);
+     WMMapSubwidgets(panel->box);
+@@ -101,6 +105,8 @@
+     SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");
+     SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
+     SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");
++    SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "DCMaximize");
++    SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch");
+ }
+ 
+ 
+diff -ur WindowMaker-0.80.0/src/WindowMaker.h WindowMaker-0.80.0fpo1/src/WindowMaker.h
+--- WindowMaker-0.80.0/src/WindowMaker.h	Fri Dec 21 21:38:08 2001
++++ WindowMaker-0.80.0fpo1/src/WindowMaker.h	Sat Jan  5 14:12:14 2002
+@@ -463,6 +463,12 @@
+     /* shading animation */
+     signed char shade_speed;
+ 
++    /* double click on title bar maximize */
++    char dc_maximize;
++
++    /* single click to lauch applications */
++    char single_click;
++
+     int edge_resistance;
+     char attract;
+ 
+diff -ur WindowMaker-0.80.0/src/appicon.c WindowMaker-0.80.0fpo1/src/appicon.c
+--- WindowMaker-0.80.0/src/appicon.c	Tue Dec 18 03:43:48 2001
++++ WindowMaker-0.80.0fpo1/src/appicon.c	Sat Jan  5 14:12:14 2002
+@@ -596,6 +596,7 @@
+     int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;
+     int ix, iy;
+     int clickButton = event->xbutton.button;
++    Bool hasMoved = False;
+     Pixmap ghost = None;
+     Window wins[2];
+     Bool movingSingle = False;
+@@ -676,6 +677,7 @@
+ 	    break;
+ 
+ 	 case MotionNotify:
++	    hasMoved = True;
+ 	    if (!grabbed) {
+ 		if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
+ 		    || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
+@@ -812,6 +814,8 @@
+ 
+ 	    if (wPreferences.auto_arrange_icons)
+ 		wArrangeIcons(scr, True);
++	    if (!hasMoved && wPreferences.single_click)
++		iconDblClick(desc, event);
+ 
+ 	    done = 1;
+ 	    break;
+diff -ur WindowMaker-0.80.0/src/defaults.c WindowMaker-0.80.0fpo1/src/defaults.c
+--- WindowMaker-0.80.0/src/defaults.c	Fri Dec 21 21:38:08 2001
++++ WindowMaker-0.80.0fpo1/src/defaults.c	Sat Jan  5 14:12:14 2002
+@@ -548,6 +548,12 @@
+     {"DisableBlinking",	"NO",		NULL,
+ 	   &wPreferences.dont_blink,	getBool,	NULL
+     },
++    {"DCMaximize", "NO",		NULL,
++	   &wPreferences.dc_maximize,	getBool,	NULL
++    },
++    {"SingleClickLaunch", "NO",		NULL,
++	   &wPreferences.single_click,	getBool,	NULL
++    },
+       /* style options */
+     {"MenuStyle", 	"normal",  		seMenuStyles,
+ 	&wPreferences.menu_style, getEnum, 	setMenuStyle
+diff -ur WindowMaker-0.80.0/src/dock.c WindowMaker-0.80.0fpo1/src/dock.c
+--- WindowMaker-0.80.0/src/dock.c	Fri Dec 21 21:38:08 2001
++++ WindowMaker-0.80.0fpo1/src/dock.c	Sat Jan  5 14:12:14 2002
+@@ -3772,7 +3772,7 @@
+ 
+ 
+ 
+-static void
++static Bool
+ handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
+ {
+     WScreen *scr = dock->screen_ptr;
+@@ -3788,6 +3788,7 @@
+     int tmp;
+     Pixmap ghost = None;
+     Bool docked;
++    Bool hasMoved = False;
+     int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
+     int omnipresent = aicon->omnipresent; /* this must be cached!!! */
+ 
+@@ -3842,6 +3843,7 @@
+ 	    break;
+ 
+ 	 case MotionNotify:
++	    hasMoved = True;
+ 	    if (!grabbed) {
+ 		if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
+ 		    || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {
+@@ -3991,7 +3993,7 @@
+ #ifdef DEBUG
+ 	    puts("End icon move");
+ #endif
+-	    return;
++	return hasMoved;
+ 	}
+     }
+ }
+@@ -4130,8 +4132,11 @@
+                 handleClipChangeWorkspace(scr, event);
+             else
+                 handleDockMove(dock, aicon, event);
+-        } else
+-	    handleIconMove(dock, aicon, event);
++	} else {
++	    Bool hasMoved = handleIconMove(dock, aicon, event);
++	    if (!hasMoved && wPreferences.single_click)
++	        iconDblClick(desc, event);
++	}
+ 
+     } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
+                aicon==scr->clip_icon) {
+diff -ur WindowMaker-0.80.0/src/icon.c WindowMaker-0.80.0fpo1/src/icon.c
+--- WindowMaker-0.80.0/src/icon.c	Tue Jul 24 06:51:05 2001
++++ WindowMaker-0.80.0fpo1/src/icon.c	Sat Jan  5 14:16:16 2002
+@@ -877,6 +877,7 @@
+     int dx=event->xbutton.x, dy=event->xbutton.y;
+     int grabbed=0;
+     int clickButton=event->xbutton.button;
++    Bool hasMoved = False;
+ 
+     if (WCHECK_STATE(WSTATE_MODAL))
+ 	return;
+@@ -928,6 +929,7 @@
+ 	    break;
+ 
+ 	 case MotionNotify:
++	    hasMoved = True;
+ 	    if (!grabbed) {
+ 		if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
+ 		    || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
+@@ -965,6 +967,9 @@
+ 
+ 	    if (wPreferences.auto_arrange_icons)
+ 		wArrangeIcons(wwin->screen_ptr, True);
++	    if (!hasMoved && wPreferences.single_click)
++		miniwindowDblClick(desc, event);
++
+ 	    return;
+ 	    
+ 	}
+diff -ur WindowMaker-0.80.0/src/window.c WindowMaker-0.80.0fpo1/src/window.c
+--- WindowMaker-0.80.0/src/window.c	Fri Dec 21 21:38:08 2001
++++ WindowMaker-0.80.0fpo1/src/window.c	Sat Jan  5 14:18:07 2002
+@@ -2984,14 +2984,29 @@
+ 
+     if (event->xbutton.button==Button1) {
+ 	if (event->xbutton.state == 0) {
+-	    if (!WFLAGP(wwin, no_shadeable)) {
+-		/* shade window */
+-		if (wwin->flags.shaded)
+-		    wUnshadeWindow(wwin);
+-		else
+-		    wShadeWindow(wwin);
+-	    }
+-	} else {
++	    /* check preferences, maximize or shade */
++            if (wPreferences.dc_maximize) {
++		if (!WFLAGP(wwin, no_resizable)) {
++		    /* maximize window */
++		    if (wwin->flags.maximized != 0) {
++		    	wUnmaximizeWindow(wwin);
++                        wwin->flags.maximized = 0;
++                    }
++		    else {
++		    	wMaximizeWindow(wwin, MAX_VERTICAL|MAX_HORIZONTAL);
++                        wwin->flags.maximized = MAX_VERTICAL|MAX_HORIZONTAL;
++                    }
++	    	}
++	    } else {
++	        if (!WFLAGP(wwin, no_shadeable)) {
++		    /* shade window */
++		    if (wwin->flags.shaded)
++		        wUnshadeWindow(wwin);
++		    else
++		        wShadeWindow(wwin);
++	        }
++            }
++        } else {
+ 	    int dir = 0;
+ 
+ 	    if (event->xbutton.state & ControlMask)
diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
new file mode 100644
index 000000000000..194b369637e4
--- /dev/null
+++ b/x11-wm/windowmaker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>raker@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
new file mode 100644
index 000000000000..3609d3db9ed2
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.1 2004/06/07 13:38:27 raker Exp $
+
+inherit eutils flag-o-matic
+filter-mfpmath "sse" "387"
+
+IUSE="gif nls png kde oss jpeg gnome xinerama"
+
+MY_P=${P/windowm/WindowM}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="The fast and light GNUstep window manager"
+SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${MY_P}.tar.gz
+	 ftp://ftp.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+HOMEPAGE="http://www.windowmaker.org/"
+
+DEPEND="virtual/x11
+	media-libs/hermes
+	>=media-libs/tiff-3.5.5
+	gif? ( >=media-libs/giflib-4.1.0-r3
+		>=media-libs/libungif-4.1.0 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )"
+
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips amd64"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.80.2-r1-gentoo.patch
+
+	# scroll with the arrow keys
+	cd ${S}/WINGs
+	epatch ${FILESDIR}/wlist.patch
+
+	# transparency/translucency
+	cd ${S}
+	epatch ${FILESDIR}/trance.patch.WM-0.80.2.diff
+
+	# Add some BETTER xinerama support
+	use xinerama && epatch ${FILESDIR}/xinerama.patch
+
+	# Fix GTK2 window flickering bug
+	epatch ${FILESDIR}/gtk2flickerfix.patch
+
+	# Add options to WPrefs for single-click launching of windows
+	# and maximize vs. shading when double-click on titlebars
+	# http://orbita.starmedia.com/~neofpo/home.html
+	epatch ${FILESDIR}/wmfpo.patch
+}
+
+src_compile() {
+
+	local myconf
+
+	use gnome \
+		&& myconf="${myconf} --enable-gnome" \
+		|| myconf="${myconf} --disable-gnome"
+
+	use kde \
+		&& myconf="${myconf} --enable-kde" \
+		&& export KDEDIR=/usr/kde/2 \
+		|| myconf="${myconf} --disable-kde"
+
+	if [ "$WITH_MODELOCK" ] ; then
+		myconf="${myconf} --enable-modelock"
+	else
+		myconf="${myconf} --disable-modelock"
+	fi
+
+	use nls \
+		&& export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \
+		|| myconf="${myconf} --disable-nls --disable-locale"
+
+	use gif \
+		|| myconf="${myconf} --disable-gif"
+
+	use jpeg \
+		|| myconf="${myconf} --disable-jpeg"
+
+	use png \
+		|| myconf="${myconf} --disable-png"
+
+
+	use esd || use alsa || use oss \
+		&& myconf="${myconf} --enable-sound" \
+		|| myconf="${myconf} --disable-sound"
+
+	econf \
+		--sysconfdir=/etc/X11 \
+		--with-x \
+		--enable-newstyle \
+		--enable-superfluous \
+		--enable-usermenu \
+		--with-appspath=/usr/lib/GNUstep/Apps \
+		--with-pixmapdir=/usr/share/pixmaps \
+		${myconf} || die
+
+	cd ${S}/po
+	cp Makefile Makefile.orig
+	sed 's:zh_TW.*::' \
+		Makefile.orig > Makefile
+
+	cd ${S}/WPrefs.app/po
+	cp Makefile Makefile.orig
+	sed 's:zh_TW.*::' \
+		Makefile.orig > Makefile
+
+	cd ${S}
+	for file in ${S}/WindowMaker/*menu*; do
+		if [ -r $file ]; then
+				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;
+						s/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+				mv $file.tmp $file;
+		fi;
+	done;
+
+	cd ${S}
+	#0.80.1-r2 did not work with make -j4 (drobbins, 15 Jul 2002)
+	#with future Portage, this should become "emake -j1"
+	make || die
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	econf || die
+
+	make || die
+}
+
+src_install() {
+
+	einstall \
+		sysconfdir=${D}/etc/X11 \
+		wprefsdir=${D}/usr/lib/GNUstep/Apps/WPrefs.app \
+		wpdatadir=${D}/usr/lib/GNUstep/Apps/WPrefs.app \
+		wpexecbindir=${D}/usr/lib/GNUstep/Apps/WPrefs.app || die
+
+	cp -f WindowMaker/plmenu ${D}/etc/X11/WindowMaker/WMRootMenu
+
+	dodoc AUTHORS BUGFORUM BUGS ChangeLog COPYING* INSTALL* FAQ* \
+	      MIRRORS README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	einstall || die
+
+	newdoc README README.extra
+
+	echo "#!/bin/bash" > wmaker
+	echo "/usr/bin/wmaker" >> wmaker
+
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+}
+
+pkg_postinst() {
+	einfo "/usr/share/GNUstep/ has moved to /usr/lib/GNUstep/"
+	einfo "this means the WPrefs app has moved. If you have"
+	einfo "entries for this in your menus, please correct them"
+}