patch for devel/imake

[Harti Brandt]

Hi,

I'm about to commit the patch in standards/57295 that makes make more
POSIX compliant. Unfortunately this breaks imake build. The reason is
that the imake makefile expects to be able to override the top-level's
Makefile SUBDIR variable by specifying it on make's command line. This
won't work with a POSIX make, because a POSIX make passes command line
variable assignments down to all sub-makes and they cannot be overridden
by the makefile. The simples patch for the problem is to actually patch
the top-level Imakefile to change the SUBDIR variable. Patch attached.

harti
-------------- next part --------------
diff -urN --exclude=CVS imake.orig/Makefile imake/Makefile
--- imake.orig/Makefile	Tue Mar 16 11:52:58 2004
+++ imake/Makefile	Sun Mar 21 18:16:54 2004
@@ -47,6 +47,6 @@
 	@${ECHO_CMD} > ${WRKSRC}/cf/host.def
 	@(cd ${WRKDIR}/xc; \
 	  ${MAKE} Makefile.boot ; \
-	  ${MAKE} -f xmakefile SUBDIRS="include config" VerifyOS Makefiles includes)
+	  ${MAKE} -f xmakefile VerifyOS Makefiles includes)
 
 .include <bsd.port.post.mk>
diff -urN --exclude=CVS imake.orig/files/patch-Imakefile imake/files/patch-Imakefile
--- imake.orig/files/patch-Imakefile	Thu Jan  1 01:00:00 1970
+++ imake/files/patch-Imakefile	Sun Mar 21 18:30:01 2004
@@ -0,0 +1,12 @@
+--- ../Imakefile.orig	Sun Mar 21 18:21:52 2004
++++ ../Imakefile	Sun Mar 21 18:21:59 2004
+@@ -18,8 +18,7 @@
+ #endif
+ #endif
+ 
+-        SUBDIRS = include config lib $(NLSSUBDIR) \
+-                  programs $(FONTSDIR) $(DOCSDIR)
++        SUBDIRS = include config
+   LNINSTALLDIRS = lib
+ 
+ #if HasParallelMake