[pkgsrc/trunk]: pkgsrc/graphics/xv Don't use malloc.h. Don't override MANDIR,...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eb8bab1c469a
branches:  trunk
changeset: 531281:eb8bab1c469a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jul 27 23:42:17 2007 +0000

description:
Don't use malloc.h. Don't override MANDIR, imake is special.

diffstat:

 graphics/xv/Makefile         |   3 +-
 graphics/xv/distinfo         |   3 +-
 graphics/xv/patches/patch-ab |  46 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)

diffs (84 lines):

diff -r 74e509cb2175 -r eb8bab1c469a graphics/xv/Makefile
--- a/graphics/xv/Makefile      Fri Jul 27 23:29:40 2007 +0000
+++ b/graphics/xv/Makefile      Fri Jul 27 23:42:17 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2007/07/10 22:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2007/07/27 23:42:17 joerg Exp $
 
 DISTNAME=      xv-3.10a
 PKGREVISION=   13
@@ -27,7 +27,6 @@
 NO_BIN_ON_FTP=         ${RESTRICTED}
 
 MAKEFLAGS+=    PREFIX=${PREFIX:Q}
-MAKEFLAGS+=    MANDIR=${PREFIX}/${PKGMANDIR}/cat1
 MAKEFLAGS+=    PNGDIR=${BUILDLINK_PREFIX.png}
 CPPFLAGS+=     -DDOCDIR=\""${PREFIX:Q}/share/doc/xv"\"
 
diff -r 74e509cb2175 -r eb8bab1c469a graphics/xv/distinfo
--- a/graphics/xv/distinfo      Fri Jul 27 23:29:40 2007 +0000
+++ b/graphics/xv/distinfo      Fri Jul 27 23:42:17 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2007/07/08 10:50:24 wiz Exp $
+$NetBSD: distinfo,v 1.15 2007/07/27 23:42:17 joerg Exp $
 
 SHA1 (xv-3.10a-jumbo-patches-20070520.tar.gz) = d00308c1687d9d803d26ef40c73d19a0f593c626
 RMD160 (xv-3.10a-jumbo-patches-20070520.tar.gz) = 23bc07030416ebaca5ce4d223921e33094c37b93
@@ -7,6 +7,7 @@
 RMD160 (xv-3.10a.tar.gz) = 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d
 Size (xv-3.10a.tar.gz) = 2259124 bytes
 SHA1 (patch-aa) = bd6ef51bf962e1994e2e47ba5197c9729ec5221a
+SHA1 (patch-ab) = 5bfc8ae09b029e4661b27d94bba46540c7f320fb
 SHA1 (patch-ac) = 39933efe8411df805abfac5a1e43f1e5bee2ea8f
 SHA1 (patch-ad) = b0d0d4f4243ceb091e0734c0024c997bdf7e86c7
 SHA1 (patch-af) = c6ede0291556f7739274e8352d6fb626480927e8
diff -r 74e509cb2175 -r eb8bab1c469a graphics/xv/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/xv/patches/patch-ab      Fri Jul 27 23:42:17 2007 +0000
@@ -0,0 +1,46 @@
+$NetBSD: patch-ab,v 1.10 2007/07/27 23:42:17 joerg Exp $
+
+--- vdcomp.c.orig      2007-07-27 23:20:04.000000000 +0000
++++ vdcomp.c
+@@ -96,41 +96,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-/* include a malloc.h of some sort (if needed...most systems use stdlib.h) */
+-#ifndef VMS   /* VMS hates multi-line "#if"s */
+-   /*
+-    * 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
+-    * machine has or not.
+-    */
+-#  if !defined(ibm032)                    && \
+-      !defined(__convex__)                && \
+-      !(defined(vax) && !defined(ultrix)) && \
+-      !defined(mips)                      && \
+-      !defined(apollo)                    && \
+-      !defined(pyr)                       && \
+-      !defined(sequent)                   && \
+-      !defined(__UMAXV__)                 && \
+-      !defined(aux)                       && \
+-      !defined(bsd43)                     && \
+-      !defined(__bsd43)                   && \
+-      !defined(__bsdi__)                  && \
+-      !defined(__386BSD__)                && \
+-      !defined(__FreeBSD__)               && \
+-      !defined(__OpenBSD__)               && \
+-      !defined(__NetBSD__)                && \
+-      !defined(__DARWIN__)
+-
+-#    if defined(hp300) || defined(hp800) || defined(NeXT)
+-#      include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
+-#    else
+-#      include <malloc.h>        /* FIXME: should explicitly list systems that NEED this, not everyone that doesn't */
+-#    endif
+-
+-#  endif /* !most modern systems */
+-#endif /* !VMS */
+-
+-
+ #include <X11/Xos.h>
+ 
+ #define TRUE         1