7 files changed, 34 insertions, 15 deletions
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 5bff15482f3f..479796e9639b 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.52 2004/01/12 10:42:04 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.53 2004/01/13 12:19:03 taviso Exp $
+
+  13 Jan 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.17.ebuild,
+  fvwm-2.5.7-r5.ebuild, fvwm-2.5.8-r2.ebuild, fvwm-2.5.8-r3.ebuild,
+  files/fvwm-2.5.8-FvwmScript-Quit-reboot.diff:
+  typo
 
 *fvwm-2.5.8-r3 (12 Jan 2004)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 538c914adb82..21a3909134ce 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,14 +1,15 @@
-MD5 e79bd2fa2e46e650aabaa16754e25583 fvwm-2.5.7-r5.ebuild 8757
-MD5 b893f78193652b275ce5d276ac38af29 fvwm-2.4.17.ebuild 3961
-MD5 523a1a7dd8d374480c3367eb4428fd32 fvwm-2.5.8-r3.ebuild 10057
-MD5 4f33249e78f1d91e7e6ad862031ee5ee ChangeLog 10179
+MD5 b83bf23f1c96084b79765739613430ac fvwm-2.5.7-r5.ebuild 8757
+MD5 babbec50812f1dd2af1b76b9afa837af fvwm-2.4.17.ebuild 3961
+MD5 ab166c5219857a5f23dd973eeaf8d532 fvwm-2.5.8-r3.ebuild 10162
+MD5 7c6ff272c1e5c0dc488c79fa94a522d2 ChangeLog 10372
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
-MD5 e277a2831ac0104d5af9b1aef8ee3403 fvwm-2.5.8-r2.ebuild 9684
+MD5 6a0ba650b7f07dc1e6e94ea256a8ec94 fvwm-2.5.8-r2.ebuild 9684
 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
 MD5 e5701841190ad529d5577c8da69d5006 files/fvwmtabs-insecure-tmp-handling.diff 2350
 MD5 98b1cd33f30ee47c88a2c3da2b2ddc68 files/fvwm-iconman.diff 2383
 MD5 b2af3c1c8fe4f142e2b8debbb5c59a94 files/digest-fvwm-2.4.17 65
 MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
+MD5 91ad7db238311a86a2e0d27c9186264c files/fvwm-2.5.8-FvwmScript-Quit-reboot.diff 307
 MD5 8ebd7b398d3c580ca5067c78f8642ae1 files/fvwm-2.5.8-taskbar-margins.diff 1384
 MD5 977c11b7ca7c17cff7a14d1d4a0136f4 files/fvwm-2.5.8-perllib-disconnect.diff 1179
 MD5 5dc401c9f6a50da0bfa85a025749652a files/fvwm-2.5.8-fvwm-menu-directory-security.diff 382
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-FvwmScript-Quit-reboot.diff b/x11-wm/fvwm/files/fvwm-2.5.8-FvwmScript-Quit-reboot.diff
new file mode 100644
index 000000000000..cc557d6ee2c1
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.5.8-FvwmScript-Quit-reboot.diff
@@ -0,0 +1,11 @@
+--- modules/FvwmScript/Scripts/FvwmScript-Quit	2001-10-13 17:18:45.000000000 +0100
++++ modules/FvwmScript/Scripts/FvwmScript-Quit	2004-01-13 11:56:52.000000000 +0000
+@@ -221,7 +221,7 @@
+    ChangeValue 7 0
+    ChangeValue 8 0
+    ChangeValue 9 0
+-   Set $ToDo = Restart
++   Set $ToDo = Reboot
+   End
+ End
+ 
diff --git a/x11-wm/fvwm/fvwm-2.4.17.ebuild b/x11-wm/fvwm/fvwm-2.4.17.ebuild
index 864261ce8c7b..d9de6882ce41 100644
--- a/x11-wm/fvwm/fvwm-2.4.17.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.17.ebuild,v 1.2 2003/10/13 17:17:05 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.17.ebuild,v 1.3 2004/01/13 12:19:03 taviso Exp $
 
 inherit gnuconfig
 
diff --git a/x11-wm/fvwm/fvwm-2.5.7-r5.ebuild b/x11-wm/fvwm/fvwm-2.5.7-r5.ebuild
index e244f122793f..3fc95a346f43 100644
--- a/x11-wm/fvwm/fvwm-2.5.7-r5.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.7-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.7-r5.ebuild,v 1.2 2003/10/31 16:07:15 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.7-r5.ebuild,v 1.3 2004/01/13 12:19:03 taviso Exp $
 
 inherit gnuconfig
 
diff --git a/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild
index d9d3bc0f4b7a..12a3716124ef 100644
--- a/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild,v 1.6 2003/12/11 11:59:24 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild,v 1.7 2004/01/13 12:19:03 taviso Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/x11-wm/fvwm/fvwm-2.5.8-r3.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r3.ebuild
index 72db4fe75133..33a79f4335cb 100644
--- a/x11-wm/fvwm/fvwm-2.5.8-r3.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r3.ebuild,v 1.2 2004/01/12 10:50:32 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r3.ebuild,v 1.3 2004/01/13 12:19:03 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -90,10 +90,12 @@ src_unpack() {
 	# this patch adds an 'ShowOnlyIcons Never' option to FvwmIconMan.
 	cd ${S}; epatch ${FILESDIR}/fvwm-iconman.diff
 
-	# if you disable the start button in FvwmTaskBar, your margins
-	# may get ignored.
+	# if you disable the start button in FvwmTaskBar, margins may get ignored.
 	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-taskbar-margins.diff
 
+	# FvwmScript-Quit wont reboot the computer
+	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-FvwmScript-Quit-reboot.diff
+
 	# build fails on alpha with certain options without this.
 	use alpha && append-flags -fPIC
 }