- use buildlink2

- Darwin has no malloc.h

allows this to build on Darwin.

3 files changed, 20 insertions, 13 deletions

diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 1b11875bace..06cd58fbff4 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2002/10/06 16:26:56 he Exp $
+# $NetBSD: Makefile,v 1.44 2003/01/13 10:54:08 grant Exp $
 
 DISTNAME=	xv-3.10a
 PKGREVISION=	4
@@ -16,8 +16,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.trilon.com/xv/
 COMMENT=	X11 program that displays images of various formats
 
-DEPENDS+=	png>=1.2.1:../../graphics/png
-DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
+USE_BUILDLINK2=	YES
 
 USE_IMAKE=	YES
 
@@ -48,4 +47,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv
 	${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
 
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index 89ab0ab46eb..006e744932a 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/10/06 16:26:56 he Exp $
+$NetBSD: distinfo,v 1.6 2003/01/13 10:54:08 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) = d8d48b7885ce7cd28c23ddb92be9ec90ad1bf8b7
+SHA1 (patch-ab) = e5d8b51f4828ec806e2b284e734fdb917851ce1b
 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 2bc3a32cf0c..7854f7fe85b 100644
--- a/graphics/xv/patches/patch-ab
+++ b/graphics/xv/patches/patch-ab
@@ -1,18 +1,24 @@
-$NetBSD: patch-ab,v 1.4 1999/11/14 13:25:59 rh Exp $
-
---- vdcomp.c.orig	Sun Nov 14 13:54:56 1999
-+++ vdcomp.c	Sun Nov 14 13:54:59 1999
-@@ -109,7 +109,8 @@
+--- vdcomp.c.orig	Mon Jan 13 21:38:49 2003
++++ vdcomp.c	Mon Jan 13 21:47:04 2003
+@@ -109,12 +109,16 @@
       !defined(__bsd43)                   && \
       !defined(aux)                       && \
       !defined(__bsdi__)                  && \
 -     !defined(sequent)
 +     !defined(sequent)			 && \
-+     !defined(__FreeBSD__) && !defined(__NetBSD__)
++     !defined(__FreeBSD__)		 && \
++     !defined(__NetBSD__)		 && \
++     !defined(__DARWIN__)
  
  #  if defined(hp300) || defined(hp800) || defined(NeXT)
  #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
-@@ -437,10 +438,13 @@
+ #  else
+ #   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 @@
  {
    short   shortint;
    typedef long    off_t;
@@ -27,7 +33,7 @@ $NetBSD: patch-ab,v 1.4 1999/11/14 13:25:59 rh Exp $
    }
  
    if (host == 1 | host == 2) {
-@@ -482,13 +486,17 @@
+@@ -482,13 +489,17 @@
        printf("\n  3.  VICAR format.");
        printf("\n  4.  Unlabelled binary array.\n");
        printf("\n  Enter format number:");