31 files changed, 753 insertions, 412 deletions

diff --git a/x11-wm/olvwm/files/patch-Imakefile b/x11-wm/olvwm/files/patch-Imakefile
new file mode 100644
index 000000000000..3b372f35a7cd
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-Imakefile
@@ -0,0 +1,87 @@
+--- Imakefile.orig	Mon Oct 26 09:16:54 1998
++++ Imakefile	Mon Oct 26 09:27:43 1998
+@@ -48,8 +48,10 @@
+ /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
+ 
+ /**/# For a generic Solaris 2.x system, I'd suggest
+-MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
++/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
+ 
++/**/# For FreeBSD
++MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DMAXPID=30000 -DREGEXP -DXPM -DXVIEW32
+ /**/#
+ /**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
+ /**/# want to include XPM support.  For a generic Solaris 1.x
+@@ -57,8 +59,11 @@
+ /**/#MORELDFLAGS=-L${OPENWINHOME}/lib
+ /**/#
+ /**/# For Solaris 2.x, I'd suggest
+-MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
++/**/#MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
+ 
++/**/# For FreeBSD
++MORELDFLAGS=-L$(USRLIBDIR) -lXpm
++XPMINCDIR=-I$(INCROOT)/X11
+ 
+ /**/# No more changes needed
+ 
+@@ -72,6 +77,7 @@
+ SYS_LIBRARIES = -ll -lm
+ INCLUDES = -I$(HEADER_DEST) -I$(TOP) $(XPMINCDIR) 
+ DEPLIBS = 
++EXTENSIONLIB = -lXext
+ LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
+ 
+ HEADERS = cmdstream.h cursors.h debug.h defaults.h dsdm.h environ.h error.h \
+@@ -115,26 +121,29 @@
+ 	${HEADERS} ${BITMAPS} ${SRCS} \
+ 	${MISC} ${INFOFILES} ${MANPAGES} ${SCRIPTS}
+ 
+-ComplexProgramTarget(olvwm)
+-
+-#if NeedMenuFile
+-InstallNonExecList($(MISC),$(LIBRARY_DEST))
+-#endif
++depend:: olvwmrc.c
+ 
+ parse.c: parse.l
+-	lex -t parse.l > parse.c
++	$(LEX) $(LFALGS) parse.l
++	$(MV) lex.yy.c parse.c
+ 
+-olvwmrc.c: olvwmrc.y
+-	yacc olvwmrc.y
+-	mv y.tab.c olvwmrc.c
++olvwmrc.c: parse.c olvwmrc.y
++	$(YACC) olvwmrc.y
++	$(MV) y.tab.c olvwmrc.c
+ 
+ olvwmrc.o: parse.c olvwmrc.c
+ 
++ComplexProgramTarget(olvwm)
++
++#if NeedMenuFile
++InstallNonExecList($(MISC),$(LIBRARY_DEST))
++#endif
++
+ version.c: ${SRCS} ${HEADERS}
+ 	@echo '#ident "@(#)olvwm version compiled '`date`'"' > version.c
+ 
+ clean::
+-	/bin/rm -f parse.c olvwmrc.c version.c
++	/bin/rm -f parse.c olvwmrc.c version.c .depend
+ 
+ install.man:: $(MANPAGES)
+ 	@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
+@@ -142,7 +151,11 @@
+ 	@for i in $(MANPAGES) ;\
+ 	do \
+ 	echo "installing $$i"; \
++	$(RM) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX)* ; \
+ 	$(INSTALL) -c $(INSTMANFLAGS) $$i $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
++	$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
+ 	done
++
++depend:: olvwmrc.c
+ 
+ #include <XView.prog>
diff --git a/x11-wm/olvwm/files/patch-aa b/x11-wm/olvwm/files/patch-aa
deleted file mode 100644
index e9d40b4bceae..000000000000
--- a/x11-wm/olvwm/files/patch-aa
+++ /dev/null
@@ -1,355 +0,0 @@
---- Imakefile.orig	Mon Oct 26 09:16:54 1998
-+++ Imakefile	Mon Oct 26 09:27:43 1998
-@@ -48,8 +48,10 @@
- /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
- 
- /**/# For a generic Solaris 2.x system, I'd suggest
--MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
-+/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
- 
-+/**/# For FreeBSD
-+MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DMAXPID=30000 -DREGEXP -DXPM -DXVIEW32
- /**/#
- /**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
- /**/# want to include XPM support.  For a generic Solaris 1.x
-@@ -57,8 +59,11 @@
- /**/#MORELDFLAGS=-L${OPENWINHOME}/lib
- /**/#
- /**/# For Solaris 2.x, I'd suggest
--MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
-+/**/#MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
- 
-+/**/# For FreeBSD
-+MORELDFLAGS=-L$(USRLIBDIR) -lXpm
-+XPMINCDIR=-I$(INCROOT)/X11
- 
- /**/# No more changes needed
- 
-@@ -72,6 +77,7 @@
- SYS_LIBRARIES = -ll -lm
- INCLUDES = -I$(HEADER_DEST) -I$(TOP) $(XPMINCDIR) 
- DEPLIBS = 
-+EXTENSIONLIB = -lXext
- LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
- 
- HEADERS = cmdstream.h cursors.h debug.h defaults.h dsdm.h environ.h error.h \
-@@ -115,26 +121,29 @@
- 	${HEADERS} ${BITMAPS} ${SRCS} \
- 	${MISC} ${INFOFILES} ${MANPAGES} ${SCRIPTS}
- 
--ComplexProgramTarget(olvwm)
--
--#if NeedMenuFile
--InstallNonExecList($(MISC),$(LIBRARY_DEST))
--#endif
-+depend:: olvwmrc.c
- 
- parse.c: parse.l
--	lex -t parse.l > parse.c
-+	$(LEX) $(LFALGS) parse.l
-+	$(MV) lex.yy.c parse.c
- 
--olvwmrc.c: olvwmrc.y
--	yacc olvwmrc.y
--	mv y.tab.c olvwmrc.c
-+olvwmrc.c: parse.c olvwmrc.y
-+	$(YACC) olvwmrc.y
-+	$(MV) y.tab.c olvwmrc.c
- 
- olvwmrc.o: parse.c olvwmrc.c
- 
-+ComplexProgramTarget(olvwm)
-+
-+#if NeedMenuFile
-+InstallNonExecList($(MISC),$(LIBRARY_DEST))
-+#endif
-+
- version.c: ${SRCS} ${HEADERS}
- 	@echo '#ident "@(#)olvwm version compiled '`date`'"' > version.c
- 
- clean::
--	/bin/rm -f parse.c olvwmrc.c version.c
-+	/bin/rm -f parse.c olvwmrc.c version.c .depend
- 
- install.man:: $(MANPAGES)
- 	@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
-@@ -142,7 +151,11 @@
- 	@for i in $(MANPAGES) ;\
- 	do \
- 	echo "installing $$i"; \
-+	$(RM) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX)* ; \
- 	$(INSTALL) -c $(INSTMANFLAGS) $$i $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
-+	$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
- 	done
-+
-+depend:: olvwmrc.c
- 
- #include <XView.prog>
-*** defaults.c.orig	Thu Jan 13 16:36:03 1994
---- defaults.c	Sun Jan 24 20:50:32 1999
-***************
-*** 30,38 ****
-  #include <X11/Xutil.h>
-  #include <X11/Xatom.h>
-  #include <X11/Xresource.h>
-- #ifdef OW_I18N_L4
-  #include <sys/param.h>
-- #endif
-  
-  #include "i18n.h"
-  #include "ollocale.h"
---- 30,36 ----
-***************
-*** 90,97 ****
---- 88,99 ----
-  #ifdef SVR4
-  	    if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) {
-  #else
-+ #ifdef BSD
-+ 	    if (0 == gethostname(hostname, sizeof(hostname))) {
-+ #else
-  	    if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
-  #endif
-+ #endif
-  		(void) strcat(filename, hostname);
-  		fileDB = XrmGetFileDatabase(filename);
-  	    }
-***************
-*** 159,165 ****
-  	    return appDB;
-      }
-  
-!     appDB = XrmGetFileDatabase("/usr/lib/X11/app-defaults/Olwm");
-      return appDB;
-  }
-  
---- 161,167 ----
-  	    return appDB;
-      }
-  
-!     appDB = XrmGetFileDatabase("/usr/X11R6/lib/X11/app-defaults/Olwm");
-      return appDB;
-  }
-  
---- gif.c.orig	Thu Jan 13 15:36:06 1994
-+++ gif.c	Mon Oct 19 13:46:15 1998
-@@ -56,6 +56,10 @@
- 	int     disposal;
- } Gif89 = { -1, -1, -1, 0 };
- 
-+static        ReadColorMap();
-+static        DoExtension();
-+static        GetDataBlock();
-+
- extern XImage* ReadImage();
- 
- XImage *ReadGIF(dpy, fd, pNcolors, pColors)
-@@ -456,7 +460,7 @@
- 	return code;
- }
- 
--static XImage*
-+extern XImage*
- ReadImage(dpy, fd, len, height, cmap, interlace, ignore)
- Display *dpy;
- FILE    *fd;
---- mem.c.orig	Thu Jan 13 15:36:08 1994
-+++ mem.c	Mon Oct 19 13:47:49 1998
-@@ -18,7 +18,12 @@
- 
- 
- #include <sys/types.h>
-+#include <sys/param.h>
-+#ifndef __STDC__
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include <memory.h>
- #include <stdio.h>
- 
---- olvwmrc.y.orig	Mon Oct 19 14:21:34 1998
-+++ olvwmrc.y	Mon Oct 19 14:04:33 1998
-@@ -37,7 +37,7 @@
- char	*LookupToken();
- char	*FindOlvwmRC();
- void	resetKeys();
--char	*strexpand();
-+static	char *strexpand();
- 
- typedef struct progscreen {
-     char        *target;
-@@ -527,7 +527,9 @@
- 	    }
- %%
- /* Programs */
-+#ifndef YYDEBUG
- #define YYDEBUG 1
-+#endif
- #include "parse.c"
- 
- extern List	*ActiveClientList;
---- olwm.c.orig	Thu Jan 13 15:36:12 1994
-+++ olwm.c	Mon Oct 19 14:08:54 1998
-@@ -677,9 +677,15 @@
-         pid_t pid;
-         int status;
- #else
-+#ifdef BSD
-+	int oldmask;
-+	int pid;
-+	int status;
-+#else
- 	int oldmask;
- 	int pid;
- 	union wait status;
-+#endif
- #endif
- 
- 	if (!deadChildren)
-*** screen.c.orig	Sun Jan 24 20:03:43 1999
---- screen.c	Sun Jan 24 20:58:29 1999
-***************
-*** 66,71 ****
---- 66,78 ----
-   *-------------------------------------------------------------------------*/
-  List	*ScreenInfoList;			/* List of managed screens */
-  extern	Bool BoolString();
-+ static	updateScreenWorkspaceColor();
-+ static	updateScreenWindowColor();
-+ static	updateScreenForegroundColor();
-+ static	updateScreenBackgroundColor();
-+ static	updateScreenBorderColor();
-+ static	updateScreenInputFocusColor();
-+ static	updateScreenGlyphFont();
-  
-  /*-------------------------------------------------------------------------
-   *	Local Data
-***************
-*** 282,287 ****
---- 289,295 ----
-  		     	case PseudoColor:
-  			case GrayScale:
-  		     	case DirectColor:
-+ 			case TrueColor:
-  		    		return True;
-  				/*NOTREACHED*/
-  		    		break;
-***************
-*** 523,529 ****
-   *      Construct bitmap search path as follows:
-   *	      $OPENWINHOME/etc/workspace/patterns
-   *	      $OPENWINHOME/include/X11/include/bitmaps
-!  *	      /usr/X11/include/X11/include/bitmaps
-   *
-   * REMIND: this should be cleaned up so that it doesn't use a fixed-size
-   * array.
---- 531,537 ----
-   *      Construct bitmap search path as follows:
-   *	      $OPENWINHOME/etc/workspace/patterns
-   *	      $OPENWINHOME/include/X11/include/bitmaps
-!  *	      /usr/X11R6/include/X11/include/bitmaps
-   *
-   * REMIND: this should be cleaned up so that it doesn't use a fixed-size
-   * array.
-***************
-*** 546,552 ****
-  	(void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
-  	bitmapSearchPath[i++] = MemNewString(bmPath);
-  
-! 	bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
-  	bitmapSearchPath[i] = (char *)NULL;
-  }
-  
---- 554,560 ----
-  	(void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
-  	bitmapSearchPath[i++] = MemNewString(bmPath);
-  
-! 	bitmapSearchPath[i++] = MemNewString("/usr/X11R6/include/X11/bitmaps");
-  	bitmapSearchPath[i] = (char *)NULL;
-  }
-  
---- st.c.orig	Thu Jan 13 15:36:18 1994
-+++ st.c	Mon Oct 19 14:12:31 1998
-@@ -14,6 +14,7 @@
- #include "st.h"
- #include "mem.h"
- 
-+static rehash();
- 
- #define max(a,b) ((a) > (b) ? (a) : (b))
- #define nil(type) ((type *) 0)
---- virtual.c.orig	Thu Jan 13 15:36:22 1994
-+++ virtual.c	Mon Oct 19 14:13:27 1998
-@@ -39,15 +39,18 @@
- #define TRUE 1
- #define FALSE 0
- 
--#include <regexp.h>
-+#include <regex.h>
- #ifdef REGEXP
--regexp *expbuf;
-+regex_t expbuf;
- #endif
- 
- #ifdef IDENT
- #ident "@(#)virtual.c	1.6 olvwm version 07 Jan 1994"
- #endif
- 
-+static rexMatch();
-+static rexInit();
-+
- /* Class Function Vector; a virtual pane is the VDM window in which all
-  * the little virtual windows appear (and to which said windows are
-  * parented)
-@@ -2108,14 +2111,16 @@
-     }
- }
- 
-+#ifndef REGEXP
- static char expbuf[256];
-+#endif
- 
- static
- rexMatch(string)
-     char *string;
- {
- #ifdef REGEXP
--    return regexec(expbuf, string);
-+    return regexec(&expbuf, string, 0, NULL, 0);
- #else
-     return step(string,expbuf);
- #endif
-@@ -2152,7 +2157,7 @@
-     newPattern[j++] = '$';
-     newPattern[j++] = '\0';
- #ifdef REGEXP
--    expbuf = regcomp(newPattern);
-+    regcomp(&expbuf, newPattern, 0);
- #else
-     compile(newPattern, expbuf, &expbuf[256], '\0');
- #endif
---- winframe.c.orig	Thu Jan 13 15:36:25 1994
-+++ winframe.c	Mon Oct 19 14:14:26 1998
-@@ -52,6 +52,8 @@
- 
- extern Time TimeFresh();
- 
-+static headerHeight();
-+
- /***************************************************************************
- * private data
- ***************************************************************************/
---- winicon.c.orig	Thu Jan 13 15:36:26 1994
-+++ winicon.c	Mon Oct 19 14:15:05 1998
-@@ -37,6 +37,10 @@
- extern 	Bool	PropGetWMName();
- extern 	Bool	PropGetWMIconName();
- 
-+static	heightTopIcon();
-+static	heightBottomIcon();
-+static	widthBothIcon();
-+
- /***************************************************************************
- * private data
- ***************************************************************************/
diff --git a/x11-wm/olvwm/files/patch-ad b/x11-wm/olvwm/files/patch-ad
deleted file mode 100644
index adf5f7b6606d..000000000000
--- a/x11-wm/olvwm/files/patch-ad
+++ /dev/null
@@ -1,57 +0,0 @@
-*** fontset.c.orig	Sun Jan 24 20:51:59 1999
---- fontset.c	Sun Jan 24 20:54:54 1999
-***************
-*** 210,216 ****
-  
-  	if (notFound)
-  	{
-!         	(void) sprintf(filename, "/usr/lib/X11/app-defaults/%s/%s",
-  			locale, FONT_SETS);
-  	}
-  
---- 210,216 ----
-  
-  	if (notFound)
-  	{
-!         	(void) sprintf(filename, "/usr/X11R6/lib/X11/app-defaults/%s/%s",
-  			locale, FONT_SETS);
-  	}
-  
-*** ol_button.413.c.orig	Sun Jan 24 20:16:16 1999
---- ol_button.413.c	Sun Jan 24 20:21:00 1999
-***************
-*** 8,14 ****
-   * a version of olgx 3.2 (from the xview 3.2 release) and don't want to
-   * use this file, change the define here
-   */
-! #ifndef SVR4
-  
-  /*
-   * Based on
---- 8,14 ----
-   * a version of olgx 3.2 (from the xview 3.2 release) and don't want to
-   * use this file, change the define here
-   */
-! #if !defined(SVR4) && !defined(XVIEW32)
-  
-  /*
-   * Based on
-*** ol_button.svr4.c.orig	Sun Jan 24 20:21:22 1999
---- ol_button.svr4.c	Sun Jan 24 20:23:34 1999
-***************
-*** 12,18 ****
-   *
-   */
-  
-! #ifdef SVR4
-  
-  /*
-   * Copyright 1989-1990 Sun Microsystems  See LEGAL_NOTICE for terms of
---- 12,18 ----
-   *
-   */
-  
-! #if defined(SVR4) || defined(XVIEW32)
-  
-  /*
-   * Copyright 1989-1990 Sun Microsystems  See LEGAL_NOTICE for terms of
diff --git a/x11-wm/olvwm/files/patch-ac b/x11-wm/olvwm/files/patch-cursors.c
index 3f76c09c5650..3f76c09c5650 100644
--- a/x11-wm/olvwm/files/patch-ac
+++ b/x11-wm/olvwm/files/patch-cursors.c
diff --git a/x11-wm/olvwm/files/patch-defaults.c b/x11-wm/olvwm/files/patch-defaults.c
new file mode 100644
index 000000000000..39e7c4c6c064
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-defaults.c
@@ -0,0 +1,46 @@
+*** defaults.c.orig	Thu Jan 13 16:36:03 1994
+--- defaults.c	Sun Jan 24 20:50:32 1999
+***************
+*** 30,38 ****
+  #include <X11/Xutil.h>
+  #include <X11/Xatom.h>
+  #include <X11/Xresource.h>
+- #ifdef OW_I18N_L4
+  #include <sys/param.h>
+- #endif
+  
+  #include "i18n.h"
+  #include "ollocale.h"
+--- 30,36 ----
+***************
+*** 90,97 ****
+--- 88,99 ----
+  #ifdef SVR4
+  	    if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) {
+  #else
++ #ifdef BSD
++ 	    if (0 == gethostname(hostname, sizeof(hostname))) {
++ #else
+  	    if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
+  #endif
++ #endif
+  		(void) strcat(filename, hostname);
+  		fileDB = XrmGetFileDatabase(filename);
+  	    }
+***************
+*** 159,165 ****
+  	    return appDB;
+      }
+  
+!     appDB = XrmGetFileDatabase("/usr/lib/X11/app-defaults/Olwm");
+      return appDB;
+  }
+  
+--- 161,167 ----
+  	    return appDB;
+      }
+  
+!     appDB = XrmGetFileDatabase("/usr/X11R6/lib/X11/app-defaults/Olwm");
+      return appDB;
+  }
+  
diff --git a/x11-wm/olvwm/files/patch-fontset.c b/x11-wm/olvwm/files/patch-fontset.c
new file mode 100644
index 000000000000..9f5e70bbcfa6
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-fontset.c
@@ -0,0 +1,19 @@
+*** fontset.c.orig	Sun Jan 24 20:51:59 1999
+--- fontset.c	Sun Jan 24 20:54:54 1999
+***************
+*** 210,216 ****
+  
+  	if (notFound)
+  	{
+!         	(void) sprintf(filename, "/usr/lib/X11/app-defaults/%s/%s",
+  			locale, FONT_SETS);
+  	}
+  
+--- 210,216 ----
+  
+  	if (notFound)
+  	{
+!         	(void) sprintf(filename, "/usr/X11R6/lib/X11/app-defaults/%s/%s",
+  			locale, FONT_SETS);
+  	}
+  
diff --git a/x11-wm/olvwm/files/patch-bb b/x11-wm/olvwm/files/patch-gettext.c
index 9cad8cc8dc20..9cad8cc8dc20 100644
--- a/x11-wm/olvwm/files/patch-bb
+++ b/x11-wm/olvwm/files/patch-gettext.c
diff --git a/x11-wm/olvwm/files/patch-gif.c b/x11-wm/olvwm/files/patch-gif.c
new file mode 100644
index 000000000000..ca03391d7e7f
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-gif.c
@@ -0,0 +1,22 @@
+--- gif.c.orig	Thu Jan 13 15:36:06 1994
++++ gif.c	Mon Oct 19 13:46:15 1998
+@@ -56,6 +56,10 @@
+ 	int     disposal;
+ } Gif89 = { -1, -1, -1, 0 };
+ 
++static        ReadColorMap();
++static        DoExtension();
++static        GetDataBlock();
++
+ extern XImage* ReadImage();
+ 
+ XImage *ReadGIF(dpy, fd, pNcolors, pColors)
+@@ -456,7 +460,7 @@
+ 	return code;
+ }
+ 
+-static XImage*
++extern XImage*
+ ReadImage(dpy, fd, len, height, cmap, interlace, ignore)
+ Display *dpy;
+ FILE    *fd;
diff --git a/x11-wm/olvwm/files/patch-mem.c b/x11-wm/olvwm/files/patch-mem.c
new file mode 100644
index 000000000000..6431e8abba20
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-mem.c
@@ -0,0 +1,15 @@
+--- mem.c.orig	Thu Jan 13 15:36:08 1994
++++ mem.c	Mon Oct 19 13:47:49 1998
+@@ -18,7 +18,12 @@
+ 
+ 
+ #include <sys/types.h>
++#include <sys/param.h>
++#ifndef __STDC__
+ #include <malloc.h>
++#else
++#include <stdlib.h>
++#endif
+ #include <memory.h>
+ #include <stdio.h>
+ 
diff --git a/x11-wm/olvwm/files/patch-ab b/x11-wm/olvwm/files/patch-menu.c
index 784ff039bdad..784ff039bdad 100644
--- a/x11-wm/olvwm/files/patch-ab
+++ b/x11-wm/olvwm/files/patch-menu.c
diff --git a/x11-wm/olvwm/files/patch-ol_button.413.c b/x11-wm/olvwm/files/patch-ol_button.413.c
new file mode 100644
index 000000000000..3b1a2cbfb042
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-ol_button.413.c
@@ -0,0 +1,19 @@
+*** ol_button.413.c.orig	Sun Jan 24 20:16:16 1999
+--- ol_button.413.c	Sun Jan 24 20:21:00 1999
+***************
+*** 8,14 ****
+   * a version of olgx 3.2 (from the xview 3.2 release) and don't want to
+   * use this file, change the define here
+   */
+! #ifndef SVR4
+  
+  /*
+   * Based on
+--- 8,14 ----
+   * a version of olgx 3.2 (from the xview 3.2 release) and don't want to
+   * use this file, change the define here
+   */
+! #if !defined(SVR4) && !defined(XVIEW32)
+  
+  /*
+   * Based on
diff --git a/x11-wm/olvwm/files/patch-ol_button.svr4.c b/x11-wm/olvwm/files/patch-ol_button.svr4.c
new file mode 100644
index 000000000000..2cb9d4ec5d5d
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-ol_button.svr4.c
@@ -0,0 +1,19 @@
+*** ol_button.svr4.c.orig	Sun Jan 24 20:21:22 1999
+--- ol_button.svr4.c	Sun Jan 24 20:23:34 1999
+***************
+*** 12,18 ****
+   *
+   */
+  
+! #ifdef SVR4
+  
+  /*
+   * Copyright 1989-1990 Sun Microsystems  See LEGAL_NOTICE for terms of
+--- 12,18 ----
+   *
+   */
+  
+! #if defined(SVR4) || defined(XVIEW32)
+  
+  /*
+   * Copyright 1989-1990 Sun Microsystems  See LEGAL_NOTICE for terms of
diff --git a/x11-wm/olvwm/files/patch-olvwmrc.y b/x11-wm/olvwm/files/patch-olvwmrc.y
new file mode 100644
index 000000000000..73c6f26151fb
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-olvwmrc.y
@@ -0,0 +1,48 @@
+--- olvwmrc.y.orig	2013-09-17 21:38:07.492238885 -0700
++++ olvwmrc.y	2013-09-17 21:40:59.782778854 -0700
+@@ -37,7 +37,7 @@
+ char	*LookupToken();
+ char	*FindOlvwmRC();
+ void	resetKeys();
+-char	*strexpand();
++static	char *strexpand();
+ 
+ typedef struct progscreen {
+     char        *target;
+@@ -527,7 +527,9 @@
+ 	    }
+ %%
+ /* Programs */
++#ifndef YYDEBUG
+ #define YYDEBUG 1
++#endif
+ #include "parse.c"
+ 
+ extern List	*ActiveClientList;
+@@ -1160,7 +1162,7 @@
+ 	    for (c = ListEnum(&l); c != NULL; c = ListEnum(&l)) {
+ 		if (findClient(c, ie->identifier)) {
+ 		    ListApply(ie->doIf, applyAction, c);
+-		    return;
++		    return 0;
+ 		}
+ 	    }
+ 	    ListApply(ie->doElse, applyAction, cli);
+@@ -1260,7 +1262,7 @@
+     if (path == NULL)
+ 	path = FindOlvwmRC(&olvwmBuf);
+     if (path == NULL || (yyin = fopen(path, "r")) == NULL)
+-	return;
++	return 0;
+     olvwmOldBuf = olvwmBuf;
+     dpy = ldpy;
+     NumLockMask = FindModifierMask(XKeysymToKeycode(dpy, XK_Num_Lock));
+@@ -1283,7 +1285,7 @@
+ extern XrmDatabase OlwmDB;
+ 
+     if (!p)
+-	return;
++	return 0;
+     if (olvwmBuf.st_mtime != olvwmOldBuf.st_mtime
+           || olvwmBuf.st_size != olvwmOldBuf.st_size
+           || olvwmBuf.st_dev != olvwmOldBuf.st_dev
diff --git a/x11-wm/olvwm/files/patch-olwm.c b/x11-wm/olvwm/files/patch-olwm.c
new file mode 100644
index 000000000000..9fe4e1c52791
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-olwm.c
@@ -0,0 +1,18 @@
+--- olwm.c.orig	Thu Jan 13 15:36:12 1994
++++ olwm.c	Mon Oct 19 14:08:54 1998
+@@ -677,9 +677,15 @@
+         pid_t pid;
+         int status;
+ #else
++#ifdef BSD
++	int oldmask;
++	int pid;
++	int status;
++#else
+ 	int oldmask;
+ 	int pid;
+ 	union wait status;
++#endif
+ #endif
+ 
+ 	if (!deadChildren)
diff --git a/x11-wm/olvwm/files/patch-ba b/x11-wm/olvwm/files/patch-pixmap.c
index f152402439e9..f152402439e9 100644
--- a/x11-wm/olvwm/files/patch-ba
+++ b/x11-wm/olvwm/files/patch-pixmap.c
diff --git a/x11-wm/olvwm/files/patch-screen.c b/x11-wm/olvwm/files/patch-screen.c
new file mode 100644
index 000000000000..a46b38cbbd9e
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-screen.c
@@ -0,0 +1,69 @@
+--- screen.c.orig	2013-09-17 21:38:07.462238988 -0700
++++ screen.c	2013-09-17 21:43:56.890844306 -0700
+@@ -66,6 +66,13 @@
+  *-------------------------------------------------------------------------*/
+ List	*ScreenInfoList;			/* List of managed screens */
+ extern	Bool BoolString();
++static	updateScreenWorkspaceColor();
++static	updateScreenWindowColor();
++static	updateScreenForegroundColor();
++static	updateScreenBackgroundColor();
++static	updateScreenBorderColor();
++static	updateScreenInputFocusColor();
++static	updateScreenGlyphFont();
+ 
+ /*-------------------------------------------------------------------------
+  *	Local Data
+@@ -282,6 +289,7 @@
+ 		     	case PseudoColor:
+ 			case GrayScale:
+ 		     	case DirectColor:
++			case TrueColor:
+ 		    		return True;
+ 				/*NOTREACHED*/
+ 		    		break;
+@@ -523,7 +531,7 @@
+  *      Construct bitmap search path as follows:
+  *	      $OPENWINHOME/etc/workspace/patterns
+  *	      $OPENWINHOME/include/X11/include/bitmaps
+- *	      /usr/X11/include/X11/include/bitmaps
++ *	      /usr/X11R6/include/X11/include/bitmaps
+  *
+  * REMIND: this should be cleaned up so that it doesn't use a fixed-size
+  * array.
+@@ -546,7 +554,7 @@
+ 	(void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
+ 	bitmapSearchPath[i++] = MemNewString(bmPath);
+ 
+-	bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
++	bitmapSearchPath[i++] = MemNewString("/usr/X11R6/include/X11/bitmaps");
+ 	bitmapSearchPath[i] = (char *)NULL;
+ }
+ 
+@@ -2431,7 +2439,7 @@
+ 	if (!geom)
+ 	    geom = GRV.VirtualGeometry;
+ 	if (!geom || !*geom)
+-	    return;
++	    return 0;
+ 	if (scrInfo->vdm->resources->geometry)
+ 	    free(scrInfo->vdm->resources->geometry);
+ 	scrInfo->vdm->resources->geometry = strdup(geom);
+@@ -2451,7 +2459,7 @@
+ 	if (!name)
+ 	    name = GRV.VirtualBackgroundMap;
+ 	if (!name || !*name)
+-	    return;
++	    return 0;
+ 	if (scrInfo->vdm->resources->background)
+ 	    free(scrInfo->vdm->resources->background);
+ 	scrInfo->vdm->resources->background = strdup(name);
+@@ -2479,7 +2487,7 @@
+ 	ScreenInfo	*scrInfo;
+ {
+ 	if (!scrInfo->vdm->resources->background)
+-	    return;
++	    return 0;
+ 	UpdateScreenVirtualMap(dpy,scrInfo);
+ }
+ 
diff --git a/x11-wm/olvwm/files/patch-selection.c b/x11-wm/olvwm/files/patch-selection.c
new file mode 100644
index 000000000000..35e8e0bfe62a
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-selection.c
@@ -0,0 +1,18 @@
+--- selection.c.orig	2013-09-17 21:38:07.442239399 -0700
++++ selection.c	2013-09-17 21:45:20.241114850 -0700
+@@ -318,13 +318,13 @@
+ 		XSetSelectionOwner(cli->dpy, XA_PRIMARY,
+ 				   NoFocusWin, timestamp);
+ 		if (NoFocusWin != XGetSelectionOwner(cli->dpy, XA_PRIMARY))
+-		    return;
++		    return 0;
+ 	} else {
+ 		/* First look to see if window is already listed. */
+ 		for(tc = ListEnum(&l); tc != NULL; tc = ListEnum(&l))
+ 		{
+ 			if (tc == cli)
+-				return;
++				return 0;
+ 		}
+ 	}
+ 
diff --git a/x11-wm/olvwm/files/patch-slots.c b/x11-wm/olvwm/files/patch-slots.c
new file mode 100644
index 000000000000..705ede9a6556
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-slots.c
@@ -0,0 +1,20 @@
+--- slots.c.orig	2013-09-17 21:38:07.382240689 -0700
++++ slots.c	2013-09-17 21:50:50.762215147 -0700
+@@ -542,7 +542,7 @@
+ 
+ 	if (winicon->iconslot == NULL)
+ 	{
+-		return;
++		return 0;
+ 	}
+ 
+ 	incrRegion(iconGrid,winicon->iconslot,-1);
+@@ -627,7 +627,7 @@
+ 		for (ima = 0; ima<iconGrid->maslots; ima++)
+ 		    for (imi = 0; imi<iconGrid->mislots; imi++)
+ 			OCCUPANCY(iconGrid,ima,imi)=0;
+-		return;
++		return 0;
+ 	}
+ 
+ 	/* partition existing icons */
diff --git a/x11-wm/olvwm/files/patch-st.c b/x11-wm/olvwm/files/patch-st.c
new file mode 100644
index 000000000000..1718e0760948
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-st.c
@@ -0,0 +1,19 @@
+--- st.c.orig	2013-09-17 21:38:07.452239734 -0700
++++ st.c	2013-09-17 21:52:40.812590309 -0700
+@@ -14,6 +14,7 @@
+ #include "st.h"
+ #include "mem.h"
+ 
++static rehash();
+ 
+ #define max(a,b) ((a) > (b) ? (a) : (b))
+ #define nil(type) ((type *) 0)
+@@ -339,7 +340,7 @@
+ 		ptr = ptr->next;
+ 		break;
+ 	    case ST_STOP:
+-		return;
++		return 0;
+ 	    case ST_DELETE:
+ 		tmp = ptr;
+ 		if (last == nil(st_table_entry)) {
diff --git a/x11-wm/olvwm/files/patch-virtual.c b/x11-wm/olvwm/files/patch-virtual.c
new file mode 100644
index 000000000000..c4b8683d0e1d
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-virtual.c
@@ -0,0 +1,77 @@
+--- virtual.c.orig	2013-09-17 21:38:07.402239496 -0700
++++ virtual.c	2013-09-17 21:56:18.620843579 -0700
+@@ -39,15 +39,18 @@
+ #define TRUE 1
+ #define FALSE 0
+ 
+-#include <regexp.h>
++#include <regex.h>
+ #ifdef REGEXP
+-regexp *expbuf;
++regex_t expbuf;
+ #endif
+ 
+ #ifdef IDENT
+ #ident "@(#)virtual.c	1.6 olvwm version 07 Jan 1994"
+ #endif
+ 
++static rexMatch();
++static rexInit();
++
+ /* Class Function Vector; a virtual pane is the VDM window in which all
+  * the little virtual windows appear (and to which said windows are
+  * parented)
+@@ -648,7 +651,7 @@
+ XEvent	dummy;
+ 
+     if (event->xexpose.count)
+-	return;
++	return 0;
+     drawVDMGrid(dpy, winInfo->core.client->scrInfo->vdm);
+     while (XCheckTypedWindowEvent(dpy, event->xany.window, Expose, &dummy))
+ 	;	/* empty */
+@@ -1324,7 +1327,7 @@
+ 	    length = ((WinPaneFrame *) win)->nameLength;
+ 	    break;
+ 	default:
+-	    return;
++	    return 0;
+     }
+     XClearArea(cli->dpy, win->core.virtual, 0, 0, 0, 0, False);
+     if (cli->isBusy)
+@@ -2024,7 +2027,7 @@
+ 	    ErrorWarning(gettext("An invalid directory was named for DIRMENU"));
+ 	    menuInfo->buttons[bindex].subMenu =
+ 			MenuInfoCreate(cache, winInfo, menu, depth, slot);
+-	    return;
++	    return 0;
+ 	}
+     }
+     while (ent = readdir(dir)) {
+@@ -2108,14 +2111,16 @@
+     }
+ }
+ 
++#ifndef REGEXP
+ static char expbuf[256];
++#endif
+ 
+ static
+ rexMatch(string)
+     char *string;
+ {
+ #ifdef REGEXP
+-    return regexec(expbuf, string);
++    return regexec(&expbuf, string, 0, NULL, 0);
+ #else
+     return step(string,expbuf);
+ #endif
+@@ -2152,7 +2157,7 @@
+     newPattern[j++] = '$';
+     newPattern[j++] = '\0';
+ #ifdef REGEXP
+-    expbuf = regcomp(newPattern);
++    regcomp(&expbuf, newPattern, 0);
+ #else
+     compile(newPattern, expbuf, &expbuf[256], '\0');
+ #endif
diff --git a/x11-wm/olvwm/files/patch-winbutton.c b/x11-wm/olvwm/files/patch-winbutton.c
new file mode 100644
index 000000000000..b0f4d56a996f
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winbutton.c
@@ -0,0 +1,47 @@
+--- winbutton.c.orig	2013-09-17 21:38:07.482238656 -0700
++++ winbutton.c	2013-09-17 21:58:24.411286317 -0700
+@@ -100,7 +100,7 @@
+ 
+ 	if (winInfo->ignore) {
+ 	    FrameAllowEvents(cli, event->xbutton.time);
+-	    return;
++	    return 0;
+ 	}
+ 
+         switch (a) {
+@@ -128,7 +128,7 @@
+ 
+ 	default:
+ 	    FrameAllowEvents(cli, event->xbutton.time);
+-	    return;
++	    return 0;
+         }
+ }
+ 
+@@ -152,7 +152,7 @@
+ 	FrameAllowEvents(cli, event->xbutton.time);
+ 
+ 	if (!AllButtonsUp(event))
+-	    return;
++	    return 0;
+ 
+         XUngrabPointer(dpy, CurrentTime);
+ 
+@@ -165,7 +165,7 @@
+ 	}
+ 
+         if (!in_windowmark(winInfo,x,y) || currentAction != ACTION_SELECT) {
+-	    return;
++	    return 0;
+         }
+ 
+ 	if (! winInfo->ignore) {
+@@ -202,7 +202,7 @@
+ 	else gis = WinGI(winInfo,NORMAL_GINFO);
+ 
+ 	if (!event->xmotion.same_screen || currentAction != ACTION_SELECT)
+-		return;
++		return 0;
+ 
+         x = event->xmotion.x;
+         y = event->xmotion.y;
diff --git a/x11-wm/olvwm/files/patch-winframe.c b/x11-wm/olvwm/files/patch-winframe.c
new file mode 100644
index 000000000000..03c3a287aa2f
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winframe.c
@@ -0,0 +1,20 @@
+--- winframe.c.orig	2013-09-17 21:38:07.462238988 -0700
++++ winframe.c	2013-09-17 22:00:01.011629533 -0700
+@@ -52,6 +52,8 @@
+ 
+ extern Time TimeFresh();
+ 
++static headerHeight();
++
+ /***************************************************************************
+ * private data
+ ***************************************************************************/
+@@ -493,7 +495,7 @@
+ {
+     /* ignore events caused by grabs */
+     if (event->xcrossing.mode != NotifyNormal)
+-	return;
++	return 0;
+ 
+     if (event->xcrossing.detail != NotifyInferior)
+ 	frameInfo->pointerIsWarped = False;
diff --git a/x11-wm/olvwm/files/patch-wingframe.c b/x11-wm/olvwm/files/patch-wingframe.c
new file mode 100644
index 000000000000..e6338812a549
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-wingframe.c
@@ -0,0 +1,31 @@
+--- wingframe.c.orig	2013-09-17 21:38:07.442239399 -0700
++++ wingframe.c	2013-09-17 22:01:51.492024906 -0700
+@@ -285,7 +285,7 @@
+         Client *cli = frameInfo->core.client;
+ 
+ 	if (!AllButtonsUp(event))
+-	    return;
++	    return 0;
+ 
+ #define bevent  (event->xbutton)
+ 
+@@ -353,16 +353,16 @@
+         /* We get this only after a Select press */
+         if (hadSelect == False) /* watch for erroneous motions */
+         {
+-                return;
++                return 0;
+         }
+ 
+ 	if (!event->xmotion.same_screen)
+-		return;
++		return 0;
+ 
+         /* See if we have moved more than the threshold amount. */
+         if ((ABS(event->xmotion.x - buttonPressX) < GRV.MoveThreshold) &&
+             (ABS(event->xmotion.y - buttonPressY) < GRV.MoveThreshold))
+-                return;
++                return 0;
+ 
+ 	(WinFunc(frameInfo,fcore.selectDrag))(dpy, event, frameInfo, &lastSelectPress);
+ 
diff --git a/x11-wm/olvwm/files/patch-winicon.c b/x11-wm/olvwm/files/patch-winicon.c
new file mode 100644
index 000000000000..7aaa4a21c2f7
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winicon.c
@@ -0,0 +1,13 @@
+--- winicon.c.orig	Thu Jan 13 15:36:26 1994
++++ winicon.c	Mon Oct 19 14:15:05 1998
+@@ -37,6 +37,10 @@
+ extern 	Bool	PropGetWMName();
+ extern 	Bool	PropGetWMIconName();
+ 
++static	heightTopIcon();
++static	heightBottomIcon();
++static	widthBothIcon();
++
+ /***************************************************************************
+ * private data
+ ***************************************************************************/
diff --git a/x11-wm/olvwm/files/patch-winipane.c b/x11-wm/olvwm/files/patch-winipane.c
new file mode 100644
index 000000000000..5ba8f8d3a43f
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winipane.c
@@ -0,0 +1,11 @@
+--- winipane.c.orig	2013-09-17 21:38:07.432239206 -0700
++++ winipane.c	2013-09-17 22:03:24.772361669 -0700
+@@ -95,7 +95,7 @@
+ 	    XSetBackground(dpy, gc,
+ 			   winInfo->core.client->scrInfo->colorInfo.bgColor);
+ 	}
+-	return;
++	return 0;
+     }
+ 
+     XFillRectangle(dpy, pane, WinGC(winInfo,WORKSPACE_GC),
diff --git a/x11-wm/olvwm/files/patch-winnofoc.c b/x11-wm/olvwm/files/patch-winnofoc.c
new file mode 100644
index 000000000000..739caabd2ae8
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winnofoc.c
@@ -0,0 +1,11 @@
+--- winnofoc.c.orig	2013-09-17 21:38:07.492238885 -0700
++++ winnofoc.c	2013-09-17 22:06:01.202842480 -0700
+@@ -239,7 +239,7 @@
+         XEvent dummy;
+ 
+ 	if (FindModifierMask(event->xkey.keycode) != 0)
+-		return;
++		return 0;
+ 
+         XSync(dpy,0);
+         /*
diff --git a/x11-wm/olvwm/files/patch-winpane.c b/x11-wm/olvwm/files/patch-winpane.c
new file mode 100644
index 000000000000..20580b7716fb
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winpane.c
@@ -0,0 +1,11 @@
+--- winpane.c.orig	2013-09-17 21:38:07.492238885 -0700
++++ winpane.c	2013-09-17 22:07:33.003048309 -0700
+@@ -171,7 +171,7 @@
+ 	/* it's a ShapeNotify event */
+ 	se = (XShapeEvent *) event;
+ 	if (se->kind != ShapeBounding)
+-	    return;
++	    return 0;
+ 	cli = winInfo->core.client;
+ 	cli->isShaped = se->shaped;
+ 	
diff --git a/x11-wm/olvwm/files/patch-winpinmenu.c b/x11-wm/olvwm/files/patch-winpinmenu.c
new file mode 100644
index 000000000000..0658d843b0b9
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winpinmenu.c
@@ -0,0 +1,20 @@
+--- winpinmenu.c.orig	2013-09-17 21:38:07.462238988 -0700
++++ winpinmenu.c	2013-09-17 22:08:56.640738874 -0700
+@@ -91,7 +91,7 @@
+     WinPinMenu		*winInfo;
+ {
+     if (! StartMenuGrabs(dpy, winInfo))
+-	return;
++	return 0;
+ 
+     MenuMakeFirst(winInfo->menuInfo, afterMenuShow, winInfo);
+ 
+@@ -109,7 +109,7 @@
+ 
+     if (MenuHandleKeyEvent(dpy, event, winInfo, winInfo)) {
+ 	if (! StartMenuGrabs(dpy, winInfo))
+-	    return;
++	    return 0;
+     }
+ }
+ 
diff --git a/x11-wm/olvwm/files/patch-winpush.c b/x11-wm/olvwm/files/patch-winpush.c
new file mode 100644
index 000000000000..cb2eb57825ef
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winpush.c
@@ -0,0 +1,23 @@
+--- winpush.c.orig	2013-09-17 21:38:07.482238656 -0700
++++ winpush.c	2013-09-17 22:10:26.340945247 -0700
+@@ -103,7 +103,7 @@
+ {
+ 	FrameAllowEvents(winInfo->core.client, event->xbutton.time);
+ 	if (!AllButtonsUp(event))
+-	    return;
++	    return 0;
+ 
+ 	/*
+ 	 * If pushpinStateAfterPress equals the current pin state, we know 
+@@ -131,9 +131,9 @@
+ 	Graphics_info	*gisNormal = WinGI(winInfo,NORMAL_GINFO);
+ 
+ 	if (!event->xmotion.same_screen)
+-	    return;
++	    return 0;
+ 	if (currentAction != ACTION_SELECT && currentAction != ACTION_ADJUST)
+-	    return;
++	    return 0;
+ 
+         /* When the user moves the cursor off the pushpin
+          * while s/he has the button down we should pull
diff --git a/x11-wm/olvwm/files/patch-winresize.c b/x11-wm/olvwm/files/patch-winresize.c
new file mode 100644
index 000000000000..168756fd5797
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winresize.c
@@ -0,0 +1,11 @@
+--- winresize.c.orig	2013-09-17 21:38:07.392239520 -0700
++++ winresize.c	2013-09-17 22:11:21.781075811 -0700
+@@ -81,7 +81,7 @@
+ 
+         if (ResolveMouseBinding(dpy, event, ignoremask) != ACTION_SELECT) {
+ 	    FrameAllowEvents(winInfo->core.client, event->xbutton.time);
+-	    return;
++	    return 0;
+ 	}
+ 
+ 	/* draw depressed corner */
diff --git a/x11-wm/olvwm/files/patch-winroot.c b/x11-wm/olvwm/files/patch-winroot.c
new file mode 100644
index 000000000000..d6d4bc076517
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-winroot.c
@@ -0,0 +1,59 @@
+--- winroot.c.orig	2013-09-17 21:38:07.482238656 -0700
++++ winroot.c	2013-09-17 22:13:41.361407148 -0700
+@@ -197,7 +197,7 @@
+ 	WinRoot		*winInfo;
+ {
+         if (pEvent->xcrossing.detail == NotifyNonlinearVirtual)
+-            return;
++            return 0;
+ 
+ 	ColorWindowCrossing(dpy, pEvent, winInfo);
+ 
+@@ -291,7 +291,7 @@
+ 	int			(*selectFunc)();
+ 
+ 	if (!pEvent->xmotion.same_screen)
+-	    return;
++	    return 0;
+ 
+ 	/* If the user hasn't moved more than the threshold
+ 	 * amount, break out of here.  REMIND  Also, if we get a 
+@@ -304,9 +304,9 @@
+ 	     GRV.MoveThreshold) &&
+ 	    (ABS(pEvent->xmotion.y - winInfo->buttonPressEvent.xbutton.y) < 
+ 	     GRV.MoveThreshold))
+-	    return;
++	    return 0;
+ 	if (pEvent->xmotion.state == 0)
+-	   return;
++	   return 0;
+ 	
+ 	/*
+ 	 * On Select: Clear existing selected clients and add new ones
+@@ -343,7 +343,7 @@
+ 	WinRoot		*winInfo;
+ {
+ 	if (!AllButtonsUp(pEvent))
+-	    return;
++	    return 0;
+ 
+ 	/*
+ 	 * This only happens if we did NOT get a motion notify
+@@ -389,7 +389,7 @@
+ 		    pEvent->xbutton.time)))
+ 	    {
+ 		PropagatePressEventToChild(dpy, pEvent, child);
+-		return;
++		return 0;
+ 	    }
+ 
+ 	    /*
+@@ -457,7 +457,7 @@
+ 	 */
+ 	if ((pEvent->xproperty.atom != XA_RESOURCE_MANAGER) 
+ 	     || (pEvent->xproperty.state != PropertyNewValue))
+-		return;
++		return 0;
+ 
+ 	UpdateGlobals(dpy);
+ }