From owner-freebsd-ports  Sun Mar 10  6:20:10 2002
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 338F137B41A
	for <freebsd-ports@hub.freebsd.org>; Sun, 10 Mar 2002 06:20:01 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g2AEK1r72676;
	Sun, 10 Mar 2002 06:20:01 -0800 (PST)
	(envelope-from gnats)
Received: from phobos.raisdorf.net (phobos.raisdorf.net [195.244.235.251])
	by hub.freebsd.org (Postfix) with ESMTP id 31B2137B416
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Mar 2002 06:12:51 -0800 (PST)
Received: (from olivleh1@localhost)
	by phobos.raisdorf.net (8.11.6/8.11.6) id g2AE1KP10838;
	Sun, 10 Mar 2002 15:01:21 +0100 (CET)
Message-Id: <200203101401.g2AE1KP10838@phobos.raisdorf.net>
Date: Sun, 10 Mar 2002 15:01:21 +0100 (CET)
From: Oliver Lehmann <lehmann@ans-netz.de>
Reply-To: Oliver Lehmann <lehmann@ans-netz.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <lehmann@ans-netz.de>
X-Send-Pr-Version: 3.113
Subject: ports/35736: update-port: graphics/xawtv
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         35736
>Category:       ports
>Synopsis:       update-port: graphics/xawtv
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 10 06:20:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Lehmann
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD sina.sesamestreet.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Sun Feb 10 22:28:35 CET 2002 olivleh1@bert.sesamestreet.net:/usr/obj/i386/usr/src/sys/SINA i386


>Description:
	- fix 5-CURRENT build (add a dependency to XFree86-4-clients)
	- fix a compile warning

>How-To-Repeat:
>Fix:


diff -ruN xawtv.old/Makefile /usr/ports/graphics/xawtv/Makefile
--- xawtv.old/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>
diff -ruN xawtv.old/files/patch-libvbi::os.h /usr/ports/graphics/xawtv/files/patch-libvbi::os.h
--- xawtv.old/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__) \

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message