Re: pkg/39879: libX11 canoot build on systems with non-GNU 'cpp' (in this case, IRIX)

[Alexander Nasonov <alnsn%yandex.ru@localhost>]

Tobias Nygren wrote:
>  I don't think it's worth infrastructure changes for just a handful of
>  packages that are misbehaving badly by abusing the preprocessor to
>  generate manpages. We could however invert the above compiler check to
>  match everything that is "not GCC".

Since this bug is still open, I'm attaching a patch to fix three other
packages: imake, xdm and modular-xorg-server.
They break with the Intel compiler on NetBSD/i386.

Index: ./devel/imake/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/imake/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./devel/imake/Makefile      24 May 2008 21:45:20 -0000      1.6
+++ ./devel/imake/Makefile      25 Oct 2009 07:59:29 -0000
@@ -22,6 +22,11 @@
 
 REPLACE_PERL+=         mkhtmlindex.pl
 
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+CONFIGURE_ENV+=                ac_cv_path_RAWCPP="cc -E -Uunix -"
+.endif
+
 .include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
Index: ./x11/modular-xorg-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/modular-xorg-server/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- ./x11/modular-xorg-server/Makefile  14 Oct 2009 18:46:58 -0000      1.53
+++ ./x11/modular-xorg-server/Makefile  25 Oct 2009 07:59:29 -0000
@@ -91,6 +91,11 @@
 BUILDLINK_API_DEPENDS.xf86dgaproto+=   xf86dgaproto>=2.0.3
 BUILDLINK_API_DEPENDS.xf86driproto+=   xf86driproto>=2.0.4
 
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+CONFIGURE_ENV+=                ac_cv_path_RAWCPP="cc -E -Uunix -"
+.endif
+
 .include "options.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
Index: ./x11/xdm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xdm/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ./x11/xdm/Makefile  10 Nov 2008 17:21:39 -0000      1.9
+++ ./x11/xdm/Makefile  25 Oct 2009 07:59:29 -0000
@@ -55,6 +55,11 @@
 
 .include "options.mk"
 
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+CONFIGURE_ENV+=                ac_cv_path_RAWCPP="cc -E -Uunix -"
+.endif
+
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .