[pkgsrc/trunk]: pkgsrc/graphics/xv xv: make ghostscript support optional and ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c1493fad3b2
branches:  trunk
changeset: 330009:7c1493fad3b2
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Thu Feb 21 01:37:14 2019 +0000

description:
xv: make ghostscript support optional and disable it by default.

Building ghostscript on 1990's ancient machines is a bit pain
and postscript support on the old viewer is rarely necessary.

Bumps PKGREVISION. Also take maintainership as a user.

diffstat:

 graphics/xv/Makefile         |   9 +++++----
 graphics/xv/distinfo         |   6 +++---
 graphics/xv/patches/patch-ac |  12 +++++++++---
 graphics/xv/patches/patch-ad |  20 ++++++++++++++------
 4 files changed, 31 insertions(+), 16 deletions(-)

diffs (147 lines):

diff -r 1285e03d4c22 -r 7c1493fad3b2 graphics/xv/Makefile
--- a/graphics/xv/Makefile      Thu Feb 21 00:55:04 2019 +0000
+++ b/graphics/xv/Makefile      Thu Feb 21 01:37:14 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2018/06/21 22:36:36 tez Exp $
+# $NetBSD: Makefile,v 1.93 2019/02/21 01:37:14 tsutsui Exp $
 
 DISTNAME=      xv-3.10a
-PKGREVISION=   24
+PKGREVISION=   25
 CATEGORIES=    graphics x11
 MASTER_SITES=  ftp://ftp.cis.upenn.edu/pub/xv/
 DISTFILES=     ${DEFAULT_DISTFILES} ${JUMBO_PATCHES}
@@ -14,14 +14,15 @@
 PATCHFILES+=   xv-3.10a-enhancements.20070520-20081216.diff
 PATCH_SITES=   http://www.gregroelofs.com/code/
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    tsutsui%NetBSD.org@localhost
 HOMEPAGE=      http://www.trilon.com/xv/
 # and...       http://www.sonic.net/~roelofs/greg_xv.html
 COMMENT=       X11 program that displays images of various formats
 LICENSE=       xv-license
 
 USE_IMAKE=     YES
-USE_TOOLS+=    gs:run
+
+.include "options.mk"
 
 # See the end of README in work/xv-3.10a for details.
 RESTRICTED=    Distribution of modified copies and commercial distribution is not permitted.
diff -r 1285e03d4c22 -r 7c1493fad3b2 graphics/xv/distinfo
--- a/graphics/xv/distinfo      Thu Feb 21 00:55:04 2019 +0000
+++ b/graphics/xv/distinfo      Thu Feb 21 01:37:14 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2018/06/21 22:36:36 tez Exp $
+$NetBSD: distinfo,v 1.22 2019/02/21 01:37:14 tsutsui Exp $
 
 SHA1 (xv-3.10a-enhancements.20070520-20081216.diff) = 40bfb0889b820e0f9d3bd7d771144ec3458acc66
 RMD160 (xv-3.10a-enhancements.20070520-20081216.diff) = dbd4ab25b5b62fb543befcf655d928db3a77e005
@@ -14,8 +14,8 @@
 Size (xv-3.10a.tar.gz) = 2259124 bytes
 SHA1 (patch-aa) = bd6ef51bf962e1994e2e47ba5197c9729ec5221a
 SHA1 (patch-ab) = 5bfc8ae09b029e4661b27d94bba46540c7f320fb
-SHA1 (patch-ac) = a17b0095e6586b595190a07126ac58752d8a2562
-SHA1 (patch-ad) = d1fa6ae4c432528148ebe37b7a8bef8bd2059997
+SHA1 (patch-ac) = 66430e80d9a17f772abefd14d00af0b5a0f88100
+SHA1 (patch-ad) = 9447ae45ac67f2f9ef7eead8a6a21902f0c7922e
 SHA1 (patch-ae) = 2bda08bae67fcf127c49b9ed780b7a247579c088
 SHA1 (patch-af) = 7f6e771788e04577d8db17bfe8fbcce8dca4a600
 SHA1 (patch-ag) = 120d589f728fd32ea267fd46bcc16f27d9f08116
