Update to version 4.2.

PR:		7626
Submitted by:	Brian Feldman <green@unixhelp.org>

5 files changed, 38 insertions, 10 deletions

diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 9ec9bac5c106..b4ad5d10fd5f 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -3,19 +3,24 @@
 # Date created:		21 October 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.11 1998/08/07 23:01:40 asami Exp $
+# $Id: Makefile,v 1.12 1998/08/07 23:56:53 asami Exp $
 #
 
 DISTNAME=	olvwm4
-PKGNAME=	olvwm-4.1
+PKGNAME=	olvwm-4.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
-DISTFILES=	olvwm4.tar.Z
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
+		${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	window_managers
+EXTRACT_SUFX=	.tar.Z
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	olvwm4.Patch01.Z
+PATCHFILES=	olvwm4.Patch01.Z \
+		olvwm4.Patch02.Z
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	brianfeldman@hotmail.com
+
 LIB_DEPENDS=	xview\\.3\\.:${PORTSDIR}/x11-toolkits/xview-lib
 
 NO_WRKSUBDIR=	yes
diff --git a/x11-wm/olvwm/distinfo b/x11-wm/olvwm/distinfo
index cf0a971fcc2d..bf49811162d5 100644
--- a/x11-wm/olvwm/distinfo
+++ b/x11-wm/olvwm/distinfo
@@ -1,2 +1,3 @@
 MD5 (olvwm4.tar.Z) = 022f19ac377558c2f15602b15a521ec1
 MD5 (olvwm4.Patch01.Z) = e4cbc420313dd4c7b4f52ccfb0e9d889
+MD5 (olvwm4.Patch02.Z) = bd0357840ad11fb105d62dd1de2fd3ce
diff --git a/x11-wm/olvwm/files/patch-aa b/x11-wm/olvwm/files/patch-aa
index abe27df83fa2..d9759da9930f 100644
--- a/x11-wm/olvwm/files/patch-aa
+++ b/x11-wm/olvwm/files/patch-aa
@@ -336,8 +336,8 @@
   /***************************************************************************
   * private data
   ***************************************************************************/
-*** Imakefile.orig	Mon Feb 27 18:22:32 1995
---- Imakefile	Mon Feb 27 18:39:18 1995
+*** Imakefile.orig	Fri Aug 14 22:47:36 1998
+--- Imakefile	Fri Aug 14 22:54:24 1998
 ***************
 *** 48,55 ****
   /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
@@ -377,8 +377,19 @@
   /**/# No more changes needed
   
 ***************
-*** 143,148 ****
---- 143,150 ----
+*** 72,77 ****
+--- 72,78 ----
+  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 \
+***************
+*** 142,148 ****
+--- 143,151 ----
+  	@for i in $(MANPAGES) ;\
   	do \
   	echo "installing $$i"; \
 + 	$(RM) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX)* ; \
diff --git a/x11-wm/olvwm/files/patch-ab b/x11-wm/olvwm/files/patch-ab
new file mode 100644
index 000000000000..784ff039bdad
--- /dev/null
+++ b/x11-wm/olvwm/files/patch-ab
@@ -0,0 +1,12 @@
+--- menu.c.orig	Fri Aug 14 20:35:05 1998
++++ menu.c	Fri Aug 14 22:28:13 1998
+@@ -3148,7 +3148,8 @@
+ 	if (fDefault)
+ 	    state |= OLGX_DEFAULT;
+ 
+-    if (pb->label[pb->which].kind == StringLabel)
++    if (pb->label[pb->which].kind == StringLabel ||
++	    pb->label[pb->which].kind == NoType)
+ 	label = pb->label[pb->which].string;
+ #ifdef OLGX_LABEL_IS_COMB
+     else if (pb->label[pb->which].kind == ComboLabel) {
diff --git a/x11-wm/olvwm/pkg-descr b/x11-wm/olvwm/pkg-descr
index b173a7b3b095..3fccf02d6dcc 100644
--- a/x11-wm/olvwm/pkg-descr
+++ b/x11-wm/olvwm/pkg-descr
@@ -2,4 +2,3 @@ Olvwm (OPEN LOOK virtual window manager) is an ICCCM compliant window manager
 supplied for use with the XView toolkit.  It is derived from olwm, the
 OPEN LOOK window manager supplied with the XView release.  This version of
 olvwm is based on version 3 of the XView release.
-