head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.24 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.22 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.20 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.18 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.16 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.14 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.6 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.16 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.14 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.12 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.10 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.8 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.6 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.4 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.2 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.3 date 2007.07.08.10.50.27; author wiz; state dead; branches; next 1.2; 1.2 date 2005.08.10.16.50.18; author he; state Exp; branches; next 1.1; 1.1 date 2001.04.05.13.57.15; author wiz; state Exp; branches 1.1.22.1; next ; 1.1.22.1 date 2005.08.19.11.37.05; author salo; state Exp; branches; next ; desc @@ 1.3 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 @$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 \ @ 1.2 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 @d1 1 a1 1 $NetBSD$ @ 1.1 log @Standardize patch file names. @ text @d1 1 a1 1 $NetBSD: patch-png2-Imakefile,v 1.2 2000/01/04 16:55:34 bouyer Exp $ d3 2 a4 9 This patch is based on http://www.mit.edu/afs/athena/contrib/graphics/src/xv/patches/png/xvpng.diff It was edited to fit into the NetBSD Packages Collection! - HF --------------------------------------------------------------------------- --- Imakefile.orig Sun Jun 13 04:15:05 1999 +++ Imakefile Sun Jun 13 04:31:20 1999 d15 1 a15 1 @@@@ -149,6 +152,35 @@@@ d47 1 a47 1 + d50 1 a50 2 SYS_LIBRARIES= -lm -lc -lx @@@@ -157,14 +189,14 @@@@ d62 1 a62 1 $(BACKING_STORE) $(BSDTYPES) $(SGI) a68 20 @@@@ -172,7 +204,8 @@@@ xvdial.c xvgraf.c xvsunras.c xvjpeg.c xvps.c xvpopup.c xvdflt.c \ xvtiff.c xvtiffwr.c xvpds.c xvrle.c xviris.c xvgrab.c vprintf.c \ xvbrowse.c xvtext.c xvpcx.c xviff.c xvtarga.c xvxpm.c xvcut.c \ - xvxwd.c xvfits.c xvmag.c xvmaki.c xvpic.c xvpi.c xvpic2.c xvpcd.c + xvxwd.c xvfits.c xvmag.c xvmaki.c xvpic.c xvpi.c xvpic2.c xvpcd.c \ + xvpng.c OBJS1 = xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \ xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \ @@@@ -180,7 +213,8 @@@@ xvdial.o xvgraf.o xvsunras.o xvjpeg.o xvps.o xvpopup.o xvdflt.o \ xvtiff.o xvtiffwr.o xvpds.o xvrle.o xviris.o xvgrab.o vprintf.o \ xvbrowse.o xvtext.o xvpcx.o xviff.o xvtarga.o xvxpm.o xvcut.o \ - xvxwd.o xvfits.o xvmag.o xvmaki.o xvpic.o xvpi.o xvpic2.o xvpcd.o + xvxwd.o xvfits.o xvmag.o xvmaki.o xvpic.o xvpi.o xvpic2.o xvpcd.o \ + xvpng.o SRCS2= bggen.c OBJS2= bggen.o @ 1.1.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-ah,v 1.2 2005/08/10 16:50:18 he Exp $ d3 9 a11 2 --- Imakefile.orig 2005-07-29 15:28:09.000000000 +0200 +++ Imakefile d22 1 a22 1 @@@@ -154,6 +157,34 @@@@ TIFFINCLUDE = -I$(LOCALBASE)/include d54 1 a54 1 d57 2 a58 1 @@@@ -165,14 +196,14 @@@@ SYS_LIBRARIES= -lm d70 1 a70 1 $(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX) d77 20 @