summaryrefslogtreecommitdiff
path: root/pkgtools/x11-links
diff options
context:
space:
mode:
authorsketch <sketch>2004-11-11 17:44:39 +0000
committersketch <sketch>2004-11-11 17:44:39 +0000
commit022a5b86cc759df803209b0c126f37c62ef76448 (patch)
treedabc0fd01e70708bf73c3d8144b41f8e09063dc8 /pkgtools/x11-links
parente4c16984d46a1746faf57409feead46c619591df (diff)
downloadpkgsrc-022a5b86cc759df803209b0c126f37c62ef76448.tar.gz
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 (limited to 'pkgtools/x11-links')
-rw-r--r--pkgtools/x11-links/Makefile3
-rw-r--r--pkgtools/x11-links/openwin.mk20
2 files changed, 21 insertions, 2 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index ef778895f39..9c20010a87d 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -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 --git a/pkgtools/x11-links/openwin.mk b/pkgtools/x11-links/openwin.mk
index e5830b240a2..d34c8e87046 100644
--- a/pkgtools/x11-links/openwin.mk
+++ b/pkgtools/x11-links/openwin.mk
@@ -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