fixes

1 files changed, 14 insertions, 35 deletions

diff --git a/media-gfx/xv/files/xv.diff b/media-gfx/xv/files/xv.diff
index 50f4a18a2044..166170469768 100644
--- a/media-gfx/xv/files/xv.diff
+++ b/media-gfx/xv/files/xv.diff
@@ -1,7 +1,7 @@
 Common subdirectories: xv-3.10a.clean/.xvpics and xv-3.10a/.xvpics
 diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
---- xv-3.10a.clean/Makefile	Sat Jul 21 12:03:42 2001
-+++ xv-3.10a/Makefile	Sat Jul 21 12:10:48 2001
+--- xv-3.10a.clean/Makefile	Sat Jul 21 12:42:17 2001
++++ xv-3.10a/Makefile	Sat Jul 21 12:43:52 2001
 @@ -1,8 +1,8 @@
  # Makefile for xv
  
@@ -22,7 +22,7 @@ diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
  
  
  ### NOTE: Sun running OpenWindows:
-@@ -28,10 +28,10 @@
+@@ -28,10 +28,11 @@
  
  
  ### Installation locations
@@ -33,32 +33,11 @@ diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
  MANSUF = 1
 -LIBDIR = /usr/local/lib
 +LIBDIR = /usr/lib
++DOCDIR = /usr/share/doc/xv-3.10a
  
  
  buildit: all
-@@ -45,26 +45,26 @@
- ### 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
-+#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
- 
- 
- ###
+@@ -59,12 +60,12 @@
  ### if, for whatever reason, you're unable to get the TIFF library to compile
  ### on your machine, *COMMENT OUT* the following lines
  ###
@@ -77,7 +56,7 @@ diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
  
  
  ###
-@@ -102,7 +102,7 @@
+@@ -102,7 +103,7 @@
  
  
  ### for LINUX, uncomment the following line
@@ -86,7 +65,7 @@ diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
  
  
  # For SCO 1.1 (UNIX 3.2v2) machines, uncomment the following:
-@@ -144,7 +144,7 @@
+@@ -144,7 +145,7 @@
  
  # if your machine has the usleep() function, uncomment the following line:
  # if it doesn't, or you're not sure, leave this line alone.
@@ -95,7 +74,7 @@ diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
  
  
  # if XV locks up whenever you click on *any* of the buttons, the Timer() 
-@@ -163,7 +163,7 @@
+@@ -163,7 +164,7 @@
  # if, during compilation, your system complains about the types 
  # 'u_long', 'u_short', 'u_int', etc. as being undefined, uncomment the
  # following line:
@@ -104,7 +83,7 @@ diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
  
  
  # if your machine doesn't have 'vprintf()' or 'vsprintf()'
-@@ -188,7 +188,7 @@
+@@ -188,7 +189,7 @@
  	$(NODIRENT) $(VPRINTF) $(TIMERS) $(UNIX) $(BSDTYPES) $(RAND) \
  	$(DXWM) $(MCHN)
  
@@ -113,7 +92,7 @@ diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
  
  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 \
-@@ -237,13 +237,14 @@
+@@ -237,13 +238,14 @@
  
  
  install: all
@@ -124,21 +103,21 @@ diff -Nu xv-3.10a.clean/Makefile xv-3.10a/Makefile
 -	cp docs/xvp2p.man  $(MANDIR)/xvpictoppm.$(MANSUF)
 -	cp docs/vdcomp.man $(MANDIR)/vdcomp.$(MANSUF)
 -	cp docs/xvdocs.ps* $(LIBDIR)
-+	mkdir -p ${DESTDIR}/{${BINDIR},$(MANDIR),$(LIBDIR)}
++	mkdir -p ${DESTDIR}/{${BINDIR},$(MANDIR),$(LIBDIR),${DOCDIR}}
 +	cp xv bggen vdcomp xcmap xvpictoppm ${DESTDIR}/$(BINDIR)
 +	cp docs/xv.man     ${DESTDIR}/$(MANDIR)/xv.$(MANSUF)
 +	cp docs/bggen.man  ${DESTDIR}/$(MANDIR)/bggen.$(MANSUF)
 +	cp docs/xcmap.man  ${DESTDIR}/$(MANDIR)/xcmap.$(MANSUF)
 +	cp docs/xvp2p.man  ${DESTDIR}/$(MANDIR)/xvpictoppm.$(MANSUF)
 +	cp docs/vdcomp.man ${DESTDIR}/$(MANDIR)/vdcomp.$(MANSUF)
-+	cp docs/xvdocs.ps* ${DESTDIR}/$(LIBDIR)
++	cp docs/xvdocs.ps* ${DESTDIR}/$(DOCDIR)
  
  tar:
  	tar cvf xv.tar Makefile* Imakefile *.c *.h bits \
 Common subdirectories: xv-3.10a.clean/bits and xv-3.10a/bits
 diff -Nu xv-3.10a.clean/config.h xv-3.10a/config.h
---- xv-3.10a.clean/config.h	Sat Jul 21 12:03:42 2001
-+++ xv-3.10a/config.h	Sat Jul 21 12:11:00 2001
+--- xv-3.10a.clean/config.h	Sat Jul 21 12:42:17 2001
++++ xv-3.10a/config.h	Sat Jul 21 12:41:37 2001
 @@ -19,7 +19,7 @@
  #  ifdef VMS
  #    define GUNZIP "UNCOMPRESS"