diff options
Diffstat (limited to 'graphics/xv')
| -rw-r--r-- | graphics/xv/files/patch-sum | 7 | ||||
| -rw-r--r-- | graphics/xv/patches/patch-af | 15 | ||||
| -rw-r--r-- | graphics/xv/patches/patch-ag | 13 | ||||
| -rw-r--r-- | graphics/xv/patches/patch-png2-Imakefile | 4 |
4 files changed, 17 insertions, 22 deletions
diff --git a/graphics/xv/files/patch-sum b/graphics/xv/files/patch-sum index 409b1cc7562..17bd341933c 100644 --- a/graphics/xv/files/patch-sum +++ b/graphics/xv/files/patch-sum @@ -1,14 +1,13 @@ -$NetBSD: patch-sum,v 1.4 1999/11/19 09:38:18 agc Exp $ +$NetBSD: patch-sum,v 1.5 2000/01/04 16:55:33 bouyer Exp $ MD5 (patch-aa) = 77f91c256a0b0f6cbac5673684c8d585 MD5 (patch-ab) = 1da2c2fd872eb392a48f132bbd4bf63c MD5 (patch-ac) = 340ef04fe230197887ec7d7c2616b521 MD5 (patch-ad) = bb5894cc304cf79a79c236eaf035547c MD5 (patch-ae) = 5836b41c1360daf8c29dc25bc32473a7 -MD5 (patch-af) = 5d9d3addb26000dddae35a827e382b5e -MD5 (patch-ag) = 872417731f001f1ab01cf099304efd91 +MD5 (patch-af) = 3c86698cb2642bcb2cbac7402d5d60cd MD5 (patch-png1) = 0656b2d14390e377e83abc1054a2bdbd -MD5 (patch-png2-Imakefile) = d7255aa55e9b7a56b5f48c4b91e89409 +MD5 (patch-png2-Imakefile) = f708efbec8ccf7b19488480a0e946ccb MD5 (patch-png2-Makefile) = 1c26627ba95fb3b2bfd8dd3c1815167b MD5 (patch-png2-Makefile.std) = 27b1c478033a9a92eef4968ac51f28f6 MD5 (patch-png2-xv.c) = 26bd1c5c20fcc8be9e2e0b3c7c09a42a diff --git a/graphics/xv/patches/patch-af b/graphics/xv/patches/patch-af index 42440951b52..30b079f6d98 100644 --- a/graphics/xv/patches/patch-af +++ b/graphics/xv/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.2 1998/08/07 10:40:56 agc Exp $ +$NetBSD: patch-af,v 1.3 2000/01/04 16:55:33 bouyer Exp $ ---- xv.h 1997/11/20 12:25:30 1.1 -+++ xv.h 1997/11/20 12:25:47 +--- xv.h.orig Tue Jan 4 17:12:42 2000 ++++ xv.h Tue Jan 4 17:13:38 2000 @@ -107,9 +107,7 @@ #endif @@ -13,3 +13,12 @@ $NetBSD: patch-af,v 1.2 1998/08/07 10:40:56 agc Exp $ /* include files */ +@@ -128,7 +126,7 @@ + #ifndef VMS + # include <errno.h> + extern int errno; /* SHOULD be in errno.h, but often isn't */ +-# if !(defined(BSD) && (BSD >= 199103)) ++# if !(defined(BSD) && (BSD >= 199103)) && !defined(__linux__) + extern char *sys_errlist[]; /* this too... */ + # endif + #endif diff --git a/graphics/xv/patches/patch-ag b/graphics/xv/patches/patch-ag deleted file mode 100644 index 6f1b05c8ea3..00000000000 --- a/graphics/xv/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 1999/09/20 18:03:41 christos Exp $ - ---- ./xv.h.orig Mon Sep 20 13:33:56 1999 -+++ ./xv.h Mon Sep 20 13:37:46 1999 -@@ -126,7 +126,7 @@ - #ifndef VMS - # include <errno.h> - extern int errno; /* SHOULD be in errno.h, but often isn't */ --# if !(defined(BSD) && (BSD >= 199103)) -+# if !(defined(BSD) && (BSD >= 199103)) && !defined(__linux__) - extern char *sys_errlist[]; /* this too... */ - # endif - #endif diff --git a/graphics/xv/patches/patch-png2-Imakefile b/graphics/xv/patches/patch-png2-Imakefile index 940be820add..1609460938c 100644 --- a/graphics/xv/patches/patch-png2-Imakefile +++ b/graphics/xv/patches/patch-png2-Imakefile @@ -1,4 +1,4 @@ -$NetBSD: patch-png2-Imakefile,v 1.1 1999/06/13 16:23:54 hubertf Exp $ +$NetBSD: patch-png2-Imakefile,v 1.2 2000/01/04 16:55:34 bouyer Exp $ This patch is based on http://www.mit.edu/afs/athena/contrib/graphics/src/xv/patches/png/xvpng.diff @@ -45,7 +45,7 @@ It was edited to fit into the NetBSD Packages Collection! - HF +### +*/ +#ifdef UseInstalledZlib -+ZLIBDIR = /usr ++ZLIBDIR = $(LOCALBASE) +ZLIBINC = -I$(ZLIBDIR)/include +ZLIBLIB = -L$(ZLIBDIR)/lib -lz +LIBZLIB = ${ZLIB} |