Tue Feb 23 11:31:54 2016 UTC ()
Use the compat strndup on Darwin 10.6 and older too.


(jperkin)
diff -r1.5 -r1.6 pkgsrc/x11/xdg-user-dirs/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/xdg-user-dirs/patches/patch-xdg-user-dirs-update.c
cvs diff -r1.5 -r1.6 pkgsrc/x11/xdg-user-dirs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xdg-user-dirs/distinfo 2015/11/04 03:28:59 1.5
+++ pkgsrc/x11/xdg-user-dirs/distinfo 2016/02/23 11:31:54 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2015/11/04 03:28:59 agc Exp $ 1$NetBSD: distinfo,v 1.6 2016/02/23 11:31:54 jperkin Exp $
2 2
3SHA1 (xdg-user-dirs-0.15.tar.gz) = 4e722682adcce33b4b9130b148bfbd9d49737814 3SHA1 (xdg-user-dirs-0.15.tar.gz) = 4e722682adcce33b4b9130b148bfbd9d49737814
4RMD160 (xdg-user-dirs-0.15.tar.gz) = 16a15a2283643139891570466dd3521542cbd2da 4RMD160 (xdg-user-dirs-0.15.tar.gz) = 16a15a2283643139891570466dd3521542cbd2da
5SHA512 (xdg-user-dirs-0.15.tar.gz) = 2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9 5SHA512 (xdg-user-dirs-0.15.tar.gz) = 2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9
6Size (xdg-user-dirs-0.15.tar.gz) = 243747 bytes 6Size (xdg-user-dirs-0.15.tar.gz) = 243747 bytes
7SHA1 (patch-ab) = 2a699ce58d526684c53c0e989b95de588908e324 7SHA1 (patch-ab) = 2a699ce58d526684c53c0e989b95de588908e324
8SHA1 (patch-ac) = 9a765ae9a9ee8065bed91f47a528a592c626daf7 8SHA1 (patch-ac) = 9a765ae9a9ee8065bed91f47a528a592c626daf7
9SHA1 (patch-xdg-user-dirs-update.c) = c08fe39ab65ba7704aefc9c1530ccebf11e06ad7 9SHA1 (patch-xdg-user-dirs-update.c) = 303cd15575e34942ede3b5bc23cf76575e833ff9
cvs diff -r1.1 -r1.2 pkgsrc/x11/xdg-user-dirs/patches/patch-xdg-user-dirs-update.c (expand / switch to unified diff)

--- pkgsrc/x11/xdg-user-dirs/patches/patch-xdg-user-dirs-update.c 2015/06/17 17:31:38 1.1
+++ pkgsrc/x11/xdg-user-dirs/patches/patch-xdg-user-dirs-update.c 2016/02/23 11:31:54 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-xdg-user-dirs-update.c,v 1.1 2015/06/17 17:31:38 tron Exp $ 1$NetBSD: patch-xdg-user-dirs-update.c,v 1.2 2016/02/23 11:31:54 jperkin Exp $
2 2
3Fix build under Solaris 10. 3Fix build under Solaris 10 and Darwin 10.6.
4 4
5--- xdg-user-dirs-update.c.orig 2007-08-20 09:12:20.000000000 +0100 5--- xdg-user-dirs-update.c.orig 2013-06-26 15:38:46.000000000 +0000
6+++ xdg-user-dirs-update.c 2015-06-17 13:18:17.000000000 +0100 6+++ xdg-user-dirs-update.c
7@@ -328,6 +328,24 @@ 7@@ -328,6 +328,24 @@ freev (char **strs)
8 } 8 }
9 } 9 }
10  10
11+#ifdef __sun__ 11+#if defined(__sun__) || (defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 < 1070)
12+static char * 12+static char *
13+my_strndup(const char *s, size_t n) 13+my_strndup(const char *s, size_t n)
14+{ 14+{
15+ char *p; 15+ char *p;
16+ 16+
17+ p = malloc(n + 1); 17+ p = malloc(n + 1);
18+ if (p) 18+ if (p)
19+ { 19+ {
20+ strncpy(p, s, n); 20+ strncpy(p, s, n);
21+ p[n] = '\0'; 21+ p[n] = '\0';
22+ } 22+ }
23+ return p;  23+ return p;
24+} 24+}