[pkgsrc/trunk]: pkgsrc More build fixes for non-GNU cpp(1) which usually does...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ee60ed1504a
branches:  trunk
changeset: 566551:5ee60ed1504a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Oct 25 12:15:54 2009 +0000

description:
More build fixes for non-GNU cpp(1) which usually doesn't grok -undef.
>From Alexander Nasonov in PR pkg/39879.

diffstat:

 devel/imake/Makefile             |  7 ++++++-
 x11/modular-xorg-server/Makefile |  7 ++++++-
 x11/xdm/Makefile                 |  7 ++++++-
 x11/xf86-video-sis/Makefile      |  7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diffs (84 lines):

diff -r 91e7dae78e04 -r 5ee60ed1504a devel/imake/Makefile
--- a/devel/imake/Makefile      Sun Oct 25 11:44:25 2009 +0000
+++ b/devel/imake/Makefile      Sun Oct 25 12:15:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:20 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/25 12:15:54 tnn Exp $
 #
 
 DISTNAME=              imake-1.0.2
@@ -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"
diff -r 91e7dae78e04 -r 5ee60ed1504a x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile  Sun Oct 25 11:44:25 2009 +0000
+++ b/x11/modular-xorg-server/Makefile  Sun Oct 25 12:15:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2009/10/14 18:46:58 hasso Exp $
+# $NetBSD: Makefile,v 1.54 2009/10/25 12:15:55 tnn Exp $
 #
 
 DISTNAME=      xorg-server-1.6.5
@@ -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"
diff -r 91e7dae78e04 -r 5ee60ed1504a x11/xdm/Makefile
--- a/x11/xdm/Makefile  Sun Oct 25 11:44:25 2009 +0000
+++ b/x11/xdm/Makefile  Sun Oct 25 12:15:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/11/10 17:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/10/25 12:15:54 tnn Exp $
 
 DISTNAME=      xdm-1.1.6
 PKGREVISION=   2
@@ -53,6 +53,11 @@
 CONFIGURE_ARGS+=       --with-default-vt=vt05
 .endif
 
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+CONFIGURE_ENV+=                ac_cv_path_RAWCPP="cc -E -Uunix -"
+.endif
+
 .include "options.mk"
 
 .include "../../x11/libXaw/buildlink3.mk"
diff -r 91e7dae78e04 -r 5ee60ed1504a x11/xf86-video-sis/Makefile
--- a/x11/xf86-video-sis/Makefile       Sun Oct 25 11:44:25 2009 +0000
+++ b/x11/xf86-video-sis/Makefile       Sun Oct 25 12:15:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/08/09 22:56:13 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/10/25 12:15:55 tnn Exp $
 #
 
 DISTNAME=      xf86-video-sis-0.10.2
@@ -18,6 +18,11 @@
 GNU_CONFIGURE=  yes
 USE_TOOLS+=     pkg-config
 
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+CONFIGURE_ENV+=                ac_cv_path_RAWCPP="cc -E -Uunix -"
+.endif
+
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"