Thu Mar 29 14:51:59 2012 UTC ()
Move ifdef around so it matches the code.


(wiz)
diff -r1.64 -r1.65 pkgsrc/sysutils/cdrtools/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/cdrtools/patches/patch-include_schily_sha2.h
cvs diff -r1.64 -r1.65 pkgsrc/sysutils/cdrtools/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrtools/distinfo 2012/03/29 13:22:06 1.64
+++ pkgsrc/sysutils/cdrtools/distinfo 2012/03/29 14:51:59 1.65
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.64 2012/03/29 13:22:06 wiz Exp $ 1$NetBSD: distinfo,v 1.65 2012/03/29 14:51:59 wiz Exp $
2 2
3SHA1 (cdrtools-3.01a07.tar.bz2) = ee4b540e4897ee6637837a097658305d18345999 3SHA1 (cdrtools-3.01a07.tar.bz2) = ee4b540e4897ee6637837a097658305d18345999
4RMD160 (cdrtools-3.01a07.tar.bz2) = b8331d826bf64de8bd26c041624a3e41648b6952 4RMD160 (cdrtools-3.01a07.tar.bz2) = b8331d826bf64de8bd26c041624a3e41648b6952
5Size (cdrtools-3.01a07.tar.bz2) = 2043525 bytes 5Size (cdrtools-3.01a07.tar.bz2) = 2043525 bytes
6SHA1 (patch-include_schily_sha2.h) = 0d9c063b7ebdbdf5cc15d7dda3d80ddb97348013 6SHA1 (patch-include_schily_sha2.h) = dab2dd40b20a37f1f2ff8cbd64f8361e800e1753
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/cdrtools/patches/Attic/patch-include_schily_sha2.h (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrtools/patches/Attic/patch-include_schily_sha2.h 2012/03/29 13:22:07 1.1
+++ pkgsrc/sysutils/cdrtools/patches/Attic/patch-include_schily_sha2.h 2012/03/29 14:51:59 1.2
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: patch-include_schily_sha2.h,v 1.1 2012/03/29 13:22:07 wiz Exp $ 1$NetBSD: patch-include_schily_sha2.h,v 1.2 2012/03/29 14:51:59 wiz Exp $
2 2
3Fix clang-3.1 build: 3Fix clang-3.1 build:
4sha2.c:1001:2: error: call to 'SHA384Pad' is ambiguous 4sha2.c:1001:2: error: call to 'SHA384Pad' is ambiguous
5 SHA384Pad(context); 5 SHA384Pad(context);
6 ^~~~~~~~~ 6 ^~~~~~~~~
7../include/schily/sha2.h:110:13: note: candidate function 7../include/schily/sha2.h:110:13: note: candidate function
8extern void SHA384Pad __PR((SHA2_CTX *)); 8extern void SHA384Pad __PR((SHA2_CTX *));
9 ^ 9 ^
10sha2.c:969:14: note: candidate function 10sha2.c:969:14: note: candidate function
11#pragma weak SHA384Pad = SHA512Pad 11#pragma weak SHA384Pad = SHA512Pad
12 ^ 12 ^
131 error generated. 131 error generated.
14 14
15--- include/schily/sha2.h.orig 2010-08-27 10:41:30.000000000 +0000 15--- include/schily/sha2.h.orig 2010-08-27 10:41:30.000000000 +0000
16+++ include/schily/sha2.h 16+++ include/schily/sha2.h
17@@ -106,10 +106,12 @@ extern char *SHA256Data __PR((const UIn 17@@ -104,10 +104,12 @@ extern char *SHA256Data __PR((const UIn
 18
 19 #ifdef HAVE_LONGLONG
18 extern void SHA384Init __PR((SHA2_CTX *)); 20 extern void SHA384Init __PR((SHA2_CTX *));
 21+#ifndef HAVE_PRAGMA_WEAK
19 extern void SHA384Transform __PR((UInt64_t state[8], 22 extern void SHA384Transform __PR((UInt64_t state[8],
20 const UInt8_t [SHA384_BLOCK_LENGTH])); 23 const UInt8_t [SHA384_BLOCK_LENGTH]));
21+#ifndef HAVE_PRAGMA_WEAK 
22 extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); 24 extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t));
23 extern void SHA384Pad __PR((SHA2_CTX *)); 25 extern void SHA384Pad __PR((SHA2_CTX *));
 26+#endif
24 extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], 27 extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH],
25 SHA2_CTX *)); 28 SHA2_CTX *));
26+#endif 
27 extern char *SHA384End __PR((SHA2_CTX *, char *)); 29 extern char *SHA384End __PR((SHA2_CTX *, char *));
28 extern char *SHA384File __PR((const char *, char *)); 
29 extern char *SHA384FileChunk __PR((const char *, char *, off_t, off_t));