Tue Sep 22 19:34:06 2009 UTC ()
Invoke the C preprocessor in a portable manner on all non-GCC compilers.
This is PR pkg/39879.


(tnn)
diff -r1.19 -r1.20 pkgsrc/x11/libX11/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/libXext/Makefile
diff -r1.11 -r1.12 pkgsrc/x11/libXt/Makefile
diff -r1.12 -r1.13 pkgsrc/x11/xinit/Makefile
cvs diff -r1.19 -r1.20 pkgsrc/x11/libX11/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libX11/Makefile 2009/07/18 10:20:51 1.19
+++ pkgsrc/x11/libX11/Makefile 2009/09/22 19:34:05 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2009/07/18 10:20:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2009/09/22 19:34:05 tnn Exp $
2# 2#
3 3
4DISTNAME= libX11-1.2.2 4DISTNAME= libX11-1.2.2
5CATEGORIES= x11 devel 5CATEGORIES= x11 devel
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 6MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Base X libraries from modular Xorg X11 11COMMENT= Base X libraries from modular Xorg X11
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -26,27 +26,27 @@ PKGCONFIG_OVERRIDE+= x11.pc.in @@ -26,27 +26,27 @@ PKGCONFIG_OVERRIDE+= x11.pc.in
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28.if ${OPSYS} == "NetBSD" 28.if ${OPSYS} == "NetBSD"
29CONFIGURE_ARGS+= --disable-malloc0returnsnull 29CONFIGURE_ARGS+= --disable-malloc0returnsnull
30.endif 30.endif
31 31
32.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 32.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
33MAKE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include 33MAKE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
34.endif 34.endif
35 35
36CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h 36CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
37 37
38.include "../../mk/compiler.mk" 38.include "../../mk/compiler.mk"
39.if !empty(PKGSRC_COMPILER:Mhp) 39.if empty(PKGSRC_COMPILER:Mgcc)
40CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" 40CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -"
41.endif 41.endif
42 42
43.include "../../x11/bigreqsproto/buildlink3.mk" 43.include "../../x11/bigreqsproto/buildlink3.mk"
44.include "../../x11/inputproto/buildlink3.mk" 44.include "../../x11/inputproto/buildlink3.mk"
45.include "../../x11/kbproto/buildlink3.mk" 45.include "../../x11/kbproto/buildlink3.mk"
46.include "../../x11/libXau/buildlink3.mk" 46.include "../../x11/libXau/buildlink3.mk"
47.include "../../x11/libXdmcp/buildlink3.mk" 47.include "../../x11/libXdmcp/buildlink3.mk"
48.include "../../x11/xcmiscproto/buildlink3.mk" 48.include "../../x11/xcmiscproto/buildlink3.mk"
49.include "../../x11/xextproto/buildlink3.mk" 49.include "../../x11/xextproto/buildlink3.mk"
50.include "../../x11/xf86bigfontproto/buildlink3.mk" 50.include "../../x11/xf86bigfontproto/buildlink3.mk"
51.include "../../x11/xproto/buildlink3.mk" 51.include "../../x11/xproto/buildlink3.mk"
52.include "../../x11/xtrans/buildlink3.mk" 52.include "../../x11/xtrans/buildlink3.mk"
cvs diff -r1.9 -r1.10 pkgsrc/x11/libXext/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXext/Makefile 2009/02/27 16:00:01 1.9
+++ pkgsrc/x11/libXext/Makefile 2009/09/22 19:34:05 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2009/02/27 16:00:01 tnn Exp $ 1# $NetBSD: Makefile,v 1.10 2009/09/22 19:34:05 tnn Exp $
2# 2#
3 3
4DISTNAME= libXext-1.0.5 4DISTNAME= libXext-1.0.5
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= x11 devel 6CATEGORIES= x11 devel
7MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 7MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12COMMENT= X Extension library 12COMMENT= X Extension library
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -17,24 +17,24 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -17,24 +17,24 @@ PKG_DESTDIR_SUPPORT= user-destdir
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
20 20
21PKGCONFIG_OVERRIDE+= xext.pc.in 21PKGCONFIG_OVERRIDE+= xext.pc.in
22 22
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24 24
25.if ${OPSYS} == "NetBSD" 25.if ${OPSYS} == "NetBSD"
26CONFIGURE_ARGS+= --disable-malloc0returnsnull 26CONFIGURE_ARGS+= --disable-malloc0returnsnull
27.endif 27.endif
28 28
29.include "../../mk/compiler.mk" 29.include "../../mk/compiler.mk"
30.if !empty(PKGSRC_COMPILER:Mhp) 30.if empty(PKGSRC_COMPILER:Mgcc)
31CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" 31CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -"
32.endif 32.endif
33 33
34BUILDLINK_API_DEPENDS.libX11+= libX11>=1.2 34BUILDLINK_API_DEPENDS.libX11+= libX11>=1.2
35.include "../../x11/libX11/buildlink3.mk" 35.include "../../x11/libX11/buildlink3.mk"
36BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.5 36BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.5
37.include "../../x11/xextproto/buildlink3.mk" 37.include "../../x11/xextproto/buildlink3.mk"
38.include "../../x11/xproto/buildlink3.mk" 38.include "../../x11/xproto/buildlink3.mk"
39 39
40.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/x11/libXt/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXt/Makefile 2009/07/18 10:28:47 1.11
+++ pkgsrc/x11/libXt/Makefile 2009/09/22 19:34:05 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2009/07/18 10:28:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2009/09/22 19:34:05 tnn Exp $
2# 2#
3 3
4DISTNAME= libXt-1.0.6 4DISTNAME= libXt-1.0.6
5CATEGORIES= x11 devel 5CATEGORIES= x11 devel
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 6MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= X Toolkit Intrinsics library 11COMMENT= X Toolkit Intrinsics library
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -24,23 +24,23 @@ PKGCONFIG_OVERRIDE+= xt.pc.in @@ -24,23 +24,23 @@ PKGCONFIG_OVERRIDE+= xt.pc.in
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26.if ${OPSYS} == "NetBSD" 26.if ${OPSYS} == "NetBSD"
27CONFIGURE_ARGS+= --disable-malloc0returnsnull 27CONFIGURE_ARGS+= --disable-malloc0returnsnull
28.endif 28.endif
29 29
30.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 30.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
31MAKE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include 31MAKE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
32.endif 32.endif
33 33
34CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h 34CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
35 35
36.include "../../mk/compiler.mk" 36.include "../../mk/compiler.mk"
37.if !empty(PKGSRC_COMPILER:Mhp) 37.if empty(PKGSRC_COMPILER:Mgcc)
38CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" 38CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -"
39.endif 39.endif
40 40
41.include "../../x11/libSM/buildlink3.mk" 41.include "../../x11/libSM/buildlink3.mk"
42.include "../../x11/libX11/buildlink3.mk" 42.include "../../x11/libX11/buildlink3.mk"
43.include "../../x11/kbproto/buildlink3.mk" 43.include "../../x11/kbproto/buildlink3.mk"
44.include "../../x11/xproto/buildlink3.mk" 44.include "../../x11/xproto/buildlink3.mk"
45 45
46.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/x11/xinit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xinit/Makefile 2009/01/07 10:57:58 1.12
+++ pkgsrc/x11/xinit/Makefile 2009/09/22 19:34:06 1.13
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.12 2009/01/07 10:57:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2009/09/22 19:34:06 tnn Exp $
2# 2#
3 3
4DISTNAME= xinit-1.1.1 4DISTNAME= xinit-1.1.1
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=app/} 6MASTER_SITES= ${MASTER_SITE_XORG:=app/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= X init program 11COMMENT= X init program
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit 16CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit
17USE_TOOLS+= pkg-config xauth:run 17USE_TOOLS+= pkg-config xauth:run
18 18
19.include "../../mk/compiler.mk" 19.include "../../mk/compiler.mk"
20.if !empty(PKGSRC_COMPILER:Mhp) 20.if empty(PKGSRC_COMPILER:Mgcc)
21CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" 21CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -"
22.endif 22.endif
23 23
24.include "../../x11/libX11/buildlink3.mk" 24.include "../../x11/libX11/buildlink3.mk"
25 25
26.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"