Adapt these to work with the OpenLook Virtual Window Manager

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

5 files changed, 43 insertions, 3 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