summaryrefslogtreecommitdiffstats
path: root/multimedia/xawtv
diff options
context:
space:
mode:
authorpat <pat@FreeBSD.org>2002-03-10 16:03:59 +0000
committerpat <pat@FreeBSD.org>2002-03-10 16:03:59 +0000
commit21b9366328e2b36062d11de138afd9e17cec9c8f (patch)
tree4d871a59d64871258e261b7bd57b2ea8d85d7cc2 /multimedia/xawtv
parent4b02fe008fd923dd9100b407838c17182943fd0e (diff)
downloadFreeBSD-ports-21b9366328e2b36062d11de138afd9e17cec9c8f.zip
FreeBSD-ports-21b9366328e2b36062d11de138afd9e17cec9c8f.tar.gz
- fix 5-CURRENT build (add a dependency to XFree86-4-clients)
- fix a compile warning PR: 35736 Submitted by: maintainer
Diffstat (limited to 'multimedia/xawtv')
-rw-r--r--multimedia/xawtv/Makefile9
-rw-r--r--multimedia/xawtv/files/patch-libvbi::os.h8
2 files changed, 16 insertions, 1 deletions
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 2e33718..5d6ed96 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -36,6 +36,13 @@ MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \
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 @@ post-configure:
${PERL} -pi -e "s|^CFLAGS=|CFLAGS+=|g" ${WRKSRC}/$i/Makefile
.endfor
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/xawtv/files/patch-libvbi::os.h b/multimedia/xawtv/files/patch-libvbi::os.h
new file mode 100644
index 0000000..dd8788a0
--- /dev/null
+++ b/multimedia/xawtv/files/patch-libvbi::os.h
@@ -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__) \
OpenPOWER on IntegriCloud