[pkgsrc/trunk]: pkgsrc/graphics/xv Update to xv-3.10a-jumbo-patches-20070520.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8bdf6fd6fed1
branches:  trunk
changeset: 530763:8bdf6fd6fed1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jul 08 10:50:23 2007 +0000

description:
Update to xv-3.10a-jumbo-patches-20070520.
Merge patch-ad and patch-ah.
Use SUBST framework.
Add some tools (per pkglint).

Bump PKGREVISION.

diffstat:

 graphics/xv/Makefile         |  47 +++++++++++++++----------
 graphics/xv/PLIST            |  12 +++---
 graphics/xv/distinfo         |  20 ++++------
 graphics/xv/patches/patch-aa |  26 +++++++-------
 graphics/xv/patches/patch-ab |  14 -------
 graphics/xv/patches/patch-ac |  11 ++---
 graphics/xv/patches/patch-ad |  78 ++++++++++++++++++++++++++++++++-----------
 graphics/xv/patches/patch-af |  35 ++++++-------------
 graphics/xv/patches/patch-ah |  68 --------------------------------------
 graphics/xv/patches/patch-ai |  22 ------------
 graphics/xv/patches/patch-aj |  22 ------------
 11 files changed, 128 insertions(+), 227 deletions(-)

diffs (truncated from 509 to 300 lines):

diff -r c8f7ab4602f6 -r 8bdf6fd6fed1 graphics/xv/Makefile
--- a/graphics/xv/Makefile      Sun Jul 08 10:04:44 2007 +0000
+++ b/graphics/xv/Makefile      Sun Jul 08 10:50:23 2007 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.68 2007/01/23 02:50:19 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.69 2007/07/08 10:50:23 wiz Exp $
 
 DISTNAME=      xv-3.10a
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    graphics x11
 MASTER_SITES=  ftp://ftp.cis.upenn.edu/pub/xv/
-#DISTFILES=    ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} xv-3.10a-jumbo-patches-20070520.tar.gz
 
-PATCHFILES=    xv-3.10a-jumbo-patches-20050501.tar.bz2
+PATCHFILES=    xv-3.10a-jumbo-patches-20070520.tar.gz
 PATCH_SITES=   ${MASTER_SITE_SOURCEFORGE:=png-mng/}
-PATCH_DIST_CAT=                ${BZCAT} $$patchfile | ${TAR} -Oxf - "*-patch-*"
+PATCH_DIST_CAT=                ${GZCAT} $$patchfile | ${TAR} -Oxf - "*-patch-*"
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -17,6 +17,7 @@
 COMMENT=       X11 program that displays images of various formats
 
 USE_IMAKE=     YES
+USE_TOOLS+=    gzcat tar
 
 # See the end of README in work/xv-3.10a for details.
 RESTRICTED=    Distribution of modified copies and commercial distribution is not permitted.
@@ -24,28 +25,36 @@
 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"\"
+
 LICENSE=       xv-license
+BUILD_TARGET=  depend all
+
+SUBST_CLASSES+=                gspath
+SUBST_FILES.gspath=    config.h
+SUBST_SED.gspath=      -e 's|@LOCALBASE@|${LOCALBASE}|g'
+SUBST_STAGE.gspath=    post-configure
+SUBST_MESSAGE.gspath=  Fixing path to ghostscript interpreter.
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "SunOS"
+SUBST_CLASSES+=                ccflags
+SUBST_FILES.ccflags=   Makefile
+SUBST_SED.ccflags=     -e 's| CC = .*| CC = ${CC:Q}|'
+SUBST_SED.ccflags+=    -e 's| CCOPTIONS = .*| CCOPTIONS = ${CFLAGS:Q}|'
+SUBST_SED.ccflags+=    -e 's| CDEBUGFLAGS = .*| CDEBUGFLAGS =|'
+SUBST_STAGE.ccflags=   post-configure
+SUBST_MESSAGE.ccflags= Fixing compiler flags for Solaris.
+.endif
+
 .if !empty(LOWER_OPSYS:Mirix5*) || !empty(LOWER_OPSYS:Msolaris*)
 CPPFLAGS+=     -DNEED_ALLOCA_H
 .endif
 
