head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1; locks; strict; comment @# @; 1.3 date 2001.04.05.13.57.18; author wiz; state dead; branches; next 1.2; 1.2 date 2000.01.04.16.55.34; author bouyer; state Exp; branches; next 1.1; 1.1 date 99.06.13.16.23.54; author hubertf; state Exp; branches; next ; desc @@ 1.3 log @Standardize patch file names. @ text @$NetBSD: patch-png2-Imakefile,v 1.2 2000/01/04 16:55:34 bouyer Exp $ 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 @@@@ -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 @@@@ -149,6 +152,35 @@@@ 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 SYS_LIBRARIES= -lm -lc -lx @@@@ -157,14 +189,14 @@@@ #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) -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 \ @@@@ -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.2 log @Make it compile on solaris. While I'm there merge patch-ag in patch-af; it's bad to patch the same file 2 times. @ text @d1 1 a1 1 $NetBSD: patch-png2-Imakefile,v 1.1 1999/06/13 16:23:54 hubertf Exp $ @ 1.1 log @Add patches from http://www.mit.edu/afs/athena/contrib/graphics/src/xv/patches/png to enable PNG support. Set PKGNAME to ${DISTNAME}pl1 to reflect this. @ text @d1 1 a1 1 $NetBSD$ d48 1 a48 1 +ZLIBDIR = /usr @