diff options
| author | minskim <minskim@pkgsrc.org> | 2006-03-15 19:27:31 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2006-03-15 19:27:31 +0000 |
| commit | 57f462af98ee68e82a1e465ebedae86f692d0fa5 (patch) | |
| tree | f15c380b6f6244924a961091930569a399349ab8 /graphics | |
| parent | 459c80265f2e0c4a54f8fc3b94fe8c206d3a56ac (diff) | |
| download | pkgsrc-57f462af98ee68e82a1e465ebedae86f692d0fa5.tar.gz | |
Do not include malloc.h on Darwin, since it is not available. Patches
provided by John D. Baker in PR pkg/31871.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/xv/distinfo | 5 | ||||
| -rw-r--r-- | graphics/xv/patches/patch-aa | 14 | ||||
| -rw-r--r-- | graphics/xv/patches/patch-af | 17 |
3 files changed, 31 insertions, 5 deletions
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo index ffe2928eee7..206d07505fd 100644 --- a/graphics/xv/distinfo +++ b/graphics/xv/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2005/08/10 16:50:18 he Exp $ +$NetBSD: distinfo,v 1.12 2006/03/15 19:27:31 minskim Exp $ SHA1 (xv-3.10a.tar.gz) = 9e6372f154be9e9e355972cbeb91d98d9c342474 RMD160 (xv-3.10a.tar.gz) = 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d @@ -6,9 +6,10 @@ Size (xv-3.10a.tar.gz) = 2259124 bytes SHA1 (xv-3.10a-jumbo-patches-20050501.tar.bz2) = deb42fc30697312f13fcedb88f10cc3ed0ced8ac RMD160 (xv-3.10a-jumbo-patches-20050501.tar.bz2) = d199e7d1b6c5162e0cad09d4118b3735f1d156ef Size (xv-3.10a-jumbo-patches-20050501.tar.bz2) = 369886 bytes +SHA1 (patch-aa) = 9bfd1e6a55766e4c6f60907a5f58a882657dca9b SHA1 (patch-ac) = cc0da5cefbb4a13b86daaca482c52ece4bc3294c SHA1 (patch-ad) = 3a49ca0152f6a7d6cf79348e3b5308da509b63ea -SHA1 (patch-af) = bff31d4bc15986e293cf4796dcd3df808057f6db +SHA1 (patch-af) = 1beddc2abe530871fcdbb2cea5682225c194bd4d SHA1 (patch-ah) = 830139139ddf49a505786cde8930ba1e9ae006f4 SHA1 (patch-ai) = 10febc95047fc25a3b93c157eb39ed1ed7a30bc6 SHA1 (patch-aj) = 7f40c002d8a16b1507c6171db543285447e3cf81 diff --git a/graphics/xv/patches/patch-aa b/graphics/xv/patches/patch-aa new file mode 100644 index 00000000000..6f19d7262f6 --- /dev/null +++ b/graphics/xv/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.4 2006/03/15 19:27:31 minskim Exp $ + +--- vdcomp.c.orig 2006-03-15 11:00:24.000000000 -0800 ++++ vdcomp.c +@@ -116,7 +116,8 @@ + # if defined(hp300) || defined(hp800) || defined(NeXT) + # include <sys/malloc.h> /* it's in 'sys' on HPs and NeXT */ + # else +-# if !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) ++# if !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) \ ++ && !defined(__DARWIN__) + /* + I want to use BSD macro for checking if this OS is *BSD or not, + but the macro is defined in <sys/parm.h>, which I don't know all diff --git a/graphics/xv/patches/patch-af b/graphics/xv/patches/patch-af index b78207a9b28..f28b366a548 100644 --- a/graphics/xv/patches/patch-af +++ b/graphics/xv/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.5 2005/08/10 16:50:18 he Exp $ +$NetBSD: patch-af,v 1.6 2006/03/15 19:27:31 minskim Exp $ ---- xv.h.orig 2005-07-29 15:52:23.000000000 +0200 +--- xv.h.orig 2006-03-15 11:00:24.000000000 -0800 +++ xv.h @@ -137,9 +137,7 @@ #endif @@ -31,7 +31,18 @@ $NetBSD: patch-af,v 1.5 2005/08/10 16:50:18 he Exp $ # define ERRSTR(x) strerror(x) # else # define ERRSTR(x) sys_errlist[x] -@@ -345,7 +343,11 @@ +@@ -215,7 +213,9 @@ + # if defined(hp300) || defined(hp800) || defined(NeXT) + # include <sys/malloc.h> /* it's in 'sys' on HPs and NeXT */ + # else +-# include <malloc.h> ++# ifndef __DARWIN__ ++# include <malloc.h> ++# endif + # endif + # endif + #endif /* !VMS */ +@@ -345,7 +345,11 @@ #endif #ifndef S_IRWUSR |