diff -r 1285e03d4c22 -r 7c1493fad3b2 graphics/xv/patches/patch-ac
--- a/graphics/xv/patches/patch-ac      Thu Feb 21 00:55:04 2019 +0000
+++ b/graphics/xv/patches/patch-ac      Thu Feb 21 01:37:14 2019 +0000
@@ -1,10 +1,15 @@
-$NetBSD: patch-ac,v 1.10 2009/05/03 22:58:31 abs Exp $
+$NetBSD: patch-ac,v 1.11 2019/02/21 01:37:14 tsutsui Exp $
+
+- make ghostscript support optional
+- use pkgsrc ${PREFIX} for ghostscript files
 
---- config.h.orig      2007-06-08 07:29:49.000000000 +0000
+--- config.h.orig      2019-02-17 16:07:37.145241693 +0000
 +++ config.h
-@@ -113,9 +113,9 @@
+@@ -112,10 +112,12 @@
+  * should not need to be changed
   */
  
++#ifdef DOGS
  /* #define GS_PATH "/usr/local/bin/gs" */
 -#define GS_PATH "gs"
 -/* #define GS_LIB  "."                 */
@@ -12,6 +17,7 @@
 +#define GS_PATH "@PREFIX@/bin/gs"
 +#define GS_LIB "@PREFIX@/share/ghostscript"
 +#define GS_DEV "ppmraw"
++#endif
  
  
  /***************************************************************************
diff -r 1285e03d4c22 -r 7c1493fad3b2 graphics/xv/patches/patch-ad
--- a/graphics/xv/patches/patch-ad      Thu Feb 21 00:55:04 2019 +0000
+++ b/graphics/xv/patches/patch-ad      Thu Feb 21 01:37:14 2019 +0000
@@ -1,7 +1,10 @@
-$NetBSD: patch-ad,v 1.11 2009/05/03 22:58:31 abs Exp $
+$NetBSD: patch-ad,v 1.12 2019/02/21 01:37:14 tsutsui Exp $
+
+- use jpeg, png, tiff, and zlib from pkgsrc
+- make ghostscript support optional
 
 diff -u Imakefile Imakefile
---- Imakefile.orig
+--- Imakefile.orig     2019-02-17 16:07:37.119347259 +0000
 +++ Imakefile
 @@ -6,13 +6,15 @@
  /* if, for whatever reason, you're unable to get the JPEG library to compile
@@ -21,17 +24,18 @@
  
  
  /* if, for whatever reason, you're unable to get the PDS/VICAR support
-@@ -21,6 +23,9 @@
+@@ -21,6 +23,10 @@
  #define HavePDS
  
  
++/* #define UseInstalledGhostScript */
 +#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 @@
+@@ -124,20 +130,66 @@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\"
  JPEG = -DDOJPEG
  JPEGDIR = jpeg
  LIBJPEG = $(JPEGDIR)/libjpeg.a
@@ -63,6 +67,10 @@
  PDS = -DDOPDS
  #endif
  
++#ifdef UseInstalledGhostScript
++GS = -DDOGS
++#endif
++
 +/*
 +###
 +### if, for whatever reason, you're unable to get the PNG library to compile
@@ -94,7 +102,7 @@
  
  #if defined(SCOArchitecture)
  SCO= -Dsco -DPOSIX -DNO_RANDOM 
-@@ -149,14 +196,14 @@
+@@ -149,14 +201,14 @@ SYS_LIBRARIES=        -lm
  #endif
  
  
@@ -105,7 +113,7 @@
  
  DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
 -      $(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
-+      $(HPUX7) $(JPEG) $(TIFF) $(PNG) $(PDS) $(DXWM) $(RAND) \
++      $(HPUX7) $(JPEG) $(TIFF) $(GS) $(PNG) $(PDS) $(DXWM) $(RAND) \
        $(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX)
  
 -INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE)