Adapt these to work with the OpenLook Virtual Window Manager

patches provided by Witold J. Wnuk <ww181302@zodiac.mimuw.edu.pl>
in pkg/9143

11 files changed, 212 insertions, 40 deletions

diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index acf09f58a6c..515382bcb4a 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/09/28 20:40:06 soren Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/16 14:16:49 pooka Exp $
 # $FreeBSD Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp
 #
 
@@ -16,6 +16,12 @@ EXTRACT_ELEMENTS=	xview3.2p1-X11R6/clients xview3.2p1-X11R6/images
 WRKSRC=      	${WRKDIR}/xview3.2p1-X11R6/clients
 USE_IMAKE=	yes
 
+post-patch:
+	@${MV} ${WRKSRC}/olwm/openwin-menu-programs ${WRKSRC}/foo
+	@${SED} -e 's@XXX11BASEXXX@${PREFIX}@g' < ${WRKSRC}/foo > \
+		${WRKSRC}/olwm/openwin-menu-programs
+	@${RM} -f ${WRKSRC}/foo
+
 pre-install:
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 
diff --git a/x11/xview-clients/files/patch-sum b/x11/xview-clients/files/patch-sum
index 4ce6cc2f30c..eaac64dcbce 100644
--- a/x11/xview-clients/files/patch-sum
+++ b/x11/xview-clients/files/patch-sum
@@ -1,6 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:38 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/06/16 14:16:51 pooka Exp $
 
 MD5 (patch-aa) = fb07ad6f6bf34aa068aabb02165ad023
 MD5 (patch-ab) = 2a59404ad8da61ee6b77ed067eed0c0f
 MD5 (patch-ac) = 7be5a892f3ea0b0add09d0122a70af51
 MD5 (patch-ad) = 04d01607d0f78c84bb11142f1f7fffcf
+MD5 (patch-ae) = b9137d851fbe04f50e757370b4b3b99f
+MD5 (patch-af) = 9fa26e96bc1c4c75aa11dc14e0bc2737
diff --git a/x11/xview-clients/patches/patch-ae b/x11/xview-clients/patches/patch-ae
new file mode 100644
index 00000000000..f0691a543b4
--- /dev/null
+++ b/x11/xview-clients/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2000/06/16 14:16:51 pooka Exp $
+
+--- olwm/Imakefile.orig	Sat Jan  8 02:39:50 2000
++++ olwm/Imakefile	Sat Jan  8 02:39:58 2000
+@@ -39,7 +39,7 @@
+ MANPAGES = olwm.man
+ BITMAPS = iconbitmap.h
+ SCRIPTS = 
+-MISC 	= openwin-menu
++MISC 	= openwin-menu openwin-menu-programs openwin-menu-demo
+ 
+ 
+ SRCS	= atom.c client.c cmdstream.c \
diff --git a/x11/xview-clients/patches/patch-af b/x11/xview-clients/patches/patch-af
new file mode 100644
index 00000000000..e55e39050b3
--- /dev/null
+++ b/x11/xview-clients/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1 2000/06/16 14:16:52 pooka Exp $
+
+--- olwm/openwin-menu-programs.orig	Tue Jun 29 07:12:07 1993
++++ olwm/openwin-menu-programs	Fri Jun 16 15:32:37 2000
+@@ -6,5 +6,10 @@
+ 
+ "Programs" TITLE PIN
+ 
+-"Command Tool..." 		exec $OPENWINHOME/bin/cmdtool
+-"Clock..."			exec $OPENWINHOME/bin/clock
++"Command Tool..." 		exec XXX11BASEXXX/bin/cmdtool
++"Xterm..."			exec XXX11BASEXXX/bin/xterm
++
++SEPARATOR
++
++"Clock..."			exec XXX11BASEXXX/bin/clock
++
diff --git a/x11/xview-clients/pkg/PLIST b/x11/xview-clients/pkg/PLIST
index 9acd60b3910..c094ba43b4d 100644
--- a/x11/xview-clients/pkg/PLIST
+++ b/x11/xview-clients/pkg/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/04 15:07:39 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/06/16 14:16:53 pooka Exp $
 bin/clock
 bin/cmdtool
 bin/olwm
 bin/olwmslave
 bin/shelltool
 lib/openwin-menu
+lib/openwin-menu-programs
+lib/openwin-menu-demo
 lib/help/clock.info
 lib/help/olwm.info
 lib/help/workspace.info
diff --git a/x11/xview-lib/files/patch-sum b/x11/xview-lib/files/patch-sum
index 2d9e6630e0b..768a9a83bf5 100644
--- a/x11/xview-lib/files/patch-sum
+++ b/x11/xview-lib/files/patch-sum
@@ -1,16 +1,19 @@
-$NetBSD: patch-sum,v 1.3 2000/02/09 00:58:03 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/16 14:16:53 pooka Exp $
 
 MD5 (patch-aa) = ab481aa246f19a8388743244d331081c
 MD5 (patch-ab) = 0811acd752078caea8bd851c85ea08dd
 MD5 (patch-ac) = 99802bae2f42f4a6f8c8387d3de8c15c
-MD5 (patch-ad) = 7d6c678640dff4fe166c7655b220b599
+MD5 (patch-ad) = ec3a6d55142eff5964e9d3ddb9e1bcf2
 MD5 (patch-ae) = 35d6626cf44759076e808b09d22c2ddf
 MD5 (patch-af) = dff7d6b871b862778f8bde6c8dc6a4f4
 MD5 (patch-ag) = 75578ff823071d0464ab5d0e8d5acb3a
 MD5 (patch-ah) = 85f5372a0b58fa9bd808d6823bb1683f
 MD5 (patch-ai) = f16a5362859ff6f674301c61c00679cc
-MD5 (patch-aj) = 885e343ac72084b293b6b1716cc309fb
+MD5 (patch-aj) = 9859254158825d6daf4e8fe0fe57f403
 MD5 (patch-ak) = 2add6a5899eafd4b404a236968172bac
 MD5 (patch-al) = 3a269a96ab1440f70d3b9f67200003b5
 MD5 (patch-an) = 9fc09df240f727570b7005ad96b37f83
 MD5 (patch-ao) = 6474d1a6a263ec6ae6bdc21f43ab9bd0
+MD5 (patch-ap) = cb81476a736a1b807671b9622fcffc85
+MD5 (patch-aq) = c31e3d378c80c89e836d4f31d4998fcc
+MD5 (patch-ar) = f81fb163a92e9c0e28519c07cf088f81
diff --git a/x11/xview-lib/patches/patch-ad b/x11/xview-lib/patches/patch-ad
index 73d92ba95db..2141cd9ef5a 100644
--- a/x11/xview-lib/patches/patch-ad
+++ b/x11/xview-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 1999/12/15 23:51:04 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.6 2000/06/16 14:16:54 pooka Exp $
 
 diff -rc ../old/xview3.2p1-X11R6/lib/libxview/attr/attr_copy.c ./lib/libxview/attr/attr_copy.c
 *** ../old/xview3.2p1-X11R6/lib/libxview/attr/attr_copy.c	Tue Jun 29 01:14:35 1993
@@ -116,33 +116,6 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/base/xv_debug.h ./lib/libxview/bas
   #endif FILE
   #include <xview/pkg.h>		/* needed to get definition of Xv_private */
     /* 
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/base/xv_error.c ./lib/libxview/base/xv_error.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/base/xv_error.c	Tue Jun 29 01:14:42 1993
---- ./lib/libxview/base/xv_error.c	Sun Nov 20 13:39:00 1994
-***************
-*** 11,16 ****
---- 11,17 ----
-   */
-  
-  #include <stdio.h>
-+ #include <sys/param.h>
-  #include <xview/pkg_public.h>
-  #include <X11/Xlib.h>
-  #include <xview_private/i18n_impl.h>
-***************
-*** 18,24 ****
---- 19,29 ----
-  
-  /* Unix system error variables */
-  extern int      sys_nerr;
-+ #if (defined(BSD) && (BSD >= 199306))
-+ extern const char *const sys_errlist[];
-+ #else
-  extern char    *sys_errlist[];
-+ #endif
-  extern int      errno;
-  
-  Xv_private_data char *xv_app_name;
 diff -rc ../old/xview3.2p1-X11R6/lib/libxview/dnd/dnd.c ./lib/libxview/dnd/dnd.c
 *** ../old/xview3.2p1-X11R6/lib/libxview/dnd/dnd.c	Tue Jun 29 01:15:57 1993
 --- ./lib/libxview/dnd/dnd.c	Sun Nov 20 13:39:00 1994
diff --git a/x11/xview-lib/patches/patch-aj b/x11/xview-lib/patches/patch-aj
index b991e1a1214..ce683e14231 100644
--- a/x11/xview-lib/patches/patch-aj
+++ b/x11/xview-lib/patches/patch-aj
@@ -1,9 +1,22 @@
-$NetBSD: patch-aj,v 1.1 1998/12/28 18:52:05 tron Exp $
-
---- lib/libxview/textsw/txt_file.c~	Sun Dec  6 18:45:10 1998
-+++ lib/libxview/textsw/txt_file.c	Sat Dec 19 13:56:47 1998
-@@ -52,7 +52,11 @@
- #endif /* SVR4 */
+$NetBSD: patch-aj,v 1.2 2000/06/16 14:16:54 pooka Exp $
+--- lib/libxview/textsw/txt_file.c.orig	Sat Jan  8 03:32:48 2000
++++ lib/libxview/textsw/txt_file.c	Sat Jan  8 03:57:02 2000
+@@ -45,14 +45,23 @@
+ 
+ extern CHAR    *STRCAT();
+ extern CHAR    *STRNCAT();
+-#ifdef SVR4
++
++#if (defined(SVR4) || (__NetBSD_Version__ >= 103080000))
++#define GETCWD
++#endif
++
++#ifdef GETCWD
+ extern char    *getcwd();
+ #else
+ extern char    *getwd();
+-#endif /* SVR4 */
++#endif /* GETCWD */
  extern int      errno, sys_nerr;
  #if (defined(BSD) && (BSD >= 199306))
 +#if __NetBSD_Version__ > 103080000
@@ -14,3 +27,29 @@ $NetBSD: patch-aj,v 1.1 1998/12/28 18:52:05 tron Exp $
  #else
  extern char    *sys_errlist[];
  #endif
+@@ -358,21 +367,21 @@
+     }
+ 
+ #ifdef		OW_I18N
+-#ifdef SVR4
++#ifdef GETCWD
+     if (getcwd(pathname_mb, MAXPATHLEN) == 0)
+ #else
+     if (getwd(pathname_mb) == 0)
+-#endif /* SVR4 */
++#endif /* GETCWD */
+ 	return (0);
+     (void) mbstowcs(pathname, pathname_mb, MAXPATHLEN-1);
+ 
+ #else		/* OW_I18N */
+ 
+-#ifdef SVR4
++#ifdef GETCWD
+     if (getcwd(pathname, MAXPATHLEN) == 0)
+ #else
+     if (getwd(pathname) == 0)
+-#endif /* SVR4 */
++#endif /* GETCWD */
+ 	return (0);
+ #endif		/* OW_I18N */
+ 
diff --git a/x11/xview-lib/patches/patch-ap b/x11/xview-lib/patches/patch-ap
new file mode 100644
index 00000000000..fdb462d30f8
--- /dev/null
+++ b/x11/xview-lib/patches/patch-ap
@@ -0,0 +1,25 @@
+$NetBSD: patch-ap,v 1.1 2000/06/16 14:16:55 pooka Exp $
+--- lib/libxview/base/xv_error.c.orig	Tue Jun 29 07:14:42 1993
++++ lib/libxview/base/xv_error.c	Sat Jan  8 02:04:40 2000
+@@ -11,15 +11,20 @@
+  */
+ 
+ #include <stdio.h>
++#include <sys/param.h>
+ #include <xview/pkg_public.h>
+ #include <X11/Xlib.h>
+ #include <xview_private/i18n_impl.h>
+ #include <xview_private/portable.h>
+ 
+ /* Unix system error variables */
++#if (defined(BSD) && (BSD >= 199306))
++#include <errno.h>
++#else
+ extern int      sys_nerr;
+-extern char    *sys_errlist[];
+ extern int      errno;
++extern char    *sys_errlist[];
++#endif
+ 
+ Xv_private_data char *xv_app_name;
+ Xv_private int (*xv_error_proc) ();
diff --git a/x11/xview-lib/patches/patch-aq b/x11/xview-lib/patches/patch-aq
new file mode 100644
index 00000000000..ae24efa6c16
--- /dev/null
+++ b/x11/xview-lib/patches/patch-aq
@@ -0,0 +1,76 @@
+$NetBSD: patch-aq,v 1.1 2000/06/16 14:16:55 pooka Exp $
+--- lib/libxview/textsw/txt_incl.c.orig	Sat Jan  8 03:59:12 2000
++++ lib/libxview/textsw/txt_incl.c	Sat Jan  8 04:00:25 2000
+@@ -35,6 +35,12 @@
+ #include <string.h>
+ #endif /* SVR4 */
+ 
++#include <sys/param.h>
++
++#if (defined(SVR4) || (__NetBSD_Version__ >= 103080000))
++#define GETCWD
++#endif
++
+ #define		MAX_DISPLAY_LENGTH	50
+ #define   	MAX_STR_LENGTH		1024
+ 
+@@ -108,18 +114,18 @@
+ 
+     /* if "cd" is not disabled and the "cd" dir is not the current dir */
+ #ifdef OW_I18N
+-#ifdef SVR4
++#ifdef GETCWD
+     (void) getcwd(curr_dir_mb, MAX_STR_LENGTH);
+ #else
+     (void) getwd(curr_dir_mb);
+-#endif /* SVR4 */
++#endif /* GETCWD */
+     (void) mbstowcs(curr_dir, curr_dir_mb, MAX_STR_LENGTH);
+ #else /* OW_I18N */
+-#ifdef SVR4
++#ifdef GETCWD
+     (void) getcwd(curr_dir, MAX_STR_LENGTH);
+ #else
+     (void) getwd(curr_dir);
+-#endif /* SVR4 */
++#endif /* GETCWD */
+ #endif /* OW_I18N */
+ 
+     textsw_changed_directory = FALSE;
+@@ -272,11 +278,11 @@
+     include_string[0] = NULL;
+     (void) textsw_get_selection(view, &dummy, &dummy, include_string,
+ 				MAX_STR_LENGTH);
+-#ifdef SVR4
++#ifdef GETCWD
+  (void) getcwd(current_dir_include_string, MAX_STR_LENGTH);
+ #else
+   (void) getwd(current_dir_include_string);
+-#endif /* SVR4 */
++#endif /* GETCWD */
+     include_panel_items[(int) DIR_STRING_ITEM] =
+ 	panel_create_item(panel, PANEL_TEXT,
+ 			  PANEL_LABEL_X, ATTR_COL(0),
+@@ -384,18 +390,18 @@
+ 
+     /* if "cd" is not disabled and the "cd" dir is not the current dir */
+ #ifdef OW_I18N
+-#ifdef SVR4
++#ifdef GETCWD
+     (void) getcwd(curr_dir_mb, MAX_STR_LENGTH);
+ #else
+     (void) getwd(curr_dir_mb);
+-#endif /* SVR4 */
++#endif /* GETCWD */
+     (void) mbstowcs(curr_dir, curr_dir_mb, MAX_STR_LENGTH);
+ #else /* OW_I18N */
+-#ifdef SVR4
++#ifdef GETCWD
+     (void) getcwd(curr_dir, MAX_STR_LENGTH);
+ #else
+     (void) getwd(curr_dir);
+-#endif /* SVR4 */
++#endif /* GETCWD */
+ #endif /* OW_I18N */
+ 
+     textsw_changed_directory = FALSE;
diff --git a/x11/xview-lib/patches/patch-ar b/x11/xview-lib/patches/patch-ar
new file mode 100644
index 00000000000..70e8baa099f
--- /dev/null
+++ b/x11/xview-lib/patches/patch-ar
@@ -0,0 +1,16 @@
+$NetBSD: patch-ar,v 1.1 2000/06/16 14:16:55 pooka Exp $
+--- lib/libxview/ttysw/termsw.c.orig	Sat Jan  8 05:26:42 2000
++++ lib/libxview/ttysw/termsw.c	Sat Jan  8 05:29:21 2000
+@@ -252,8 +252,12 @@
+ 
+     /* Generate a new temporary file name and open the file up. */
+     (void) strcpy(tmpfile_name, "/tmp/tty.txt.XXXXXX");
++#if (defined(BSD) && (BSD >= 199103))
++    if ((fd = mkstemp(tmpfile_name)) < 0) {
++#else
+     (void) mktemp(tmpfile_name);
+     if ((fd = open(tmpfile_name, O_CREAT | O_RDWR | O_EXCL, 0600)) < 0) {
++#endif
+ 	return (XV_ERROR);
+     }
+     (void) close(fd);