Index: head/x11-wm/wm2/Makefile
===================================================================
--- head/x11-wm/wm2/Makefile	(revision 408896)
+++ head/x11-wm/wm2/Makefile	(revision 408897)
@@ -1,26 +1,28 @@
 # Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	wm2
 PORTVERSION=	4.0
 PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.all-day-breakfast.com/wm2/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple window manager for X
 
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 USE_XORG=	x11 xext xmu
 ALL_TARGET=	depend wm2
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/x11-wm/wm2/files/patch-Client.C
===================================================================
--- head/x11-wm/wm2/files/patch-Client.C	(revision 408896)
+++ head/x11-wm/wm2/files/patch-Client.C	(revision 408897)
@@ -1,11 +1,11 @@
---- Client.C.orig	2007-07-31 22:18:48.000000000 +0200
-+++ Client.C	2007-07-31 22:19:06.000000000 +0200
-@@ -410,7 +410,7 @@
+--- Client.C.orig	1997-03-21 11:12:30 UTC
++++ Client.C
+@@ -410,7 +410,7 @@ int Client::getAtomProperty(Atom a, Atom
  
      x = *p;
      XFree((void *)p);
 -    return (int)x;
 +    return (intptr_t)x;
  }
  
  
Index: head/x11-wm/wm2/files/patch-General.h
===================================================================
--- head/x11-wm/wm2/files/patch-General.h	(revision 408896)
+++ head/x11-wm/wm2/files/patch-General.h	(revision 408897)
@@ -1,11 +1,11 @@
---- General.h.orig	Tue Jan 28 17:48:55 2003
-+++ General.h	Tue Jan 28 17:49:06 2003
-@@ -40,7 +40,7 @@
+--- General.h.orig	1997-03-21 11:12:30 UTC
++++ General.h
+@@ -40,7 +40,7 @@ typedef char Boolean;
      struct sigaction sAct; \
      (void)sigemptyset(&sAct.sa_mask); \
      sAct.sa_flags = 0; \
 -    sAct.sa_handler = (SIGNAL_CALLBACK_TYPE(y)); \
 +    sAct.sa_handler = y; \
      (void)sigaction((x), &sAct, NULL); \
    } while (0)
  
Index: head/x11-wm/wm2/files/patch-Makefile
===================================================================
--- head/x11-wm/wm2/files/patch-Makefile	(revision 408896)
+++ head/x11-wm/wm2/files/patch-Makefile	(revision 408897)
@@ -1,25 +1,25 @@
---- Makefile.orig	Fri Mar 21 12:12:30 1997
-+++ Makefile	Tue Jan 28 17:53:41 2003
+--- Makefile.orig	1997-03-21 11:12:30 UTC
++++ Makefile
 @@ -1,9 +1,10 @@
  
 -LIBS	=  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
 +LIBS	=  -L$(LOCALBASE)/lib -lXext -lX11 -lXmu -lm
 +LIBS	+= -Wl,-rpath,$(PREFIX)/lib
  
 -CC	= gcc
 -CCC	= gcc
 -CFLAGS	= -O2
 +CC	?= gcc
 +CCC	= $(CXX)
 +CFLAGS	+= -I$(LOCALBASE)/include
  OBJECTS	= Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o
  
  .c.o:
-@@ -13,7 +16,6 @@
+@@ -13,7 +14,6 @@ OBJECTS	= Border.o Buttons.o Client.o Ev
  	$(CCC) -c $(CFLAGS) $<
  
  wm2:	$(OBJECTS)
 -	mv -f wm2 wm2.old >& /dev/null || true
  	$(CCC) -o wm2 $(OBJECTS) $(LIBS)
  
  depend:
Index: head/x11-wm/wm2/files/patch-Manager.C
===================================================================
--- head/x11-wm/wm2/files/patch-Manager.C	(revision 408896)
+++ head/x11-wm/wm2/files/patch-Manager.C	(revision 408897)
@@ -1,11 +1,11 @@
---- Manager.C.orig	Fri Mar 21 12:12:30 1997
-+++ Manager.C	Tue Jan 28 17:45:03 2003
-@@ -368,7 +368,7 @@
+--- Manager.C.orig	1997-03-21 11:12:30 UTC
++++ Manager.C
+@@ -368,7 +368,7 @@ Time WindowManager::timestamp(Boolean re
      return m_currentTime;
  }
  
 -void WindowManager::sigHandler()
 +void WindowManager::sigHandler(int)
  {
      m_signalled = True;
  }
Index: head/x11-wm/wm2/files/patch-Manager.h
===================================================================
--- head/x11-wm/wm2/files/patch-Manager.h	(revision 408896)
+++ head/x11-wm/wm2/files/patch-Manager.h	(revision 408897)
@@ -1,11 +1,11 @@
---- Manager.h.orig	Tue Jan 28 17:41:36 2003
-+++ Manager.h	Tue Jan 28 17:41:46 2003
-@@ -85,7 +85,7 @@
+--- Manager.h.orig	1997-03-21 11:12:30 UTC
++++ Manager.h
+@@ -85,7 +85,7 @@ private:
  
      static Boolean m_initialising;
      static int errorHandler(Display *, XErrorEvent *);
 -    static void sigHandler();
 +    static void sigHandler(int);
      static int m_signalled;
  
      void initialiseScreen();
Index: head/x11-wm/wm2/pkg-descr
===================================================================
--- head/x11-wm/wm2/pkg-descr	(revision 408896)
+++ head/x11-wm/wm2/pkg-descr	(revision 408897)
@@ -1,4 +1,14 @@
-wm2 -- a window manager
-=======================
+wm2 is a window manager for X.  It provides an unusual style of window
+decoration and as little functionality as I feel comfortable with in a
+window manager.  wm2 is not configurable, except by editing the source
+and recompiling the code, and is really intended for people who don't
+particularly want their window manager to be too friendly.
+
+wm2 provides:
+* Decorative frames for your windows.
+* The ability to move, resize, hide and restore windows.
+* No icons.
+* No configurable root menus, buttons or mouse or keyboard bindings.
+* No virtual desktop, toolbars or integrated applications.
 
 WWW: http://www.all-day-breakfast.com/wm2/