diff -Nurd -x'*~' xv-3.10a.20070520/Makefile xv-3.10a.fink/Makefile
--- xv-3.10a.20070520/Makefile	2007-06-01 12:28:16.000000000 -0400
+++ xv-3.10a.fink/Makefile	2007-06-01 12:29:06.000000000 -0400
@@ -1,7 +1,7 @@
 # Makefile for xv
 
 # your C compiler (and options) of choice
-CC = cc
+CC = gcc
 #CC = gcc -ansi
 # note that -ansi kills __USE_MISC (gcc 2.95.3), which, at least on Linux,
 # determines whether stdlib.h includes prototypes for mktemp(), random(), etc.
@@ -18,7 +18,7 @@
 #       -Wuninitialized -Wparentheses
 
 
-CCOPTS = -O
+CCOPTS = -Os -Wall -pipe -I/usr/X11R6/include
 #
 # these are the usual optimization and warning options for gcc; all such
 # warnings but one (mktemp() use) have been eliminated (at least on Linux):
@@ -62,7 +62,7 @@
 MANSUF = 1
 DOCDIR = $(PREFIX)/share/doc/xv
 LIBDIR = $(PREFIX)/lib/xv
-SYSCONFDIR = /etc
+SYSCONFDIR = $(PREFIX)/etc
 DESTDIR =
 
 
@@ -182,10 +182,10 @@
 JP2KDIR = /usr/local/lib
 ###
 #JP2KINC = -I$(JP2KDIR)
-JP2KINC = -I/usr/local/include
+JP2KINC = -I$(JP2KDIR)/include
 ###
 #JP2KLIB = -L$(JP2KDIR) -ljasper
-JP2KLIB = $(JP2KDIR)/libjasper.a
+JP2KLIB = -L$(JP2KDIR)/lib -ljasper
 
 
 ###
diff -Nurd -x'*~' xv-3.10a.20070520/vdcomp.c xv-3.10a.fink/vdcomp.c
--- xv-3.10a.20070520/vdcomp.c	2007-06-01 12:28:16.000000000 -0400
+++ xv-3.10a.fink/vdcomp.c	2007-06-01 12:29:20.000000000 -0400
@@ -119,7 +119,7 @@
       !defined(__FreeBSD__)               && \
       !defined(__OpenBSD__)               && \
       !defined(__NetBSD__)                && \
-      !defined(__DARWIN__)
+      !defined(__APPLE__)
 
 #    if defined(hp300) || defined(hp800) || defined(NeXT)
 #      include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
diff -Nurd -x'*~' xv-3.10a.20070520/xv.h xv-3.10a.fink/xv.h
--- xv-3.10a.20070520/xv.h	2007-06-01 12:28:16.000000000 -0400
+++ xv-3.10a.fink/xv.h	2007-06-01 12:29:06.000000000 -0400
@@ -158,7 +158,7 @@
 
 #ifndef VMS
 #  include <errno.h>
-#  ifndef __NetBSD__
+#  if !(defined __NetBSD__ || defined __APPLE__)
 #    if !(defined __GLIBC__ && __GLIBC__ >= 2)
        extern int   errno;         /* SHOULD be in errno.h, but often isn't */
        extern char *sys_errlist[]; /* this too... */