Fix for -current.

x11/xview/clients/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2000/07/16 06:36:14 turan Exp $
+# $OpenBSD: Makefile,v 1.9 2000/09/08 10:21:49 espie Exp $
 
 PKGNAME=	xview-clients-${XVIEW_VERSION}
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -26,8 +26,8 @@ post-extract:
 	lndir `cd ${PORTSDIR}/x11/xview/lib && make show VARNAME=WRKDIST` ${WRKDIST}
 
 do-configure:
-	cd ${WRKDIST} && $(MAKE_ENV) make SUBDIRS=clients Makefiles
-	cd ${WRKDIST}  && make SUBDIRS=clients depend
+	cd ${WRKDIST} && $(MAKE_ENV) SUBDIRS=clients make Makefiles
+	cd ${WRKDIST} && SUBDIRS=clients make depend
 
 pre-install:
 	@mkdir -p ${PREFIX}/lib/help

x11/xview/config/patches/p-Imakefile

@@ -1,5 +1,14 @@
---- Imakefile.orig	Tue Apr  4 22:05:30 2000
-+++ Imakefile	Tue Apr  4 22:05:53 2000
+--- Imakefile.orig	Sun Jun 26 03:47:22 1994
++++ Imakefile	Fri Sep  8 10:48:05 2000
+@@ -20,7 +20,7 @@ CFLAGS = -O 
+             FONTSDIR = 
+ #endif
+           CLIENTSDIR = clients
+-             SUBDIRS = $(COREDIRS) $(FONTSDIR) 
++             SUBDIRS ?= $(COREDIRS) $(FONTSDIR) 
+ /**/# even if these subdirs are not included in the general rules, be sure to
+ /**/# do a make clean in them.
+        CLEAN_SUBDIRS = clients contrib doc fonts bitmaps images lib misc util
 @@ -43,7 +43,7 @@ install::
  		echo "deleting temporary build directory $(BUILDINCDIR) ..."; \
  		$(RM) -r $(BUILDINCDIR); \