[pkgsrc/trunk]: pkgsrc/pkgtools/x11-links Fix checks for __STDC__ in older ve...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c18f6fccfdf8
branches:  trunk
changeset: 483379:c18f6fccfdf8
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Thu Nov 11 17:44:39 2004 +0000

description:
Fix checks for __STDC__ in older versions of OpenWindows headers so that the
SunPro compiler gets the correct syntax for macro concatenation.

Bump PKGREVISION.

diffstat:

 pkgtools/x11-links/Makefile   |   3 ++-
 pkgtools/x11-links/openwin.mk |  20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r 302d01602ce2 -r c18f6fccfdf8 pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Thu Nov 11 17:40:33 2004 +0000
+++ b/pkgtools/x11-links/Makefile       Thu Nov 11 17:44:39 2004 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.60 2004/11/11 15:51:14 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2004/11/11 17:44:39 sketch Exp $
 #
 # NOTE:        If you update this package, then you'll likely need to also update
 #      the x11-links dependency in mk/buildlink[23]/bsd.buildlink[23].mk
 #      to the correct version, usually the most recent.
 
 DISTNAME=      x11-links-0.23
+PKGREVISION=   1
 CATEGORIES=    pkgtools x11
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 302d01602ce2 -r c18f6fccfdf8 pkgtools/x11-links/openwin.mk
--- a/pkgtools/x11-links/openwin.mk     Thu Nov 11 17:40:33 2004 +0000
+++ b/pkgtools/x11-links/openwin.mk     Thu Nov 11 17:44:39 2004 +0000
@@ -1,3 +1,21 @@
-# $NetBSD: openwin.mk,v 1.1 2003/09/02 07:14:42 jlam Exp $
+# $NetBSD: openwin.mk,v 1.2 2004/11/11 17:44:39 sketch Exp $
 
 FILES_LIST=    ${FILESDIR}/openwin
+
+# Fix bugs in older versions of openwin headers
+STDC_REPLACE=  -e 's/^\#if (__STDC__/\#if (defined(__STDC__)/'
+STDC_REPLACE+= -e 's/^\#if ((__STDC__/\#if ((defined(__STDC__)/'
+
+CREATE_X11LINK=        case $$file in                                          \
+               include/X11/Xlibint.h)                                  \
+                       ${SED} ${STDC_REPLACE} < $$src > $$dest;        \
+                       ;;                                              \
+               include/X11/Xmd.h)                                      \
+                       ${SED} ${STDC_REPLACE} < $$src > $$dest;        \
+                       ;;                                              \
+               include/X11/extensions/multibufst.h)                    \
+                       ${SED} ${STDC_REPLACE} < $$src > $$dest;        \
+                       ;;                                              \
+               *)                                                      \
+                       ${LN} -s $$src $$dest;                          \
+               esac