Update to xv-3.10a-jumbo-patches-20070520.

Merge patch-ad and patch-ah.
Use SUBST framework.
Add some tools (per pkglint).

Bump PKGREVISION.

8 files changed, 86 insertions, 190 deletions

diff --git a/graphics/xv/patches/patch-aa b/graphics/xv/patches/patch-aa
index 6f19d7262f6..b7ac2d6508c 100644
--- a/graphics/xv/patches/patch-aa
+++ b/graphics/xv/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2006/03/15 19:27:31 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2007/07/08 10:50:24 wiz Exp $
 
---- vdcomp.c.orig	2006-03-15 11:00:24.000000000 -0800
-+++ vdcomp.c
-@@ -116,7 +116,8 @@
- #  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__) \
-+       && !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
+--- xvpcd.c.orig	2007-05-14 01:02:13.000000000 +0000
++++ xvpcd.c
+@@ -30,9 +30,6 @@
+ #ifdef HAVE_PCD
+ 
+ #include <memory.h>
+-#ifndef alloca
+-#  include <alloca.h> /* "not in POSIX or SUSv3" according to Linux man page */
+-#endif                /* ...but required for Sun C compiler (alloca = macro) */
+ 
+ #define  TRACE  0
+ #if TRACE
diff --git a/graphics/xv/patches/patch-ab b/graphics/xv/patches/patch-ab
deleted file mode 100644
index 83fb756df8a..00000000000
--- a/graphics/xv/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2006/05/14 21:16:00 schwarz Exp $
-
---- xvpcd.c.orig	2006-05-14 18:38:26.000000000 +0200
-+++ xvpcd.c	2006-05-14 18:39:31.000000000 +0200
-@@ -27,6 +27,9 @@
- 
- #include "xv.h"
- #include <memory.h>
-+#ifdef NEED_ALLOCA_H
-+#include <alloca.h>
-+#endif
- 
- #ifdef HAVE_PCD
- 
diff --git a/graphics/xv/patches/patch-ac b/graphics/xv/patches/patch-ac
index 90853f8f1fa..1eaf12969e9 100644
--- a/graphics/xv/patches/patch-ac
+++ b/graphics/xv/patches/patch-ac
@@ -1,13 +1,12 @@
-$NetBSD: patch-ac,v 1.8 2005/08/10 16:50:18 he Exp $
+$NetBSD: patch-ac,v 1.9 2007/07/08 10:50:25 wiz Exp $
 
---- config.h.orig	2005-07-29 15:11:02.000000000 +0200
+--- config.h.orig	2007-06-08 07:29:49.000000000 +0000
 +++ config.h
-@@ -116,10 +116,9 @@
-  * should not need to be changed
+@@ -113,9 +113,9 @@
   */
  
--/* #define GS_PATH "/usr/local/bin/gs" */
--#define GS_PATH "/usr/bin/gs"
+ /* #define GS_PATH "/usr/local/bin/gs" */
+-#define GS_PATH "gs"
 -/* #define GS_LIB  "."                 */
 -/* #define GS_DEV  "ppmraw"            */
 +#define GS_PATH "@LOCALBASE@/bin/gs"
diff --git a/graphics/xv/patches/patch-ad b/graphics/xv/patches/patch-ad
index 084cd73ae99..4bbe23c05a1 100644
--- a/graphics/xv/patches/patch-ad
+++ b/graphics/xv/patches/patch-ad
@@ -1,6 +1,7 @@
-$NetBSD: patch-ad,v 1.9 2005/08/10 16:50:18 he Exp $
+$NetBSD: patch-ad,v 1.10 2007/07/08 10:50:26 wiz Exp $
 
