[pkgsrc/trunk]: pkgsrc/devel/scmgit Sun C doesn't like -xc99 together with th...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9aeef5f6a115
branches:  trunk
changeset: 535897:9aeef5f6a115
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 29 22:32:39 2007 +0000

description:
Sun C doesn't like -xc99 together with the _XOPEN_SOURCE macro.

diffstat:

 devel/scmgit/distinfo         |   4 ++--
 devel/scmgit/patches/patch-ab |  15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 7ca325c02a90 -r 9aeef5f6a115 devel/scmgit/distinfo
--- a/devel/scmgit/distinfo     Thu Nov 29 22:27:13 2007 +0000
+++ b/devel/scmgit/distinfo     Thu Nov 29 22:32:39 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.17 2007/11/19 06:31:55 bjs Exp $
+$NetBSD: distinfo,v 1.18 2007/11/29 22:32:39 rillig Exp $
 
 SHA1 (git-1.5.3.6.tar.gz) = 12b4fdd37404a4462fe7849156ac075773a72b28
 RMD160 (git-1.5.3.6.tar.gz) = 1f7960ba2c2bf3c134566c03ac2c2a9259bb5cbf
 Size (git-1.5.3.6.tar.gz) = 1607263 bytes
 SHA1 (patch-aa) = dd2075bb0bd330d286e792564f28691cba3120ca
-SHA1 (patch-ab) = ac5f9e2723ec3470d47c20e98be2375a4750d45f
+SHA1 (patch-ab) = 6d9b08b20b3bbee931c8aa5842b03953e7cd2a7d
 SHA1 (patch-ae) = 44f30c796c922b028773668e80d71c0a48606f5c
 SHA1 (patch-af) = d2b6fff88913d89f37bf5453babc65027a6a5a54
 SHA1 (patch-ag) = feb17b439e0e4e89c25985f2e14e300d698c8dcf
diff -r 7ca325c02a90 -r 9aeef5f6a115 devel/scmgit/patches/patch-ab
--- a/devel/scmgit/patches/patch-ab     Thu Nov 29 22:27:13 2007 +0000
+++ b/devel/scmgit/patches/patch-ab     Thu Nov 29 22:32:39 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2007/09/11 09:23:55 bjs Exp $
+$NetBSD: patch-ab,v 1.4 2007/11/29 22:32:39 rillig Exp $
 
---- git-compat-util.h.orig     2007-09-02 01:57:44.000000000 -0400
-+++ git-compat-util.h
+--- git-compat-util.h.orig     2007-10-31 21:04:37.000000000 +0100
++++ git-compat-util.h  2007-11-29 16:24:57.810134000 +0100
 @@ -6,6 +6,8 @@
  #ifndef FLEX_ARRAY
  #if defined(__GNUC__) && (__GNUC__ < 3)
@@ -11,3 +11,12 @@
  #else
  #define FLEX_ARRAY /* empty */
  #endif
+@@ -24,7 +26,7 @@
+ /* Approximation of the length of the decimal representation of this type. */
+ #define decimal_length(x)     ((int)(sizeof(x) * 2.56 + 0.5) + 1)
+ 
+-#if !defined(__APPLE__) && !defined(__FreeBSD__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__sun)
+ #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
+ #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
+ #endif