Mon Feb 14 20:37:40 2011 UTC ()
Fix linking on Solaris 9, per Stefan in PR 44572.
Let's see if I got him right.


(wiz)
diff -r1.17 -r1.18 pkgsrc/graphics/xv/distinfo
diff -r1.8 -r1.9 pkgsrc/graphics/xv/patches/patch-af
cvs diff -r1.17 -r1.18 pkgsrc/graphics/xv/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/xv/distinfo 2011/01/23 23:58:01 1.17
+++ pkgsrc/graphics/xv/distinfo 2011/02/14 20:37:40 1.18
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.17 2011/01/23 23:58:01 dholland Exp $ 1$NetBSD: distinfo,v 1.18 2011/02/14 20:37:40 wiz Exp $
2 2
3SHA1 (xv-3.10a-jumbo-patches-20070520.tar.gz) = d00308c1687d9d803d26ef40c73d19a0f593c626 3SHA1 (xv-3.10a-jumbo-patches-20070520.tar.gz) = d00308c1687d9d803d26ef40c73d19a0f593c626
4RMD160 (xv-3.10a-jumbo-patches-20070520.tar.gz) = 23bc07030416ebaca5ce4d223921e33094c37b93 4RMD160 (xv-3.10a-jumbo-patches-20070520.tar.gz) = 23bc07030416ebaca5ce4d223921e33094c37b93
5Size (xv-3.10a-jumbo-patches-20070520.tar.gz) = 1363802 bytes 5Size (xv-3.10a-jumbo-patches-20070520.tar.gz) = 1363802 bytes
6SHA1 (xv-3.10a.tar.gz) = 9e6372f154be9e9e355972cbeb91d98d9c342474 6SHA1 (xv-3.10a.tar.gz) = 9e6372f154be9e9e355972cbeb91d98d9c342474
7RMD160 (xv-3.10a.tar.gz) = 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d 7RMD160 (xv-3.10a.tar.gz) = 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d
8Size (xv-3.10a.tar.gz) = 2259124 bytes 8Size (xv-3.10a.tar.gz) = 2259124 bytes
9SHA1 (patch-aa) = bd6ef51bf962e1994e2e47ba5197c9729ec5221a 9SHA1 (patch-aa) = bd6ef51bf962e1994e2e47ba5197c9729ec5221a
10SHA1 (patch-ab) = 5bfc8ae09b029e4661b27d94bba46540c7f320fb 10SHA1 (patch-ab) = 5bfc8ae09b029e4661b27d94bba46540c7f320fb
11SHA1 (patch-ac) = a17b0095e6586b595190a07126ac58752d8a2562 11SHA1 (patch-ac) = a17b0095e6586b595190a07126ac58752d8a2562
12SHA1 (patch-ad) = d1fa6ae4c432528148ebe37b7a8bef8bd2059997 12SHA1 (patch-ad) = d1fa6ae4c432528148ebe37b7a8bef8bd2059997
13SHA1 (patch-ae) = f17f17ac49dafb233cc9f0629f2425120a6b5495 13SHA1 (patch-ae) = f17f17ac49dafb233cc9f0629f2425120a6b5495
14SHA1 (patch-af) = b7c97fc2018083409b49f9607fc00160b07962dd 14SHA1 (patch-af) = 7f6e771788e04577d8db17bfe8fbcce8dca4a600
15SHA1 (patch-ag) = 120d589f728fd32ea267fd46bcc16f27d9f08116 15SHA1 (patch-ag) = 120d589f728fd32ea267fd46bcc16f27d9f08116
cvs diff -r1.8 -r1.9 pkgsrc/graphics/xv/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/graphics/xv/patches/Attic/patch-af 2011/01/23 23:58:01 1.8
+++ pkgsrc/graphics/xv/patches/Attic/patch-af 2011/02/14 20:37:40 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-af,v 1.8 2011/01/23 23:58:01 dholland Exp $ 1$NetBSD: patch-af,v 1.9 2011/02/14 20:37:40 wiz Exp $
2 2
3Config fixups. 3Config fixups.
4 - don't declare errno and sys_errlist 4 - don't declare errno and sys_errlist
5 - use strerror 5 - use strerror
6 - use getcwd, not getwd 6 - use getcwd, not getwd
7 7
8--- xv.h.orig 2011-01-23 23:25:49.000000000 +0000 8--- xv.h.orig 2011-01-23 23:25:49.000000000 +0000
9+++ xv.h 9+++ xv.h
10@@ -138,9 +138,7 @@ 10@@ -138,9 +138,7 @@
11 #endif 11 #endif
12  12
13  13
14-#if defined(__FreeBSD__) 14-#if defined(__FreeBSD__)
@@ -22,27 +22,27 @@ Config fixups. @@ -22,27 +22,27 @@ Config fixups.
22 #ifndef VMS 22 #ifndef VMS
23 # include <errno.h> 23 # include <errno.h>
24 # ifndef __NetBSD__ 24 # ifndef __NetBSD__
25-# if !(defined __GLIBC__ && __GLIBC__ >= 2) 25-# if !(defined __GLIBC__ && __GLIBC__ >= 2)
26+# if !(defined(BSD) && (BSD >= 199103)) && !(defined __GLIBC__ && __GLIBC__ >= 2) 26+# if !(defined(BSD) && (BSD >= 199103)) && !(defined __GLIBC__ && __GLIBC__ >= 2)
27 extern int errno; /* SHOULD be in errno.h, but often isn't */ 27 extern int errno; /* SHOULD be in errno.h, but often isn't */
28 extern char *sys_errlist[]; /* this too... */ 28 extern char *sys_errlist[]; /* this too... */
29 # endif 29 # endif
30@@ -171,7 +169,7 @@ 30@@ -171,7 +169,7 @@
31 #ifdef VMS 31 #ifdef VMS
32 # define ERRSTR(x) strerror(x, vaxc$errno) 32 # define ERRSTR(x) strerror(x, vaxc$errno)
33 #else 33 #else
34-# if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */ 34-# if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */
35+# if defined(__BEOS__) || defined(__linux__) || defined(__INTERIX) /* or all modern/glibc systems? */ 35+# if defined(__BEOS__) || defined(__linux__) || defined(__INTERIX) || defined(__sun) /* or all modern/glibc systems? */
36 # define ERRSTR(x) strerror(x) 36 # define ERRSTR(x) strerror(x)
37 # else 37 # else
38 # define ERRSTR(x) sys_errlist[x] 38 # define ERRSTR(x) sys_errlist[x]
39@@ -207,7 +205,9 @@ 39@@ -207,7 +205,9 @@
40 # if defined(hp300) || defined(hp800) || defined(NeXT) 40 # if defined(hp300) || defined(hp800) || defined(NeXT)
41 # include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */ 41 # include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */
42 # else 42 # else
43-# include <malloc.h> 43-# include <malloc.h>
44+# ifndef __DARWIN__ 44+# ifndef __DARWIN__
45+# include <malloc.h> 45+# include <malloc.h>
46+# endif 46+# endif
47 # endif 47 # endif
48 #endif 48 #endif