---- Imakefile.orig	2005-07-29 15:14:59.000000000 +0200
+diff -u Imakefile Imakefile
+--- Imakefile.orig
 +++ Imakefile
 @@ -6,13 +6,15 @@
  /* if, for whatever reason, you're unable to get the JPEG library to compile
@@ -20,7 +21,17 @@ $NetBSD: patch-ad,v 1.9 2005/08/10 16:50:18 he Exp $
  
  
  /* if, for whatever reason, you're unable to get the PDS/VICAR support
-@@ -124,16 +126,30 @@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\"
+@@ -21,6 +23,9 @@
+ #define HavePDS
+ 
+ 
++#define UseInstalledPng
++#define UseInstalledZlib
++
+ /*
+  * if you are running on a SysV-based machine, such as HP, Silicon Graphics,
+  * etc, uncomment one of the following lines to get you *most* of the way
+@@ -124,20 +129,62 @@
  JPEG = -DDOJPEG
  JPEGDIR = jpeg
  LIBJPEG = $(JPEGDIR)/libjpeg.a
@@ -44,36 +55,61 @@ $NetBSD: patch-ad,v 1.9 2005/08/10 16:50:18 he Exp $
  
 +#ifdef UseInstalledTiff
 +TIFF = -DDOTIFF
-+LIBTIFF = -L$(LOCALBASE)/lib -ltiff -ljpeg -lz
++LIBTIFF = -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -ltiff -ljpeg -lz
 +TIFFINCLUDE = -I$(LOCALBASE)/include
 +#endif
 +
  #ifdef HavePDS
  PDS = -DDOPDS
  #endif
-@@ -149,8 +165,8 @@ SYS_LIBRARIES=        -lm
+ 
++/*
++###
++### if, for whatever reason, you're unable to get the PNG library to compile
++### on your machine, *COMMENT OUT* the following lines
++###
++*/
++#ifdef UseInstalledPng
++PNG    = -DDOPNG
++PNGDIR = ${LOCALBASE}
++PNGINC = -I$(PNGDIR)/include
++PNGLIB = -L$(PNGDIR)/lib -lpng -lz
++LIBPNG = ${PNGLIB}
++PNGINCLUDE = ${PNGINC}
++#endif
++
++/*
++###
++### if, for whatever reason, you're unable to get the PNG library to compile
++### on your machine, *COMMENT OUT* the following lines
++###
++*/
++#ifdef UseInstalledZlib
++ZLIBDIR = $(LOCALBASE)
++ZLIBINC = -I$(ZLIBDIR)/include
++ZLIBLIB = -L$(ZLIBDIR)/lib -lz
++LIBZLIB = ${ZLIB}
++ZLIBINCLUDE = ${ZLIBINC}
++#endif
+ 
+ #if defined(SCOArchitecture)
+ SCO= -Dsco -DPOSIX -DNO_RANDOM 
+@@ -149,14 +196,14 @@
  #endif
  
  
 -DEPLIBS = $(LIBJPEG) $(LIBTIFF)
 -LOCAL_LIBRARIES = $(XLIB) $(DEPLIBS)
-+DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF)
-+LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF)
++DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF) $(DEPLIBPNG) $(DEPLIBZLIB)
++LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF) $(LIBPNG) $(LIBZLIB)
  
  DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
- 	$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
-@@ -194,10 +210,10 @@ OBJS5=	xvpictoppm.o
- 
- PROGRAMS= xv bggen vdcomp xcmap xvpictoppm
- 
--all::
--	@echo ""
--	@echo "  Did you remember to 'make depend' first?"
--	@echo ""
-+#all::
-+#	@echo ""
-+#	@echo "  Did you remember to 'make depend' first?"
-+#	@echo ""
+-	$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
++	$(HPUX7) $(JPEG) $(TIFF) $(PNG) $(PDS) $(DXWM) $(RAND) \
+ 	$(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX)
  
+-INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE)
++INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE) $(PNGINCLUDE) $(ZLIBINCLUDE)
  
- #if defined(HaveJpeg) || defined(HaveTiff)
+ SRCS1 =	xv.c xvevent.c xvroot.c xvmisc.c xvimage.c xvcolor.c xvsmooth.c \
+ 	xv24to8.c xvgif.c xvpm.c xvinfo.c xvctrl.c xvscrl.c xvalg.c \
diff --git a/graphics/xv/patches/patch-af b/graphics/xv/patches/patch-af
index f28b366a548..2a3cdf4e075 100644
--- a/graphics/xv/patches/patch-af
+++ b/graphics/xv/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2006/03/15 19:27:31 minskim Exp $
+$NetBSD: patch-af,v 1.7 2007/07/08 10:50:26 wiz Exp $
 
---- xv.h.orig	2006-03-15 11:00:24.000000000 -0800
+--- xv.h.orig	2007-06-08 07:24:51.000000000 +0000
 +++ xv.h
-@@ -137,9 +137,7 @@
+@@ -138,9 +138,7 @@
  #endif
  
  
@@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.6 2006/03/15 19:27:31 minskim Exp $
  
  
  /* include files */
-@@ -158,7 +156,7 @@
+@@ -159,7 +157,7 @@
  #ifndef VMS
  #  include <errno.h>
  #  ifndef __NetBSD__
@@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.6 2006/03/15 19:27:31 minskim Exp $
         extern int   errno;         /* SHOULD be in errno.h, but often isn't */
         extern char *sys_errlist[]; /* this too... */
  #    endif
-@@ -170,7 +168,7 @@
+@@ -171,7 +169,7 @@
  #ifdef VMS
  #  define ERRSTR(x) strerror(x, vaxc$errno)
  #else
@@ -31,27 +31,14 @@ $NetBSD: patch-af,v 1.6 2006/03/15 19:27:31 minskim Exp $
  #    define ERRSTR(x) strerror(x)
  #  else
  #    define ERRSTR(x) sys_errlist[x]
-@@ -215,7 +213,9 @@
+@@ -207,7 +205,9 @@
  #  if defined(hp300) || defined(hp800) || defined(NeXT)
- #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
+ #    include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
  #  else
--#   include <malloc.h>
-+#   ifndef __DARWIN__
-+#    include <malloc.h>
-+#   endif
+-#    include <malloc.h>
++#    ifndef __DARWIN__
++#      include <malloc.h>
++#    endif
  #  endif
- # endif
- #endif /* !VMS */
-@@ -345,7 +345,11 @@
  #endif
  
