From b3886cc877707c935143577706e9335e7d25b951 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 19 Jul 2011 13:59:45 +0000
Subject: When building with clang, pull in devel/ucpp for the man page
 processing. XXX should be fixed upstream to use sed

---
 x11/libX11/Makefile  | 8 ++++++--
 x11/libXext/Makefile | 8 ++++++--
 x11/libXt/Makefile   | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'x11')

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index e3c6e7dad9c..ee563618c49 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2010/09/10 20:28:03 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2011/07/19 13:59:45 joerg Exp $
 #
 
 DISTNAME=		libX11-1.3.5
@@ -38,7 +38,11 @@ MAKE_ENV+=	CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
 CPPFLAGS.OSF1+=		-pthread # Required by compiler if including pthread.h
 
 .include "../../mk/compiler.mk"
-.if empty(PKGSRC_COMPILER:Mgcc)
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
+.elif empty(PKGSRC_COMPILER:Mgcc)
 CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
 .endif
 
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 056375a1de5..106909954e2 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/04/09 08:50:17 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2011/07/19 14:00:04 joerg Exp $
 #
 
 DISTNAME=		libXext-1.1.1
@@ -26,7 +26,11 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 .endif
 
 .include "../../mk/compiler.mk"
-.if empty(PKGSRC_COMPILER:Mgcc)
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
+.elif empty(PKGSRC_COMPILER:Mgcc)
 CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
 .endif
 
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index 65d14acc791..3a63e07e3c4 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/09/10 19:01:46 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2011/07/19 14:00:24 joerg Exp $
 #
 
 DISTNAME=		libXt-1.0.8
@@ -35,7 +35,11 @@ MAKE_ENV+=	CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
 CPPFLAGS.OSF1+=		-pthread # Required by compiler if including pthread.h
 
 .include "../../mk/compiler.mk"
-.if empty(PKGSRC_COMPILER:Mgcc)
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
+.elif empty(PKGSRC_COMPILER:Mgcc)
 CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
 .endif
 
-- 
cgit v1.2.3