diff options
| author | grant <grant> | 2003-02-28 23:44:37 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-02-28 23:44:37 +0000 |
| commit | cecac5667ef4ea19ad54b1f29bd4d1c4e1bbf74c (patch) | |
| tree | 929d999878636c41c3cf516f42d224abbd7e8623 /graphics | |
| parent | b5b3bd8693d4479d2acf1d019919386e6b3baa3c (diff) | |
| download | pkgsrc-cecac5667ef4ea19ad54b1f29bd4d1c4e1bbf74c.tar.gz | |
fix a broken #ifdef, noted on Linux.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/xv/distinfo | 4 | ||||
| -rw-r--r-- | graphics/xv/patches/patch-ab | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo index 006e744932a..8cc063f8f69 100644 --- a/graphics/xv/distinfo +++ b/graphics/xv/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2003/01/13 10:54:08 grant Exp $ +$NetBSD: distinfo,v 1.7 2003/02/28 23:44:37 grant Exp $ SHA1 (xv-3.10a.tar.gz) = 9e6372f154be9e9e355972cbeb91d98d9c342474 Size (xv-3.10a.tar.gz) = 2259124 bytes @@ -9,7 +9,7 @@ Size (xv-3.10a.JPEG-patch) = 3297 bytes SHA1 (xv-3.10a.TIFF-patch) = 5e1ce5610a83a88d5878eefe175352a4cc2aa21c Size (xv-3.10a.TIFF-patch) = 3241 bytes SHA1 (patch-aa) = 2c3b3819b77df503d6d86725cbc2fce2d101a1b0 -SHA1 (patch-ab) = e5d8b51f4828ec806e2b284e734fdb917851ce1b +SHA1 (patch-ab) = dee0a3fc05e01f8b15c636ec4dcf745533eca345 SHA1 (patch-ac) = 79793d6feb5d15e8e91f3e0747b7b14b00b21254 SHA1 (patch-ad) = 699c3b8e636b369ec2f0de995df0c028f6b1e91a SHA1 (patch-ae) = a2adc219090e3214ff6c891cd76d3285ee0596b0 diff --git a/graphics/xv/patches/patch-ab b/graphics/xv/patches/patch-ab index 7854f7fe85b..8fd60ea28e5 100644 --- a/graphics/xv/patches/patch-ab +++ b/graphics/xv/patches/patch-ab @@ -1,5 +1,7 @@ ---- vdcomp.c.orig Mon Jan 13 21:38:49 2003 -+++ vdcomp.c Mon Jan 13 21:47:04 2003 +$NetBSD: patch-ab,v 1.6 2003/02/28 23:44:38 grant Exp $ + +--- vdcomp.c.orig Sat Mar 1 10:42:12 2003 ++++ vdcomp.c @@ -109,12 +109,16 @@ !defined(__bsd43) && \ !defined(aux) && \ @@ -13,12 +15,13 @@ # 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__) ++# 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 -@@ -437,10 +441,13 @@ +@@ -437,10 +441,13 @@ int host; { short shortint; typedef long off_t; @@ -33,7 +36,7 @@ } if (host == 1 | host == 2) { -@@ -482,13 +489,17 @@ +@@ -482,13 +489,17 @@ int host; printf("\n 3. VICAR format."); printf("\n 4. Unlabelled binary array.\n"); printf("\n Enter format number:"); |