Tue Feb 21 02:32:00 2017 UTC ()
Fix error in patch in previous


(gdt)
diff -r1.9 -r1.10 pkgsrc/lang/guile20/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/guile20/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/guile20/patches/patch-libguile_filesys.c
cvs diff -r1.9 -r1.10 pkgsrc/lang/guile20/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/guile20/Makefile 2017/02/20 20:01:45 1.9
+++ pkgsrc/lang/guile20/Makefile 2017/02/21 02:32:00 1.10
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2017/02/20 20:01:45 gdt Exp $ 1# $NetBSD: Makefile,v 1.10 2017/02/21 02:32:00 gdt Exp $
2 2
3DISTNAME= guile-2.0.14 3DISTNAME= guile-2.0.14
4PKGNAME= ${DISTNAME:S/guile/guile20/} 4PKGNAME= ${DISTNAME:S/guile/guile20/}
 5PKGREVISION= 1
5CATEGORIES= lang 6CATEGORIES= lang
6MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/ 7MASTER_SITES= ftp://ftp.gnu.org/gnu/guile/
7 8
8MAINTAINER= root@zta.lk 9MAINTAINER= root@zta.lk
9HOMEPAGE= https://www.gnu.org/software/guile/ 10HOMEPAGE= https://www.gnu.org/software/guile/
10COMMENT= Official extension language for the GNU operating system 11COMMENT= Official extension language for the GNU operating system
11LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
12 13
13# Currently, 2.0 is primary. 14# Currently, 2.0 is primary.
14#GUILE_PREFIX= ${PREFIX}/guile/2.0 15#GUILE_PREFIX= ${PREFIX}/guile/2.0
15GUILE_PREFIX= ${PREFIX} 16GUILE_PREFIX= ${PREFIX}
16 17
17# guile does not like the --build and --host triplets on NetBSD 18# guile does not like the --build and --host triplets on NetBSD
cvs diff -r1.6 -r1.7 pkgsrc/lang/guile20/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/guile20/distinfo 2017/02/20 20:01:45 1.6
+++ pkgsrc/lang/guile20/distinfo 2017/02/21 02:32:00 1.7
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.6 2017/02/20 20:01:45 gdt Exp $ 1$NetBSD: distinfo,v 1.7 2017/02/21 02:32:00 gdt Exp $
2 2
3SHA1 (guile-2.0.14.tar.gz) = fd04a4973715b8c4cd6c03a97e08d7f2c3c2bd68 3SHA1 (guile-2.0.14.tar.gz) = fd04a4973715b8c4cd6c03a97e08d7f2c3c2bd68
4RMD160 (guile-2.0.14.tar.gz) = 754aaf1bf3c6bed9afdde49c5154b87047408a1e 4RMD160 (guile-2.0.14.tar.gz) = 754aaf1bf3c6bed9afdde49c5154b87047408a1e
5SHA512 (guile-2.0.14.tar.gz) = d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633 5SHA512 (guile-2.0.14.tar.gz) = d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
6Size (guile-2.0.14.tar.gz) = 7823099 bytes 6Size (guile-2.0.14.tar.gz) = 7823099 bytes
7SHA1 (patch-lib_signal.in.h) = a5ddf019ed1e33b9f5b9994d1368be88660684a5 7SHA1 (patch-lib_signal.in.h) = a5ddf019ed1e33b9f5b9994d1368be88660684a5
8SHA1 (patch-libguile_filesys.c) = 7f79ab55cd9d3655b8f3352171c89289d685be85 8SHA1 (patch-libguile_filesys.c) = efd2730a2adf1927620b0a7efcf4c5805dfd6147
9SHA1 (patch-libguile_stime.c) = a817e58e4ec05ad040a11ccdaacca53511ad0ad8 9SHA1 (patch-libguile_stime.c) = a817e58e4ec05ad040a11ccdaacca53511ad0ad8
10SHA1 (patch-libguile_threads.c) = 6250af1130fb8a6f22db4ba04c9f70bc6c9f0ade 10SHA1 (patch-libguile_threads.c) = 6250af1130fb8a6f22db4ba04c9f70bc6c9f0ade
cvs diff -r1.1 -r1.2 pkgsrc/lang/guile20/patches/patch-libguile_filesys.c (expand / switch to unified diff)

--- pkgsrc/lang/guile20/patches/patch-libguile_filesys.c 2017/02/20 20:01:45 1.1
+++ pkgsrc/lang/guile20/patches/patch-libguile_filesys.c 2017/02/21 02:32:00 1.2
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-libguile_filesys.c,v 1.1 2017/02/20 20:01:45 gdt Exp $ 1$NetBSD: patch-libguile_filesys.c,v 1.2 2017/02/21 02:32:00 gdt Exp $
2 2
3When using mkostemp (an interface not defined by POSIX), restrict 3When using mkostemp (an interface not defined by POSIX), restrict
4flags to the set defined by the documentation of particular operating 4flags to the set defined by the documentation of particular operating
5systems. 5systems.
6 6
7See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23 for discussion. 7See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23 for discussion.
8 8
9This patch has not yet been sent upstream. 9This patch has not yet been sent upstream.
10 10
11--- libguile/filesys.c.orig 2016-12-15 00:03:33.000000000 +0000 11--- libguile/filesys.c.orig 2016-12-15 00:03:33.000000000 +0000
12+++ libguile/filesys.c 12+++ libguile/filesys.c
13@@ -1486,6 +1486,15 @@ SCM_DEFINE (scm_i_mkstemp, "mkstemp!", 1 13@@ -1486,6 +1486,15 @@ SCM_DEFINE (scm_i_mkstemp, "mkstemp!", 1
14 mode_bits = scm_i_mode_bits (mode); 14 mode_bits = scm_i_mode_bits (mode);
15 } 15 }
16  16
17+#ifdef APPLE 17+#ifdef __APPLE__
18+ /* https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23 */ 18+ /* https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23 */
19+ open_flags &= O_APPEND|O_SHLOCK|O_EXLOCK|O_CLOEXEC; 19+ open_flags &= O_APPEND|O_SHLOCK|O_EXLOCK|O_CLOEXEC;
20+#endif 20+#endif
21+#ifdef __NetBSD__ 21+#ifdef __NetBSD__
22+ /* Restrict to list of flags documented in man page. */ 22+ /* Restrict to list of flags documented in man page. */
23+ open_flags = O_APPEND|O_DIRECT|O_SHLOCK|O_EXLOCK|O_SYNC|O_CLOEXEC; 23+ open_flags = O_APPEND|O_DIRECT|O_SHLOCK|O_EXLOCK|O_SYNC|O_CLOEXEC;
24+#endif 24+#endif
25+ 25+
26 SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags)); 26 SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
27 if (rv == -1) 27 if (rv == -1)
28 SCM_SYSERROR; 28 SCM_SYSERROR;