Tue Apr 17 17:52:01 2012 UTC ()
Use ucpp for clang.


(joerg)
diff -r1.67 -r1.68 pkgsrc/x11/modular-xorg-server/Makefile
cvs diff -r1.67 -r1.68 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2012/03/13 14:13:52 1.67
+++ pkgsrc/x11/modular-xorg-server/Makefile 2012/04/17 17:52:01 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.67 2012/03/13 14:13:52 fhajny Exp $ 1# $NetBSD: Makefile,v 1.68 2012/04/17 17:52:01 joerg Exp $
2# 2#
3 3
4DISTNAME= xorg-server-1.6.5 4DISTNAME= xorg-server-1.6.5
5PKGNAME= modular-${DISTNAME} 5PKGNAME= modular-${DISTNAME}
6PKGREVISION= 12 6PKGREVISION= 12
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://xorg.freedesktop.org/ 12HOMEPAGE= http://xorg.freedesktop.org/
13COMMENT= Modular X11 server from modular X.org 13COMMENT= Modular X11 server from modular X.org
14 14
@@ -111,27 +111,30 @@ INSTALLATION_DIRS+= lib/xorg/modules/dri @@ -111,27 +111,30 @@ INSTALLATION_DIRS+= lib/xorg/modules/dri
111BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.1.0 111BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.1.0
112BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 112BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
113BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0 113BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0
114BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9 114BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9
115BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5 115BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5
116BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 116BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
117BUILDLINK_API_DEPENDS.pixman+= pixman>=0.13.2 117BUILDLINK_API_DEPENDS.pixman+= pixman>=0.13.2
118BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1 118BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1
119BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3 119BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3
120BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 120BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
121BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4 121BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4
122 122
123.include "../../mk/compiler.mk" 123.include "../../mk/compiler.mk"
124.if empty(PKGSRC_COMPILER:Mgcc) 124.if !empty(PKGSRC_COMPILER:Mclang)
 125BUILD_DEPENDS+= ucpp-[0-9]*:../../devel/ucpp
 126CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
 127.elif empty(PKGSRC_COMPILER:Mgcc)
125CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" 128CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -"
126.endif 129.endif
127 130
128.include "options.mk" 131.include "options.mk"
129 132
130.include "../../devel/ncurses/buildlink3.mk" 133.include "../../devel/ncurses/buildlink3.mk"
131.include "../../devel/zlib/buildlink3.mk" 134.include "../../devel/zlib/buildlink3.mk"
132.include "../../fonts/libfontenc/buildlink3.mk" 135.include "../../fonts/libfontenc/buildlink3.mk"
133.include "../../graphics/MesaLib/buildlink3.mk" 136.include "../../graphics/MesaLib/buildlink3.mk"
134.include "../../security/openssl/buildlink3.mk" 137.include "../../security/openssl/buildlink3.mk"
135BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 138BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
136.include "../../sysutils/libpciaccess/buildlink3.mk" 139.include "../../sysutils/libpciaccess/buildlink3.mk"
137.include "../../x11/bigreqsproto/buildlink3.mk" 140.include "../../x11/bigreqsproto/buildlink3.mk"