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.29; 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.16; 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-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 ### @ 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-Makefile.std,v 1.1 1999/06/13 16:23:54 hubertf Exp $ d3 3 a5 10 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 --------------------------------------------------------------------------- --- Makefile.std.patched Sun Jun 13 03:16:57 1999 +++ Makefile.std Sun Jun 13 03:21:41 1999 @@@@ -56,6 +56,25 @@@@ d8 8 d17 2 a18 4 +### if, for whatever reason, you're unable to get the PNG library to compile +### on your machine, *COMMENT OUT* the following lines +### +PNG = -DDOPNG d20 2 a21 16 +PNGINC = -I$(PNGDIR)/include +PNGLIB = -L$(PNGDIR)/lib -lpng + + +### +### if, for whatever reason, you're unable to get the PNG library to compile +### on your machine, *COMMENT OUT* the following lines +### +ZLIBDIR = /usr +ZLIBINC = -I$(ZLIBDIR)/include +ZLIBLIB = -L$(ZLIBDIR)/lib -lz + + +### ### if, for whatever reason, you're unable to get the TIFF library to compile ### on your machine, *COMMENT OUT* the following lines a22 31 @@@@ -188,9 +207,9 @@@@ CFLAGS = $(CCOPTS) $(JPEG) $(JPEGINC) $(TIFF) $(TIFFINC) $(PDS) \ $(NODIRENT) $(VPRINTF) $(TIMERS) $(UNIX) $(BSDTYPES) $(RAND) \ - $(DXWM) $(MCHN) + $(DXWM) $(MCHN) $(PNG) $(PNGINC) $(ZLIBINC) -LIBS = -lX11 $(JPEGLIB) $(TIFFLIB) -lm +LIBS = -lX11 $(JPEGLIB) $(TIFFLIB) $(PNGLIB) $(ZLIBLIB) -lm OBJS = 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 \ @@@@ -198,7 +217,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 xcpcd.o + xvxwd.o xvfits.o xvmag.o xvmaki.o xvpic.o xvpi.o xvpic2.o xcpcd.o \ + xvpng.o MISC = README INSTALL CHANGELOG IDEAS @@@@ -269,7 +289,7 @@@@ xvbrowse.o: bits/br_pcx bits/br_jfif bits/br_tiff bits/br_pds xvbrowse.o: bits/br_ps bits/br_iff bits/br_targa bits/br_xpm xvbrowse.o: bits/br_trash bits/fcurs bits/fccurs bits/fdcurs bits/fcursm -xvbrowse.o: bits/br_xwd +xvbrowse.o: bits/br_xwd bits/br_png xvbutt.o: bits/cboard50 bits/rb_frame bits/rb_frame1 bits/rb_top xvbutt.o: bits/rb_bot bits/rb_dtop bits/rb_dbot bits/rb_body @ 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-aj,v 1.2 2005/08/10 16:50:18 he Exp $ d3 10 a12 3 --- Makefile.std.orig 2005-07-29 15:33:26.000000000 +0200 +++ Makefile.std @@@@ -41,7 +41,7 @@@@ CLEANDIR = cleandir a14 8 ### 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 d16 4 a19 2 PNG = -DDOPNG -PNGDIR = /usr d21 16 a36 2 #PNGDIR = /usr/local #PNGDIR = ../../libpng d38 31 @