summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2014-10-23 12:24:41 +0000
committeradam <adam@pkgsrc.org>2014-10-23 12:24:41 +0000
commit938610b1559f6ed03a1af1d394761efcfd669b80 (patch)
treeac622d4d315c35b2a9ebf73f9c928c993fcd681d
parent19c346d7015f0e4dea62b680d3f2ea35685e6d8e (diff)
downloadpkgsrc-938610b1559f6ed03a1af1d394761efcfd669b80.tar.gz
Fix building on OS X 10.10
-rw-r--r--graphics/optipng/distinfo4
-rw-r--r--graphics/optipng/patches/patch-src_optipng_osys.c13
2 files changed, 12 insertions, 5 deletions
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index e4c0bc733fe..74ba4ed4154 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.26 2014/03/31 07:15:19 adam Exp $
+$NetBSD: distinfo,v 1.27 2014/10/23 12:24:41 adam Exp $
SHA1 (optipng-0.7.5.tar.gz) = 30b6c333d74fc0f5dc83004aace252fa3321368b
RMD160 (optipng-0.7.5.tar.gz) = 96ffdd9628d03939bb52c98d63c6d1b2cac42313
Size (optipng-0.7.5.tar.gz) = 2141943 bytes
-SHA1 (patch-src_optipng_osys.c) = dafd2559786b4d14a408ed46a35b43b3c730dd52
+SHA1 (patch-src_optipng_osys.c) = 195d254b20f8657668d49ef8b1f230d7a8fbcd4a
diff --git a/graphics/optipng/patches/patch-src_optipng_osys.c b/graphics/optipng/patches/patch-src_optipng_osys.c
index d69d8c3b4cb..19095c0a2d2 100644
--- a/graphics/optipng/patches/patch-src_optipng_osys.c
+++ b/graphics/optipng/patches/patch-src_optipng_osys.c
@@ -1,12 +1,19 @@
-$NetBSD: patch-src_optipng_osys.c,v 1.2 2014/03/31 07:15:19 adam Exp $
+$NetBSD: patch-src_optipng_osys.c,v 1.3 2014/10/23 12:24:41 adam Exp $
+
+Compatibility fix.
--- src/optipng/osys.c.orig 2014-02-23 16:37:00.000000000 +0000
+++ src/optipng/osys.c
-@@ -522,8 +522,13 @@ osys_copy_attr(const char *src_path, con
+@@ -518,12 +518,17 @@ osys_copy_attr(const char *src_path, con
+ if (chmod(dest_path, sbuf.st_mode) != 0)
+ result = -1;
+
+-#ifdef AT_FDCWD
++#if defined(AT_FDCWD) && !defined(__APPLE__)
{
struct timespec times[2];
-+#ifdef __NetBSD__
++#if defined(__NetBSD__)
+ times[0] = sbuf.st_atimespec;
+ times[1] = sbuf.st_mtimespec;
+#else