[pkgsrc/trunk]: pkgsrc/x11 Some of the X.org packages assume that the C prepr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a313430ff8d8
branches:  trunk
changeset: 542426:a313430ff8d8
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri May 16 13:48:41 2008 +0000

description:
Some of the X.org packages assume that the C preprocessor will use stdin
if no filename given, but this isn't true with the native HP compiler, so
teach them to use '-' explicitly.

XXX using cpp(1) to postprocess manpages is ugly, most of the other X.org
packages seem to have been converted to use sed(1).

diffstat:

 x11/libX11/Makefile  |  7 ++++++-
 x11/libXext/Makefile |  7 ++++++-
 x11/libXt/Makefile   |  7 ++++++-
 x11/xinit/Makefile   |  7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diffs (84 lines):

diff -r 8f8a7fe5e09b -r a313430ff8d8 x11/libX11/Makefile
--- a/x11/libX11/Makefile       Fri May 16 09:06:37 2008 +0000
+++ b/x11/libX11/Makefile       Fri May 16 13:48:41 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/04/24 07:45:49 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/05/16 13:48:41 tnn Exp $
 #
 
 DISTNAME=              libX11-1.1.4
@@ -34,6 +34,11 @@
 MAKE_ENV+=     CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
 .endif
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mhp)
+CONFIGURE_ENV+=                ac_cv_path_RAWCPP="cc -E -Uunix -"
+.endif
+
 .include "../../x11/bigreqsproto/buildlink3.mk"
 .include "../../x11/inputproto/buildlink3.mk"
 .include "../../x11/kbproto/buildlink3.mk"
diff -r 8f8a7fe5e09b -r a313430ff8d8 x11/libXext/Makefile
--- a/x11/libXext/Makefile      Fri May 16 09:06:37 2008 +0000
+++ b/x11/libXext/Makefile      Fri May 16 13:48:41 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/02 14:44:47 bjs Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/16 13:48:41 tnn Exp $
 #
 
 DISTNAME=              libXext-1.0.4
@@ -25,6 +25,11 @@
 CONFIGURE_ARGS+=       --disable-malloc0returnsnull
 .endif
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mhp)
+CONFIGURE_ENV+=                ac_cv_path_RAWCPP="cc -E -Uunix -"
+.endif
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
diff -r 8f8a7fe5e09b -r a313430ff8d8 x11/libXt/Makefile
--- a/x11/libXt/Makefile        Fri May 16 09:06:37 2008 +0000
+++ b/x11/libXt/Makefile        Fri May 16 13:48:41 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/01/29 03:37:02 bjs Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/16 13:48:41 tnn Exp $
 #
 
 DISTNAME=              libXt-1.0.5
@@ -32,6 +32,11 @@
 MAKE_ENV+=     CC_FOR_BUILD=${NATIVE_CC:Q} CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
 .endif
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mhp)
+CONFIGURE_ENV+=                ac_cv_path_RAWCPP="cc -E -Uunix -"
+.endif
+
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/kbproto/buildlink3.mk"
diff -r 8f8a7fe5e09b -r a313430ff8d8 x11/xinit/Makefile
--- a/x11/xinit/Makefile        Fri May 16 09:06:37 2008 +0000
+++ b/x11/xinit/Makefile        Fri May 16 13:48:41 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/04/16 22:07:24 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/05/16 13:48:41 tnn Exp $
 #
 
 DISTNAME=              xinit-1.0.8
@@ -15,6 +15,11 @@
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            pkg-config xauth:run
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mhp)
+CONFIGURE_ENV+=                ac_cv_path_RAWCPP="cc -E -Uunix -"
+.endif
+
 .include "../../x11/libX11/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"