Index: x11/xmonad/Makefile
===================================================================
RCS file: /cvs/ports/x11/xmonad/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- x11/xmonad/Makefile	19 Sep 2008 21:14:13 -0000	1.9
+++ x11/xmonad/Makefile	13 Oct 2008 14:54:56 -0000
@@ -3,10 +3,10 @@
 COMMENT-main=		tiling window manager
 COMMENT-lib=		libraries for runtime configuration
 
-V=			0.7
+V=			0.8
 DISTNAME=		xmonad-$V
-PKGNAME-main=		xmonad-${V}p0
-PKGNAME-lib=		xmonad-lib-${V}p0
+PKGNAME-main=		xmonad-${V}
+PKGNAME-lib=		xmonad-lib-${V}
 CATEGORIES=		x11
 HOMEPAGE=		http://www.xmonad.org/
 
Index: x11/xmonad/distinfo
===================================================================
RCS file: /cvs/ports/x11/xmonad/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- x11/xmonad/distinfo	16 Apr 2008 21:00:56 -0000	1.7
+++ x11/xmonad/distinfo	13 Oct 2008 14:55:11 -0000
@@ -1,5 +1,5 @@
-MD5 (xmonad-0.7.tar.gz) = +eJfMQy6FdlunfStl+FWuA==
-RMD160 (xmonad-0.7.tar.gz) = eQ+M56OXX8OFomdwajwZ/ewfPDI=
-SHA1 (xmonad-0.7.tar.gz) = zz+3ZiySytuep7/ckWu+XMWHrIY=
-SHA256 (xmonad-0.7.tar.gz) = 1e4zjrbQaACC4g6q+gsjsyNY//5p4uxK17324Dx1HWc=
-SIZE (xmonad-0.7.tar.gz) = 52740
+MD5 (xmonad-0.8.tar.gz) = 677a154a32add77b6ae3dfa97d9873e0
+RMD160 (xmonad-0.8.tar.gz) = 50d203af66e80de469a12f6261e40451f00de227
+SHA1 (xmonad-0.8.tar.gz) = 26eb5e80ba83da43cec963435daec6b925e3b1a7
+SHA256 (xmonad-0.8.tar.gz) = 982a3189e6815dc7e1a9dfc5200a1d746490abe1a8a953f093ea9597a0d40681
+SIZE (xmonad-0.8.tar.gz) = 52896
Index: x11/xmonad/patches/patch-xmonad_cabal
===================================================================
RCS file: /cvs/ports/x11/xmonad/patches/patch-xmonad_cabal,v
retrieving revision 1.3
diff -u -p -r1.3 patch-xmonad_cabal
--- x11/xmonad/patches/patch-xmonad_cabal	16 Apr 2008 21:00:56 -0000	1.3
+++ x11/xmonad/patches/patch-xmonad_cabal	13 Oct 2008 14:55:19 -0000
@@ -1,13 +1,11 @@
-$OpenBSD: patch-xmonad_cabal,v 1.3 2008/04/16 21:00:56 kili Exp $
---- xmonad.cabal.orig	Sat Mar 29 21:59:44 2008
-+++ xmonad.cabal	Mon Mar 31 23:12:04 2008
-@@ -20,58 +20,29 @@ maintainer:         xmonad@haskell.org
- extra-source-files: README TODO CONFIG STYLE tests/loc.hs tests/Properties.hs
-                     man/xmonad.1.in man/xmonad.1 man/xmonad.html man/xmonad.hs
-                     util/GenerateManpage.hs
--cabal-version:      >= 1.2
--build-type:         Simple
-+build-depends: base < 3, X11>=1.2.1, X11-extras>=0.4, mtl, unix
+--- xmonad.cabal.orig	Fri Sep  5 22:53:18 2008
++++ xmonad.cabal	Thu Oct  9 14:59:28 2008
+@@ -23,55 +23,31 @@
+ cabal-version:      >= 1.2
+ build-type:         Simple
+ 
+-flag small_base
+-    description: Choose the new smaller, split-up base package.
 +exposed-modules:    XMonad
 +                    XMonad.Main
 +                    XMonad.Core
@@ -16,17 +14,15 @@ $OpenBSD: patch-xmonad_cabal,v 1.3 2008/
 +                    XMonad.ManageHook
 +                    XMonad.Operations
 +                    XMonad.StackSet
-+ghc-options:        -funbox-strict-fields -Wall -optl-Wl,-s
-+ghc-prof-options:   -prof -auto-all
-+extensions:         CPP
  
--flag small_base
--    description: Choose the new smaller, split-up base package.
--
 -flag testing
 -    description: Testing mode, only build minimal components
 -    default: False
--
++build-depends: base < 3, X11>=1.4.1, mtl, unix
++ghc-options:        -funbox-strict-fields -Wall
++ghc-prof-options:   -prof -auto-all
++extensions:         CPP
+ 
 -library
 -    exposed-modules:    XMonad
 -                        XMonad.Main
@@ -36,14 +32,27 @@ $OpenBSD: patch-xmonad_cabal,v 1.3 2008/
 -                        XMonad.ManageHook
 -                        XMonad.Operations
 -                        XMonad.StackSet
--
++executable:         xmonad
++main-is:            Main.hs
++other-modules:      XMonad
++                    XMonad.Main
++                    XMonad.Core
++                    XMonad.Config
++                    XMonad.Layout
++                    XMonad.ManageHook
++                    XMonad.Operations
++                    XMonad.StackSet
++ghc-options:        -funbox-strict-fields -Wall
++ghc-prof-options:   -prof -auto-all
++extensions:         CPP
+ 
 -    if flag(small_base)
 -        build-depends: base >= 3, containers, directory, process
 -    else
 -        build-depends: base < 3
 -    build-depends: X11>=1.4.1, mtl, unix
 -
--    ghc-options:        -funbox-strict-fields -Wall -optl-Wl,-s
+-    ghc-options:        -funbox-strict-fields -Wall
 -    ghc-prof-options:   -prof -auto-all
 -    extensions:         CPP
 -
@@ -61,7 +70,7 @@ $OpenBSD: patch-xmonad_cabal,v 1.3 2008/
 -                        XMonad.Operations
 -                        XMonad.StackSet
 -
--    ghc-options:        -funbox-strict-fields -Wall -optl-Wl,-s
+-    ghc-options:        -funbox-strict-fields -Wall
 -    ghc-prof-options:   -prof -auto-all
 -    extensions:         CPP
 -
@@ -72,16 +81,3 @@ $OpenBSD: patch-xmonad_cabal,v 1.3 2008/
 -        ghc-options:    -Werror
 -    if flag(testing) && flag(small_base)
 -        build-depends:  random
-+executable:         xmonad
-+main-is:            Main.hs
-+other-modules:      XMonad
-+                    XMonad.Main
-+                    XMonad.Core
-+                    XMonad.Config
-+                    XMonad.Layout
-+                    XMonad.ManageHook
-+                    XMonad.Operations
-+                    XMonad.StackSet
-+ghc-options:        -funbox-strict-fields -Wall -optl-Wl,-s
-+ghc-prof-options:   -prof -auto-all
-+extensions:         CPP