This patch  modifies  the  "xv" 3.10a  "Makefile"  so that system lib-
raries are  used  instead  of the  obsolete  libraries  provided  with
"xv".

--- xv-3.10a.orig/Makefile
+++ xv-3.10a/Makefile	2005-05-30 00:36:09.000000000 -0700
@@ -41,50 +41,20 @@
 ### NOTE: be sure to check 'config.h', for a few other configuration options 
 ##############################################################################
 
-###
-### if, for whatever reason, you're unable to get the JPEG library to compile
-### on your machine, *COMMENT OUT* the following lines
-###
 JPEG    = -DDOJPEG
-JPEGDIR = jpeg
-JPEGINC = -I$(JPEGDIR)
-JPEGLIB = $(JPEGDIR)/libjpeg.a
-$(JPEGDIR)/jconfig.h:
-	cd $(JPEGDIR) ; ./configure CC='$(CC)'
-$(JPEGLIB):  $(JPEGDIR)/jconfig.h
-	cd $(JPEGDIR) ; make
+JPEGINC =
+JPEGLIB = -ljpeg
 
+PNG     = -DDOPNG
+PNGINC  =
+PNGLIB  = -lpng
 
-###
-### if, for whatever reason, you're unable to get the PNG library to compile
-### on your machine, *COMMENT OUT* the following lines
-###
-PNG    = -DDOPNG
-PNGDIR = /usr/local/src/libpng
-PNGINC = -I$(PNGDIR)
-PNGLIB = -L$(PNGDIR) -lpng
+ZLIBINC =
+ZLIBLIB = -lz
 
-
-###
-### if, for whatever reason, you're unable to get the PNG library to compile
-### on your machine, *COMMENT OUT* the following lines
-###
-ZLIBDIR = /usr/local/src/zlib
-ZLIBINC = -I$(ZLIBDIR)
-ZLIBLIB = -L$(ZLIBDIR) -lz
-
-
-###
-### if, for whatever reason, you're unable to get the TIFF library to compile
-### on your machine, *COMMENT OUT* the following lines
-###
 TIFF    = -DDOTIFF
-TIFFDIR = tiff
-TIFFINC = -I$(TIFFDIR)
-TIFFLIB = $(TIFFDIR)/libtiff.a
-$(TIFFLIB):
-	( cd $(TIFFDIR) ; make CC='$(CC)' )
-
+TIFFINC =
+TIFFLIB = -ltiff
 
 ###
 ### if, for whatever reason, you're unable to get the PDS/VICAR support
@@ -207,7 +177,8 @@
 	$(NODIRENT) $(VPRINTF) $(TIMERS) $(UNIX) $(BSDTYPES) $(RAND) \
 	$(DXWM) $(MCHN) $(PNG) $(PNGINC) $(ZLIBINC)
 
-LIBS = -lX11 $(JPEGLIB) $(TIFFLIB) $(PNGLIB) $(ZLIBLIB) -lm
+LIBS = -L/usr/X11R6/lib -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 \
@@ -225,10 +196,10 @@
 
 
 
-all: $(JPEGLIB) $(TIFFLIB) xv bggen vdcomp xcmap xvpictoppm
+all: xv bggen vdcomp xcmap xvpictoppm
 
 
-xv: $(OBJS) $(JPEGLIB) $(TIFFLIB)
+xv: $(OBJS)
 	$(CC) -o xv $(CFLAGS) $(OBJS) $(LIBS)
 
 bggen: bggen.c
@@ -250,10 +221,6 @@
 
 clean:  xvclean
 	rm -f bggen vdcomp xcmap xvpictoppm
-	./cleandir $(JPEGDIR)
-	rm -f $(JPEGDIR)/jconfig.h $(JPEGDIR)/Makefile
-	./cleandir $(TIFFDIR)
-
 
 install: all
 	cp xv bggen vdcomp xcmap xvpictoppm $(BINDIR)
@@ -266,7 +233,7 @@
 
 tar:
 	tar cvf xv.tar Makefile* Imakefile *.c *.h bits \
-		docs unsupt vms $(JPEGDIR) $(TIFFDIR) $(MISC) 
+		docs unsupt vms $(MISC) 
 
 xvtar:
 	tar cvf xv.tar Makefile* Imakefile *.c *.h bits