head 1.13; access; symbols pkgsrc-2018Q4:1.11.0.80 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.78 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.11.0.76 pkgsrc-2018Q2-base:1.11 pkgsrc-2018Q1:1.11.0.74 pkgsrc-2018Q1-base:1.11 pkgsrc-2017Q4:1.11.0.72 pkgsrc-2017Q4-base:1.11 pkgsrc-2017Q3:1.11.0.70 pkgsrc-2017Q3-base:1.11 pkgsrc-2017Q2:1.11.0.66 pkgsrc-2017Q2-base:1.11 pkgsrc-2017Q1:1.11.0.64 pkgsrc-2017Q1-base:1.11 pkgsrc-2016Q4:1.11.0.62 pkgsrc-2016Q4-base:1.11 pkgsrc-2016Q3:1.11.0.60 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.58 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.56 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.11.0.54 pkgsrc-2015Q4-base:1.11 pkgsrc-2015Q3:1.11.0.52 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.11.0.50 pkgsrc-2015Q2-base:1.11 pkgsrc-2015Q1:1.11.0.48 pkgsrc-2015Q1-base:1.11 pkgsrc-2014Q4:1.11.0.46 pkgsrc-2014Q4-base:1.11 pkgsrc-2014Q3:1.11.0.44 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.42 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.40 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.38 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.36 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.34 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.32 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.30 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.28 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.26 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.24 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.22 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.20 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.18 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.16 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.14 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.12 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.10 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.11.0.8 pkgsrc-2010Q1-base:1.11 pkgsrc-2009Q4:1.11.0.6 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.4 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.2 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.10.0.18 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.10.0.16 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.14 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.12 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.10 pkgsrc-2008Q2-base:1.10 cwrapper:1.10.0.8 pkgsrc-2008Q1:1.10.0.6 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.4 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.2 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.9.0.16 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.14 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.12 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.10 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.8 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.6 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.4 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.9.0.2 pkgsrc-2005Q3-base:1.9 pkgsrc-2005Q2:1.8.0.22 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.20 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.18 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.16 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.14 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.12 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.10 pkgsrc-2003Q4-base:1.8 netbsd-1-6-1:1.8.0.6 netbsd-1-6-1-base:1.8 netbsd-1-6:1.8.0.8 netbsd-1-6-RELEASE-base:1.8 pkgviews:1.8.0.4 pkgviews-base:1.8 buildlink2:1.8.0.2 buildlink2-base:1.8 netbsd-1-5-PATCH003:1.8 netbsd-1-5-PATCH001:1.8 netbsd-1-5-RELEASE:1.7 netbsd-1-4-PATCH003:1.7 netbsd-1-4-PATCH002:1.7 comdex-fall-1999:1.7 netbsd-1-4-PATCH001:1.7 netbsd-1-4-RELEASE:1.7 netbsd-1-3-PATCH003:1.5 netbsd-1-3-PATCH002:1.2 FreeBSD-current-1997-11-18:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.13 date 2019.02.21.14.32.32; author tsutsui; state dead; branches; next 1.12; commitid zuTRmWD9QzGvUDcB; 1.12 date 2019.02.21.01.37.14; author tsutsui; state Exp; branches; next 1.11; commitid eGhciKWw5u6NCzcB; 1.11 date 2009.05.03.22.58.31; author abs; state Exp; branches; next 1.10; 1.10 date 2007.07.08.10.50.26; author wiz; state Exp; branches; next 1.9; 1.9 date 2005.08.10.16.50.18; author he; state Exp; branches; next 1.8; 1.8 date 2001.04.05.13.57.15; author wiz; state Exp; branches 1.8.22.1; next 1.7; 1.7 date 99.04.23.22.16.07; author tron; state Exp; branches; next 1.6; 1.6 date 98.10.28.02.21.24; author garbled; state Exp; branches; next 1.5; 1.5 date 98.09.12.17.48.56; author garbled; state Exp; branches; next 1.4; 1.4 date 98.08.07.10.40.56; author agc; state Exp; branches; next 1.3; 1.3 date 98.06.08.01.22.01; author enami; state Exp; branches; next 1.2; 1.2 date 97.11.20.13.12.39; author agc; state Exp; branches; next 1.1; 1.1 date 97.11.20.13.07.26; author agc; state Exp; branches 1.1.1.1; next ; 1.8.22.1 date 2005.08.19.11.37.05; author salo; state Exp; branches; next ; 1.1.1.1 date 97.11.20.13.07.26; author agc; state Exp; branches; next ; desc @@ 1.13 log @xv: rename patches for maintainability, and also fix pkglint warnings. @ text @$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 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 * on your machine, *COMMENT OUT* the following line */ -#define HaveJpeg +/* #define HaveJpeg */ +#define UseInstalledJpeg /* if, for whatever reason, you're unable to get the TIFF library to compile * on your machine, *COMMENT OUT* the following line */ -#define HaveTiff +/* #define HaveTiff */ +#define UseInstalledTiff /* if, for whatever reason, you're unable to get the PDS/VICAR support @@@@ -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 +130,66 @@@@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\" JPEG = -DDOJPEG JPEGDIR = jpeg LIBJPEG = $(JPEGDIR)/libjpeg.a +DEPLIBJPEG = $(LIBJPEG) JPEGINCLUDE = -I$(JPEGDIR) #endif +#ifdef UseInstalledJpeg +JPEG = -DDOJPEG +LIBJPEG = $(LDFLAGS) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -ljpeg +JPEGINCLUDE = -I$(PREFIX)/include +#endif + #ifdef HaveTiff TIFF = -DDOTIFF TIFFDIR = tiff LIBTIFF = $(TIFFDIR)/libtiff.a +DEPLIBTIFF = $(LIBTIFF) TIFFINCLUDE = -I$(TIFFDIR) #endif +#ifdef UseInstalledTiff +TIFF = -DDOTIFF +LIBTIFF = -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -ltiff -ljpeg -lz +TIFFINCLUDE = -I$(PREFIX)/include +#endif + #ifdef HavePDS PDS = -DDOPDS #endif +#ifdef UseInstalledGhostScript +GS = -DDOGS +#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 = ${PREFIX} +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 = $(PREFIX) +ZLIBINC = -I$(ZLIBDIR)/include +ZLIBLIB = -L$(ZLIBDIR)/lib -lz +LIBZLIB = ${ZLIB} +ZLIBINCLUDE = ${ZLIBINC} +#endif #if defined(SCOArchitecture) SCO= -Dsco -DPOSIX -DNO_RANDOM @@@@ -149,14 +201,14 @@@@ SYS_LIBRARIES= -lm #endif -DEPLIBS = $(LIBJPEG) $(LIBTIFF) -LOCAL_LIBRARIES = $(XLIB) $(DEPLIBS) +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) $(GS) $(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 \ @ 1.12 log @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. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.11 2009/05/03 22:58:31 abs Exp $ @ 1.11 log @Add PKG_DESTDIR_SUPPORT. Use PREFIX rather than LOCALBASE. @ text @d1 4 a4 1 $NetBSD: patch-ad,v 1.10 2007/07/08 10:50:26 wiz Exp $ d7 1 a7 1 --- Imakefile.orig d27 1 a27 1 @@@@ -21,6 +23,9 @@@@ d31 1 d38 1 a38 1 @@@@ -124,20 +129,62 @@@@ d70 4 d105 1 a105 1 @@@@ -149,14 +196,14 @@@@ d116 1 a116 1 + $(HPUX7) $(JPEG) $(TIFF) $(PNG) $(PDS) $(DXWM) $(RAND) \ @ 1.10 log @Update to xv-3.10a-jumbo-patches-20070520. Merge patch-ad and patch-ah. Use SUBST framework. Add some tools (per pkglint). Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d44 2 a45 2 +LIBJPEG = $(LDFLAGS) -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -ljpeg +JPEGINCLUDE = -I$(LOCALBASE)/include d58 2 a59 2 +LIBTIFF = -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -ltiff -ljpeg -lz +TIFFINCLUDE = -I$(LOCALBASE)/include d74 1 a74 1 +PNGDIR = ${LOCALBASE} d88 1 a88 1 +ZLIBDIR = $(LOCALBASE) @ 1.9 log @Instead of separately integrating several different patches, instead pull in the Jumbo patches from http://www.sonic.net/~roelofs/greg_xv.html. As far as I can see this covers all our existing patches for added functionality, although I cannot claim that I have tested each and every one of them in the new version. These patches disable a number of image formats that I think are less common, which have potential heap overflows in the code due to in- sufficient validation of image dimensions. The version of the Jumbo patch used here is the 20050501 version. Package revision bumped to nb10. @ text @d3 2 a4 1 --- Imakefile.orig 2005-07-29 15:14:59.000000000 +0200 d24 11 a34 1 @@@@ -124,16 +126,30 @@@@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\" d58 1 a58 1 +LIBTIFF = -L$(LOCALBASE)/lib -ltiff -ljpeg -lz d65 33 a97 1 @@@@ -149,8 +165,8 @@@@ SYS_LIBRARIES= -lm d103 2 a104 2 +DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF) +LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF) d107 3 a109 13 $(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 "" d111 2 d114 2 a115 1 #if defined(HaveJpeg) || defined(HaveTiff) @ 1.8 log @Standardize patch file names. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.7 1999/04/23 22:16:07 tron Exp $ d3 2 a4 2 --- Imakefile.orig Tue Oct 27 00:45:53 1998 +++ Imakefile Tue Oct 27 01:13:26 1998 d23 1 a23 1 @@@@ -119,16 +121,30 @@@@ d54 1 a54 1 @@@@ -141,8 +157,8 @@@@ d65 1 a65 1 @@@@ -182,10 +198,10 @@@@ @ 1.8.22.1 log @Pullup ticket 689 - requested by Havard Eidnes security fixes for xv Revisions pulled up: - pkgsrc/graphics/xv/Makefile 1.59 - pkgsrc/graphics/xv/PLIST 1.3 - pkgsrc/graphics/xv/distinfo 1.11 - pkgsrc/graphics/xv/patches/patch-aa removed - pkgsrc/graphics/xv/patches/patch-ab removed - pkgsrc/graphics/xv/patches/patch-ac 1.8 - pkgsrc/graphics/xv/patches/patch-ad 1.9 - pkgsrc/graphics/xv/patches/patch-ae removed - pkgsrc/graphics/xv/patches/patch-af 1.5 - pkgsrc/graphics/xv/patches/patch-ag removed - pkgsrc/graphics/xv/patches/patch-ah 1.2 - pkgsrc/graphics/xv/patches/patch-ai 1.2 - pkgsrc/graphics/xv/patches/patch-aj 1.2 - pkgsrc/graphics/xv/patches/patch-ak removed - pkgsrc/graphics/xv/patches/patch-al removed - pkgsrc/graphics/xv/patches/patch-am removed - pkgsrc/graphics/xv/patches/patch-an removed - pkgsrc/graphics/xv/patches/patch-ao removed - pkgsrc/graphics/xv/patches/patch-ap removed - pkgsrc/graphics/xv/patches/patch-aq removed - pkgsrc/graphics/xv/patches/patch-ar removed - pkgsrc/graphics/xv/patches/patch-as removed - pkgsrc/graphics/xv/patches/patch-at removed - pkgsrc/graphics/xv/patches/patch-au removed - pkgsrc/graphics/xv/patches/patch-av removed - pkgsrc/graphics/xv/patches/patch-aw removed - pkgsrc/graphics/xv/patches/patch-ax removed - pkgsrc/graphics/xv/patches/patch-ay removed Module Name: pkgsrc Committed By: he Date: Wed Aug 10 16:50:18 UTC 2005 Modified Files: pkgsrc/graphics/xv: Makefile PLIST distinfo pkgsrc/graphics/xv/patches: patch-ac patch-ad patch-af patch-ah patch-ai patch-aj Removed Files: pkgsrc/graphics/xv/patches: patch-aa patch-ab patch-ae patch-ag patch-ak patch-al patch-am patch-an patch-ao patch-ap patch-aq patch-ar patch-as patch-at patch-au patch-av patch-aw patch-ax patch-ay Log Message: Instead of separately integrating several different patches, instead pull in the Jumbo patches from http://www.sonic.net/~roelofs/greg_xv.html. As far as I can see this covers all our existing patches for added functionality, although I cannot claim that I have tested each and every one of them in the new version. These patches disable a number of image formats that I think are less common, which have potential heap overflows in the code due to in- sufficient validation of image dimensions. The version of the Jumbo patch used here is the 20050501 version. Package revision bumped to nb10. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.9 2005/08/10 16:50:18 he Exp $ d3 2 a4 2 --- Imakefile.orig 2005-07-29 15:14:59.000000000 +0200 +++ Imakefile d23 1 a23 1 @@@@ -124,16 +126,30 @@@@ MGCSFX = -DMGCSFXDIR=\"$(MGCSFXDIR)\" d54 1 a54 1 @@@@ -149,8 +165,8 @@@@ SYS_LIBRARIES= -lm d65 1 a65 1 @@@@ -194,10 +210,10 @@@@ OBJS5= xvpictoppm.o @ 1.7 log @Fix run time library search path. @ text @d1 2 a2 1 $NetBSD: patch-ad,v 1.6 1998/10/28 02:21:24 garbled Exp $ @ 1.6 log @Fix a missing rpath entry by making this pkg obey LDFLAGS. This fixes my own PR #5840 @ text @d1 1 a1 1 $NetBSD$ d32 1 a32 1 +LIBJPEG = $(LDFLAGS) -L$(LOCALBASE)/lib -ljpeg @ 1.5 log @libtiff needs jpeg and libz to compile binaries. @ text @d2 2 a3 2 --- Imakefile.orig Wed Sep 9 09:33:20 1998 +++ Imakefile Sat Sep 12 10:09:26 1998 d32 1 a32 1 +LIBJPEG = -L$(LOCALBASE)/lib -ljpeg @ 1.4 log @Add NetBSD RCS Ids. @ text @d2 2 a3 3 --- ./Imakefile.org Fri Jan 13 12:24:01 1995 +++ ./Imakefile Wed Jul 5 03:32:57 1995 d46 1 a46 1 +LIBTIFF = -L$(LOCALBASE)/lib -ltiff d53 1 a53 1 @@@@ -142,8 +158,8 @@@@ @ 1.3 log @Substitute /usr/local with $(LOCALBASE) since jpeg and tiff libraries are installed there. @ text @d1 2 @ 1.2 log @Remove annoying "Did you remember to 'make depend' first?" message - the packaging tools will make depend automatically. @ text @d31 2 a32 2 +LIBJPEG = -L/usr/local/lib -ljpeg +JPEGINCLUDE = -I/usr/local/include d45 2 a46 2 +LIBTIFF = -L/usr/local/lib -ltiff +TIFFINCLUDE = -I/usr/local/include @ 1.1 log @Initial revision @ text @d63 15 @ 1.1.1.1 log @Initial import of xv-3.10a from FreeBSD ports collection into NetBSD packages collection. @ text @@