Thu Mar 19 18:09:17 2015 UTC ()
Add workaround for bin/47757 on NetBSD < 7. Bump revision.


(tnn)
diff -r1.25 -r1.26 pkgsrc/devel/ccache/Makefile
diff -r1.15 -r1.16 pkgsrc/devel/ccache/distinfo
diff -r0 -r1.1 pkgsrc/devel/ccache/patches/patch-util.c

cvs diff -r1.25 -r1.26 pkgsrc/devel/ccache/Makefile (expand / switch to context diff)
--- pkgsrc/devel/ccache/Makefile 2014/12/15 05:33:26 1.25
+++ pkgsrc/devel/ccache/Makefile 2015/03/19 18:09:17 1.26
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2014/12/15 05:33:26 mef Exp $
+# $NetBSD: Makefile,v 1.26 2015/03/19 18:09:17 tnn Exp $
 
 DISTNAME=	ccache-3.2.1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://samba.org/ftp/ccache/
 EXTRACT_SUFX=	.tar.xz

cvs diff -r1.15 -r1.16 pkgsrc/devel/ccache/distinfo (expand / switch to context diff)
--- pkgsrc/devel/ccache/distinfo 2014/12/15 05:33:26 1.15
+++ pkgsrc/devel/ccache/distinfo 2015/03/19 18:09:17 1.16
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.15 2014/12/15 05:33:26 mef Exp $
+$NetBSD: distinfo,v 1.16 2015/03/19 18:09:17 tnn Exp $
 
 SHA1 (ccache-3.2.1.tar.xz) = cc34aa89802461a9742c42767f14c3eace1aafe8
 RMD160 (ccache-3.2.1.tar.xz) = 48a00126bd7760505d78a35ab5d72d1a53bbe03c
 Size (ccache-3.2.1.tar.xz) = 297868 bytes
+SHA1 (patch-util.c) = b56f7c348067bba472c4a9091f8d0f6b0a579263

File Added: pkgsrc/devel/ccache/patches/Attic/patch-util.c
$NetBSD: patch-util.c,v 1.1 2015/03/19 18:09:17 tnn Exp $

Workaround for bin/47757

--- util.c.orig	2014-12-10 19:40:54.000000000 +0000
+++ util.c
@@ -1063,6 +1063,9 @@ create_tmp_fd(char **fname)
 	char *template = format("%s.%s", *fname, tmp_string());
 	int fd = mkstemp(template);
 	if (fd == -1 && errno == ENOENT) {
+#if defined(__NetBSD__) && __NetBSD_Version__ < 700000000
+		reformat(&template, "%s.%s", *fname, tmp_string());
+#endif
 		if (create_parent_dirs(template) != 0) {
 			fatal("Failed to create directory %s: %s",
 			      dirname(template), strerror(errno));
@@ -1071,6 +1074,9 @@ create_tmp_fd(char **fname)
 		fd = mkstemp(template);
 	}
 	if (fd == -1) {
+#if defined(__NetBSD__) && __NetBSD_Version__ < 700000000
+		reformat(&template, "%s.%s", *fname, tmp_string());
+#endif
 		fatal("Failed to create file %s: %s", template, strerror(errno));
 	}