- #ifndef S_IRWUSR
--#  define S_IRWUSR	(S_IRUSR|__S_IWRITE)
-+#  ifdef	__S_IWRITE
-+#    define S_IRWUSR	(S_IRUSR|__S_IWRITE)
-+#  else
-+#    define S_IRWUSR	(S_IRUSR|S_IWUSR)
-+#  endif
- #endif
- 
- #ifndef MAXPATHLEN
diff --git a/graphics/xv/patches/patch-ah b/graphics/xv/patches/patch-ah
deleted file mode 100644
index e2aac4e456f..00000000000
--- a/graphics/xv/patches/patch-ah
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/08/10 16:50:18 he Exp $
-
---- Imakefile.orig	2005-07-29 15:28:09.000000000 +0200
-+++ Imakefile
-@@ -23,6 +23,9 @@
- #define HavePDS
- 
- 
-+#define UseInstalledPng
-+#define UseInstalledZlib
-+
- /*
-  * if you are running on a SysV-based machine, such as HP, Silicon Graphics,
-  * etc, uncomment one of the following lines to get you *most* of the way
-@@ -154,6 +157,34 @@ TIFFINCLUDE = -I$(LOCALBASE)/include
- PDS = -DDOPDS
- #endif
- 
-+/*
-+###
-+### if, for whatever reason, you're unable to get the PNG library to compile
-+### on your machine, *COMMENT OUT* the following lines
-+###
-+*/
-+#ifdef UseInstalledPng
-+PNG    = -DDOPNG
-+PNGDIR = ${LOCALBASE}
-+PNGINC = -I$(PNGDIR)/include
-+PNGLIB = -L$(PNGDIR)/lib -lpng -lz
-+LIBPNG = ${PNGLIB}
-+PNGINCLUDE = ${PNGINC}
-+#endif
-+
-+/*
-+###
-+### if, for whatever reason, you're unable to get the PNG library to compile
-+### on your machine, *COMMENT OUT* the following lines
-+###
-+*/
-+#ifdef UseInstalledZlib
-+ZLIBDIR = $(LOCALBASE)
-+ZLIBINC = -I$(ZLIBDIR)/include
-+ZLIBLIB = -L$(ZLIBDIR)/lib -lz
-+LIBZLIB = ${ZLIB}
-+ZLIBINCLUDE = ${ZLIBINC}
-+#endif
- 
- #if defined(SCOArchitecture)
- SCO= -Dsco -DPOSIX -DNO_RANDOM 
-@@ -165,14 +196,14 @@ SYS_LIBRARIES=        -lm
- #endif
- 
- 
--DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF)
--LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF)
-+DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF) $(DEPLIBPNG) $(DEPLIBZLIB)
-+LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF) $(LIBPNG) $(LIBZLIB)
- 
- DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
--	$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
-+	$(HPUX7) $(JPEG) $(TIFF) $(PNG) $(PDS) $(DXWM) $(RAND) \
- 	$(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX)
- 
--INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE)
-+INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE) $(PNGINCLUDE) $(ZLIBINCLUDE)
- 
- SRCS1 =	xv.c xvevent.c xvroot.c xvmisc.c xvimage.c xvcolor.c xvsmooth.c \
- 	xv24to8.c xvgif.c xvpm.c xvinfo.c xvctrl.c xvscrl.c xvalg.c \
diff --git a/graphics/xv/patches/patch-ai b/graphics/xv/patches/patch-ai
deleted file mode 100644
index c8135669581..00000000000
--- a/graphics/xv/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/08/10 16:50:18 he Exp $
-
---- Makefile.orig	2005-07-29 15:30:40.000000000 +0200
-+++ Makefile
-@@ -41,7 +41,7 @@ CLEANDIR = cleandir
- 
- 
- ### Installation locations
--PREFIX = /usr/local
-+PREFIX = ${LOCALBASE}
- BINDIR = $(PREFIX)/bin
- MANDIR = $(PREFIX)/man/man1
- MANSUF = 1
-@@ -89,7 +89,7 @@ JPEGLIB = -L$(JPEGDIR)/lib -ljpeg
- ### on your machine, *COMMENT OUT* the following lines
- ###
- PNG    = -DDOPNG
--PNGDIR = /usr
-+PNGDIR = ${LOCALBASE}
- #PNGDIR = /usr/local
- #PNGDIR = ../../libpng
- ###
diff --git a/graphics/xv/patches/patch-aj b/graphics/xv/patches/patch-aj
deleted file mode 100644
index 38fe3742a71..00000000000
--- a/graphics/xv/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2005/08/10 16:50:18 he Exp $
-
---- Makefile.std.orig	2005-07-29 15:33:26.000000000 +0200
-+++ Makefile.std
-@@ -41,7 +41,7 @@ CLEANDIR = cleandir
- 
- 
- ### Installation locations
--PREFIX = /usr/local
-+PREFIX = ${LOCALBASE}
- BINDIR = $(PREFIX)/bin
- MANDIR = $(PREFIX)/man/man1
- MANSUF = 1
-@@ -89,7 +89,7 @@ JPEGLIB = -L$(JPEGDIR)/lib -ljpeg
- ### on your machine, *COMMENT OUT* the following lines
- ###
- PNG    = -DDOPNG
--PNGDIR = /usr
-+PNGDIR = ${LOCALBASE}
- #PNGDIR = /usr/local
- #PNGDIR = ../../libpng
- ###