summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2005-11-08 13:34:39 +0000
committertv <tv@pkgsrc.org>2005-11-08 13:34:39 +0000
commit4d5d6196e6a251d1437f63105c23b4c60bae5dc5 (patch)
treefc8f4ed2b838a623f298ab9feef956958c5f804f /devel
parent357f216e0c1b890c1275a7a8dc357ff7ebf9feb1 (diff)
downloadpkgsrc-4d5d6196e6a251d1437f63105c23b4c60bae5dc5.tar.gz
Add hack for Interix: It has a bogus historic #define for EX_OK in
<unistd.h>, so preload that and undef EX_OK in the Interix case. Bump version to 1.1.
Diffstat (limited to 'devel')
-rw-r--r--devel/sysexits/Makefile4
-rw-r--r--devel/sysexits/buildlink3.mk4
-rw-r--r--devel/sysexits/files/sysexits.h9
3 files changed, 13 insertions, 4 deletions
diff --git a/devel/sysexits/Makefile b/devel/sysexits/Makefile
index 697a6838ef7..abc55a1bd78 100644
--- a/devel/sysexits/Makefile
+++ b/devel/sysexits/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/10/31 17:34:20 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/11/08 13:34:39 tv Exp $
#
-DISTNAME= sysexits-1.0
+DISTNAME= sysexits-1.1
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/sysexits/buildlink3.mk b/devel/sysexits/buildlink3.mk
index 9d8c1de424b..ff4088be5e2 100644
--- a/devel/sysexits/buildlink3.mk
+++ b/devel/sysexits/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/31 15:53:19 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/11/08 13:34:39 tv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SYSEXITS_BUILDLINK3_MK:= ${SYSEXITS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsysexits}
BUILDLINK_PACKAGES+= sysexits
.if !empty(SYSEXITS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sysexits+= sysexits>=1.0
+BUILDLINK_DEPENDS.sysexits+= sysexits>=1.1
BUILDLINK_DEPMETHOD.sysexits?= build
BUILDLINK_PKGSRCDIR.sysexits?= ../../devel/sysexits
.endif # SYSEXITS_BUILDLINK3_MK
diff --git a/devel/sysexits/files/sysexits.h b/devel/sysexits/files/sysexits.h
index 380a892835d..b6c7337e55c 100644
--- a/devel/sysexits/files/sysexits.h
+++ b/devel/sysexits/files/sysexits.h
@@ -91,6 +91,15 @@
* CANTCREAT, but rather for higher level permissions.
*/
+/*
+ * Hack for Interix -- it uses a bad UnixWare value for EX_OK, so
+ * preload <unistd.h> and undefine its bad macro
+ */
+#ifdef __INTERIX
+#include <unistd.h>
+#undef EX_OK
+#endif
+
#define EX_OK 0 /* successful termination */
#define EX__BASE 64 /* base value for error messages */