--- /usr/ports/graphics/xawtv/Makefile	Sun Mar 10 12:58:34 2002
+++ /usr/ports/graphics/xawtv/Makefile	Sun Mar 10 13:08:50 2002
@@ -36,6 +36,13 @@ 
 MAN5=		xawtvrc.5
 MAN8=		v4l-conf.8
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 4
+BUILD_DEPENDS=  bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=    mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+.endif
+
 PLIST_SUB+=	X11PREFIX=${X11BASE}
 
 post-patch:
@@ -51,4 +58,4 @@ 
 	${PERL} -pi -e "s|^CFLAGS=|CFLAGS+=|g" ${WRKSRC}/$i/Makefile
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- /usr/ports/graphics/xawtv/files/patch-libvbi::os.h	Thu Jan  1 01:00:00 1970
+++ /usr/ports/graphics/xawtv/files/patch-libvbi::os.h	Sun Mar 10 13:21:34 2002
@@ -0,0 +1,8 @@ 
+--- libvbi/os.h.orig	Sun Mar 10 13:20:37 2002
++++ libvbi/os.h	Sun Mar 10 13:19:45 2002
+@@ -1,4 +1,4 @@
+-#ifndef OS_H
++#if !defined(OS_H) && !defined(BSD)
+ #define OS_H
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBsd__) \