Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Sep 2013 05:16:46 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r327513 - head/x11-wm/olvwm/files
Message-ID:  <201309180516.r8I5Gkx8051098@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Wed Sep 18 05:16:46 2013
New Revision: 327513
URL: http://svnweb.freebsd.org/changeset/ports/327513

Log:
  Fix build under 10-CURRENT.
  
  Split old-style patch files into current standard individual patch files.

Added:
  head/x11-wm/olvwm/files/patch-Imakefile
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-cursors.c
     - copied unchanged from r327507, head/x11-wm/olvwm/files/patch-ac
  head/x11-wm/olvwm/files/patch-defaults.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-fontset.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-ad
  head/x11-wm/olvwm/files/patch-gettext.c
     - copied unchanged from r327507, head/x11-wm/olvwm/files/patch-bb
  head/x11-wm/olvwm/files/patch-gif.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-mem.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-menu.c
     - copied unchanged from r327507, head/x11-wm/olvwm/files/patch-ab
  head/x11-wm/olvwm/files/patch-ol_button.413.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-ad
  head/x11-wm/olvwm/files/patch-ol_button.svr4.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-ad
  head/x11-wm/olvwm/files/patch-olvwmrc.y
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-olwm.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-pixmap.c
     - copied unchanged from r327507, head/x11-wm/olvwm/files/patch-ba
  head/x11-wm/olvwm/files/patch-screen.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-selection.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-slots.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-st.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-virtual.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-winbutton.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-winframe.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-wingframe.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-winicon.c
     - copied, changed from r327507, head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-winipane.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-winnofoc.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-winpane.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-winpinmenu.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-winpush.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-winresize.c   (contents, props changed)
  head/x11-wm/olvwm/files/patch-winroot.c   (contents, props changed)
Deleted:
  head/x11-wm/olvwm/files/patch-aa
  head/x11-wm/olvwm/files/patch-ab
  head/x11-wm/olvwm/files/patch-ac
  head/x11-wm/olvwm/files/patch-ad
  head/x11-wm/olvwm/files/patch-ba
  head/x11-wm/olvwm/files/patch-bb

Copied and modified: head/x11-wm/olvwm/files/patch-Imakefile (from r327507, head/x11-wm/olvwm/files/patch-aa)
==============================================================================
--- head/x11-wm/olvwm/files/patch-aa	Tue Sep 17 22:48:50 2013	(r327507, copy source)
+++ head/x11-wm/olvwm/files/patch-Imakefile	Wed Sep 18 05:16:46 2013	(r327513)
@@ -85,271 +85,3 @@
 +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
- ***************************************************************************/

Copied: head/x11-wm/olvwm/files/patch-cursors.c (from r327507, head/x11-wm/olvwm/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/olvwm/files/patch-cursors.c	Wed Sep 18 05:16:46 2013	(r327513, copy of r327507, head/x11-wm/olvwm/files/patch-ac)
@@ -0,0 +1,11 @@
+--- cursors.c.orig	Tue Sep 22 22:16:04 1998
++++ cursors.c	Tue Sep 22 22:16:12 1998
+@@ -278,7 +278,7 @@
+ 	    if (our_copy[0] == 'X')
+ 		font_file = "cursor";
+ 	    else if (our_copy[0] == 'O')
+-		font_file = "-sun-open look cursor-----12-120-75-75-p-455-sunolcursor-1";
++		font_file = "-sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1";
+ 	    createCursor(dpy, cmap, pointer, cursor_id, font_file, end, ptr);
+ 	}
+ 	else {

Copied and modified: head/x11-wm/olvwm/files/patch-defaults.c (from r327507, head/x11-wm/olvwm/files/patch-aa)
==============================================================================
--- head/x11-wm/olvwm/files/patch-aa	Tue Sep 17 22:48:50 2013	(r327507, copy source)
+++ head/x11-wm/olvwm/files/patch-defaults.c	Wed Sep 18 05:16:46 2013	(r327513)
@@ -1,90 +1,3 @@
---- 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
 ***************
@@ -131,225 +44,3 @@
       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
- ***************************************************************************/

Copied and modified: head/x11-wm/olvwm/files/patch-fontset.c (from r327507, head/x11-wm/olvwm/files/patch-ad)
==============================================================================
--- head/x11-wm/olvwm/files/patch-ad	Tue Sep 17 22:48:50 2013	(r327507, copy source)
+++ head/x11-wm/olvwm/files/patch-fontset.c	Wed Sep 18 05:16:46 2013	(r327513)
@@ -17,41 +17,3 @@
   			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

Copied: head/x11-wm/olvwm/files/patch-gettext.c (from r327507, head/x11-wm/olvwm/files/patch-bb)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/olvwm/files/patch-gettext.c	Wed Sep 18 05:16:46 2013	(r327513, copy of r327507, head/x11-wm/olvwm/files/patch-bb)
@@ -0,0 +1,18 @@
+--- gettext.c.orig	Sun Sep 29 02:29:20 2002
++++ gettext.c	Sun Sep 29 02:29:47 2002
+@@ -17,12 +17,14 @@
+ #define bzero(a,b) memset(a,0,b)
+ #endif
+ 
+-char *malloc(), *strdup();
+ char * dgettext();
+ char *_gettext();
+ char *in_path();
++#ifndef __FreeBSD__
++char *malloc(), *strdup();
+ char *fgets(), *getenv();
+ caddr_t mmap(), calloc();
++#endif
+ 
+ #ifdef NOT
+ static struct domain_binding *firstbind=0, *lastbind=0;

Copied and modified: head/x11-wm/olvwm/files/patch-gif.c (from r327507, head/x11-wm/olvwm/files/patch-aa)
==============================================================================
--- head/x11-wm/olvwm/files/patch-aa	Tue Sep 17 22:48:50 2013	(r327507, copy source)
+++ head/x11-wm/olvwm/files/patch-gif.c	Wed Sep 18 05:16:46 2013	(r327513)
@@ -1,136 +1,3 @@
---- 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 @@
@@ -153,203 +20,3 @@
  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();
-+
- /***************************************************************************

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309180516.r8I5Gkx8051098>