-pre-configure:
-       ${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.orig &&             \
-               ${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g'                \
-               ${WRKSRC}/config.h.orig > ${WRKSRC}/config.h
-
-.if ${OPSYS} == "SunOS"
-post-configure:
-       ${MV} ${WRKSRC}/${MAKE_FILE} ${WRKSRC}/${MAKE_FILE}.orig &&     \
-               ${SED} -e 's| CC = .*| CC = ${CC}|'                     \
-               -e 's| CCOPTIONS = .*| CCOPTIONS = ${CFLAGS}|'          \
-               -e 's| CDEBUGFLAGS = .*| CDEBUGFLAGS =|'                \
-               ${WRKSRC}/${MAKE_FILE}.orig > ${WRKSRC}/${MAKE_FILE}
-.endif
-
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xv
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv
diff -r c8f7ab4602f6 -r 8bdf6fd6fed1 graphics/xv/PLIST
--- a/graphics/xv/PLIST Sun Jul 08 10:04:44 2007 +0000
+++ b/graphics/xv/PLIST Sun Jul 08 10:50:23 2007 +0000
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/10 16:50:18 he Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/07/08 10:50:23 wiz Exp $
 bin/bggen
 bin/vdcomp
 bin/xcmap
 bin/xv
 bin/xvpictoppm
 lib/X11/xv_mgcsfx.sample
-${IMAKE_MAN_DIR}/xv.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/bggen.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/vdcomp.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xcmap.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xvpictoppm.${IMAKE_MANNEWSUFFIX}
+man/cat1/bggen.0
+man/cat1/vdcomp.0
+man/cat1/xcmap.0
+man/cat1/xv.0
+man/cat1/xvpictoppm.0
 share/doc/xv/README
 share/doc/xv/xvdocs.ps
 @dirrm share/doc/xv
diff -r c8f7ab4602f6 -r 8bdf6fd6fed1 graphics/xv/distinfo
--- a/graphics/xv/distinfo      Sun Jul 08 10:04:44 2007 +0000
+++ b/graphics/xv/distinfo      Sun Jul 08 10:50:23 2007 +0000
@@ -1,16 +1,12 @@
-$NetBSD: distinfo,v 1.13 2006/05/14 21:16:00 schwarz Exp $
+$NetBSD: distinfo,v 1.14 2007/07/08 10:50:24 wiz Exp $
 
+SHA1 (xv-3.10a-jumbo-patches-20070520.tar.gz) = d00308c1687d9d803d26ef40c73d19a0f593c626
+RMD160 (xv-3.10a-jumbo-patches-20070520.tar.gz) = 23bc07030416ebaca5ce4d223921e33094c37b93
+Size (xv-3.10a-jumbo-patches-20070520.tar.gz) = 1363802 bytes
 SHA1 (xv-3.10a.tar.gz) = 9e6372f154be9e9e355972cbeb91d98d9c342474
 RMD160 (xv-3.10a.tar.gz) = 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d
 Size (xv-3.10a.tar.gz) = 2259124 bytes
-SHA1 (xv-3.10a-jumbo-patches-20050501.tar.bz2) = deb42fc30697312f13fcedb88f10cc3ed0ced8ac
-RMD160 (xv-3.10a-jumbo-patches-20050501.tar.bz2) = d199e7d1b6c5162e0cad09d4118b3735f1d156ef
-Size (xv-3.10a-jumbo-patches-20050501.tar.bz2) = 369886 bytes
-SHA1 (patch-aa) = 9bfd1e6a55766e4c6f60907a5f58a882657dca9b
-SHA1 (patch-ab) = 1be183fb72ba82cc15fdcec6607c1e294e284370
-SHA1 (patch-ac) = cc0da5cefbb4a13b86daaca482c52ece4bc3294c
-SHA1 (patch-ad) = 3a49ca0152f6a7d6cf79348e3b5308da509b63ea
-SHA1 (patch-af) = 1beddc2abe530871fcdbb2cea5682225c194bd4d
-SHA1 (patch-ah) = 830139139ddf49a505786cde8930ba1e9ae006f4
-SHA1 (patch-ai) = 10febc95047fc25a3b93c157eb39ed1ed7a30bc6
-SHA1 (patch-aj) = 7f40c002d8a16b1507c6171db543285447e3cf81
+SHA1 (patch-aa) = bd6ef51bf962e1994e2e47ba5197c9729ec5221a
+SHA1 (patch-ac) = 39933efe8411df805abfac5a1e43f1e5bee2ea8f
+SHA1 (patch-ad) = b0d0d4f4243ceb091e0734c0024c997bdf7e86c7
+SHA1 (patch-af) = c6ede0291556f7739274e8352d6fb626480927e8
diff -r c8f7ab4602f6 -r 8bdf6fd6fed1 graphics/xv/patches/patch-aa
--- a/graphics/xv/patches/patch-aa      Sun Jul 08 10:04:44 2007 +0000
+++ b/graphics/xv/patches/patch-aa      Sun Jul 08 10:50:23 2007 +0000
@@ -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 -r c8f7ab4602f6 -r 8bdf6fd6fed1 graphics/xv/patches/patch-ab
--- a/graphics/xv/patches/patch-ab      Sun Jul 08 10:04:44 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r c8f7ab4602f6 -r 8bdf6fd6fed1 graphics/xv/patches/patch-ac
--- a/graphics/xv/patches/patch-ac      Sun Jul 08 10:04:44 2007 +0000
+++ b/graphics/xv/patches/patch-ac      Sun Jul 08 10:50:23 2007 +0000
@@ -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 -r c8f7ab4602f6 -r 8bdf6fd6fed1 graphics/xv/patches/patch-ad
--- a/graphics/xv/patches/patch-ad      Sun Jul 08 10:04:44 2007 +0000
+++ b/graphics/xv/patches/patch-ad      Sun Jul 08 10:50:23 2007 +0000
@@ -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 @@
  
  
  /* 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 @@
  
 +#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
+-      $(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \