diff -Naur xv.patched/Makefile xv.fink/Makefile
--- xv.patched/Makefile	Sun Feb 29 11:25:09 2004
+++ xv.fink/Makefile	Sun Dec 19 19:37:00 2005
@@ -14,7 +14,7 @@
 #       -Wuninitialized -Wparentheses
 
 
-CCOPTS = -O2 -m486 -D_BSD_SOURCE
+CCOPTS = -O2 -pipe -fomit-frame-pointer -IFINKINSTALLPREFIX/include -I/usr/X11R6/include
 
 
 ### NOTE: Sun running OpenWindows:
@@ -27,11 +27,11 @@
 ### '-I' options on the CCOPTS line to tell the compiler where said files are.
 
 
-### Installation locations
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man/man1
+###Installation locations
+BINDIR = FINKINSTALLPREFIX/bin
+MANDIR = FINKINSTALLPREFIX/share/man/man1
 MANSUF = 1
-LIBDIR = /usr/local/lib
+LIBDIR = FINKINSTALLPREFIX/lib
 
 
 buildit: all
@@ -46,9 +46,9 @@
 ### on your machine, *COMMENT OUT* the following lines
 ###
 JPEG    = -DDOJPEG
-JPEGDIR = /usr/local/lib
-JPEGINC = -I/usr/local/include
-JPEGLIB = -L/usr/local/lib -ljpeg
+JPEGDIR = 
+JPEGINC = 
+JPEGLIB = -ljpeg
 
 
 ###
@@ -56,18 +56,18 @@
 ### on your machine, *COMMENT OUT* the following lines
 ###
 PNG    = -DDOPNG
-PNGDIR = /usr/local/lib
-PNGINC = -I/usr/local/include
-PNGLIB = -L/usr/local/lib -lpng
+PNGDIR = 
+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
 ###
-ZLIBDIR = /usr/local/lib
-ZLIBINC = -I/usr/local/include
-ZLIBLIB = -L/usr/local/lib -lz
+ZLIBDIR = 
+ZLIBINC = 
+ZLIBLIB = -lz
 
 
 ###
@@ -75,9 +75,9 @@
 ### on your machine, *COMMENT OUT* the following lines
 ###
 TIFF    = -DDOTIFF
-TIFFDIR = /usr/local/lib
-TIFFINC = -I/usr/local/include
-TIFFLIB = -L/usr/local/lib -ltiff
+TIFFDIR = 
+TIFFINC = 
+TIFFLIB = -ltiff
 
 
 ###
@@ -95,7 +95,7 @@
 # the way there.  SYSV means System V R3.
 # UNIX = -DSVR4
 # UNIX = -DSYSV
-     
+
 
 #----------Machine Specific Configurations----------
 
@@ -216,7 +216,7 @@
 	$(NODIRENT) $(VPRINTF) $(TIMERS) $(UNIX) $(BSDTYPES) $(RAND) \
 	$(DXWM) $(MCHN) $(TVL10N) $(MGCSFX) $(PNG) $(PNGINC) $(ZLIBINC)
 
-LIBS = -L/usr/X11R6/lib -lX11 $(JPEGLIB) $(TIFFLIB) $(PNGLIB) $(ZLIBLIB) -lm
+LIBS = -LFINKINSTALLPREFIX/lib -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 \
@@ -267,6 +267,9 @@
 
 
 install: all
+	mkdir -p $(BINDIR)
+	mkdir -p $(MANDIR)
+	mkdir -p $(LIBDIR)
 	cp xv bggen vdcomp xcmap xvpictoppm $(BINDIR)
 	cp docs/xv.man     $(MANDIR)/xv.$(MANSUF)
 	cp docs/bggen.man  $(MANDIR)/bggen.$(MANSUF)
diff -Naur xv.patched/config.h xv.fink/config.h
--- xv.patched/config.h	Sun Feb 29 11:25:09 2004
+++ xv.fink/config.h	Sun Feb 29 11:23:44 2004
@@ -22,10 +22,14 @@
 #    if defined(__FreeBSD__) || defined(__NetBSD__)
 #      define GUNZIP "/usr/bin/gunzip -q" 
 #    else
-#      if defined(__linux__)
-#        define GUNZIP "/bin/gunzip -q"
+#      if defined(__APPLE__)
+#        define GUNZIP "FINKINSTALLPREFIX/bin/gunzip -q"
 #      else
-#        define GUNZIP "/usr/local/bin/gunzip -q"
+#        if defined(__linux__)
+#          define GUNZIP "/bin/gunzip -q"
+#        else
+#          define GUNZIP "/usr/local/bin/gunzip -q"
+#        endif
 #      endif
 #    endif
 #  endif
@@ -83,7 +87,7 @@
 #define USE_BUNZIP2
 
 #ifdef USE_BUNZIP2
-#  define BUNZIP2 "/bin/bunzip2"
+#  define BUNZIP2 "FINKINSTALLPREFIX/bin/bunzip2"
 #endif
 
 /***************************************************************************
@@ -108,7 +112,7 @@
  * should not need to be changed
  */
 
-#define GS_PATH "/usr/local/bin/gs"
+#define GS_PATH "FINKINSTALLPREFIX/bin/gs"
 #define GS_LIB  "."               
 #define GS_DEV  "ppmraw"         
 
diff -Naur xv.patched/vdcomp.c xv.fink/vdcomp.c
--- xv.patched/vdcomp.c	Sun Feb 29 11:25:09 2004
+++ xv.fink/vdcomp.c	Sun Feb 29 11:23:44 2004
@@ -96,6 +96,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#define NeXT
+
 /* include a malloc.h, of some sort... */
 #ifndef VMS   /* VMS hates multi-line '#if's */
 # if !defined(ibm032)                    && \
@@ -112,6 +114,9 @@
      !defined(sequent)
 
 #  if defined(hp300) || defined(hp800) || defined(NeXT)
+#   if defined(__APPLE__)
+#     include <sys/types.h>               /* Because malloc uses u_short on Mac OS X */
+#   endif
 #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
 #  else
 #   if !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
diff -Naur xv.patched/xv.h xv.fink/xv.h
--- xv.patched/xv.h	Sun Feb 29 11:25:10 2004
+++ xv.fink/xv.h	Sun Feb 29 11:23:45 2004
@@ -11,6 +11,8 @@
 #define REVDATE   "Version 3.10a+FLmask+jp5.3.3+PNG patch 1.2d+misc  Rev: 12/29/94"
 #define VERSTR    "3.10a+FLmask+jp+png-1.2d+misc"
 
+#define __NetBSD__
+#define NeXT
 
 /*
  * uncomment the following, and modify for your site, but only if you've