- Switch to options helpers

- Extend pkg-descr
- Regenerate patches with `make makepatch`

7 files changed, 29 insertions, 17 deletions

diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index e17a49830654..0e2ebe9d09a8 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -20,6 +20,8 @@ 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}
 
diff --git a/x11-wm/wm2/files/patch-Client.C b/x11-wm/wm2/files/patch-Client.C
index 05f6a7d6d028..f9cf80dc0d32 100644
--- a/x11-wm/wm2/files/patch-Client.C
+++ b/x11-wm/wm2/files/patch-Client.C
@@ -1,6 +1,6 @@
---- 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);
diff --git a/x11-wm/wm2/files/patch-General.h b/x11-wm/wm2/files/patch-General.h
index d6632c8b28f7..69f2da0e7d23 100644
--- a/x11-wm/wm2/files/patch-General.h
+++ b/x11-wm/wm2/files/patch-General.h
@@ -1,6 +1,6 @@
---- 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; \
diff --git a/x11-wm/wm2/files/patch-Makefile b/x11-wm/wm2/files/patch-Makefile
index 819ef9e6114c..1f34f09c491b 100644
--- a/x11-wm/wm2/files/patch-Makefile
+++ b/x11-wm/wm2/files/patch-Makefile
@@ -1,5 +1,5 @@
---- 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
@@ -15,7 +15,7 @@
  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)
diff --git a/x11-wm/wm2/files/patch-Manager.C b/x11-wm/wm2/files/patch-Manager.C
index cf52d5530163..898b71005e6e 100644
--- a/x11-wm/wm2/files/patch-Manager.C
+++ b/x11-wm/wm2/files/patch-Manager.C
@@ -1,6 +1,6 @@
---- 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;
  }
  
diff --git a/x11-wm/wm2/files/patch-Manager.h b/x11-wm/wm2/files/patch-Manager.h
index 0b827910c4f6..af35958c7b95 100644
--- a/x11-wm/wm2/files/patch-Manager.h
+++ b/x11-wm/wm2/files/patch-Manager.h
@@ -1,6 +1,6 @@
---- 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 *);
diff --git a/x11-wm/wm2/pkg-descr b/x11-wm/wm2/pkg-descr
index f88caccb5d0e..aad66a2a3ff4 100644
--- a/x11-wm/wm2/pkg-descr
+++ b/x11-wm/wm2/pkg-descr
@@ -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/