diff options
| author | joerg <joerg@pkgsrc.org> | 2007-07-27 23:42:17 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-07-27 23:42:17 +0000 |
| commit | d02254f49175209d6a9e970d81c1e2875f73a721 (patch) | |
| tree | 98d62c5555ee6f5f383bfabce4e2d596c1c3617e /graphics/xv | |
| parent | 77588045601140bd33adf60c5f2838b4e642ed51 (diff) | |
| download | pkgsrc-d02254f49175209d6a9e970d81c1e2875f73a721.tar.gz | |
Don't use malloc.h. Don't override MANDIR, imake is special.
Diffstat (limited to 'graphics/xv')
| -rw-r--r-- | graphics/xv/Makefile | 3 | ||||
| -rw-r--r-- | graphics/xv/distinfo | 3 | ||||
| -rw-r--r-- | graphics/xv/patches/patch-ab | 46 |
3 files changed, 49 insertions, 3 deletions
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 213a4e6b56e..9a18ce7d528 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -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_CDROM= ${RESTRICTED} 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 --git a/graphics/xv/distinfo b/graphics/xv/distinfo index 94582f504d2..86a0f92e70e 100644 --- a/graphics/xv/distinfo +++ b/graphics/xv/distinfo @@ -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 @@ SHA1 (xv-3.10a.tar.gz) = 9e6372f154be9e9e355972cbeb91d98d9c342474 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 --git a/graphics/xv/patches/patch-ab b/graphics/xv/patches/patch-ab new file mode 100644 index 00000000000..7619ffc4858 --- /dev/null +++ b/graphics/xv/patches/patch-ab @@ -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 |