[pkgsrc/trunk]: pkgsrc/devel/sysexits Add hack for Interix: It has a bogus h...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae114f8a7d08
branches:  trunk
changeset: 502689:ae114f8a7d08
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Nov 08 13:34:39 2005 +0000

description:
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:

 devel/sysexits/Makefile         |  4 ++--
 devel/sysexits/buildlink3.mk    |  4 ++--
 devel/sysexits/files/sysexits.h |  9 +++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r 1f7cc325a70e -r ae114f8a7d08 devel/sysexits/Makefile
--- a/devel/sysexits/Makefile   Tue Nov 08 13:26:40 2005 +0000
+++ b/devel/sysexits/Makefile   Tue Nov 08 13:34:39 2005 +0000
@@ -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 -r 1f7cc325a70e -r ae114f8a7d08 devel/sysexits/buildlink3.mk
--- a/devel/sysexits/buildlink3.mk      Tue Nov 08 13:26:40 2005 +0000
+++ b/devel/sysexits/buildlink3.mk      Tue Nov 08 13:34:39 2005 +0000
@@ -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+=   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 -r 1f7cc325a70e -r ae114f8a7d08 devel/sysexits/files/sysexits.h
--- a/devel/sysexits/files/sysexits.h   Tue Nov 08 13:26:40 2005 +0000
+++ b/devel/sysexits/files/sysexits.h   Tue Nov 08 13:34:39 2005 +0000
@@ -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 */