From 4847e047964dc2a1a7980928ea7186d342de4c91 Mon Sep 17 00:00:00 2001
From: oliver <oliver@FreeBSD.org>
Date: Fri, 1 Jan 2016 14:45:20 +0000
Subject: fix ZVBI and QUICKTIME builds

PR:		192308
---
 multimedia/xawtv/Makefile  | 12 ++++++++----
 multimedia/xawtv/pkg-plist |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 2190de0a3ca7..3dd611b9bc60 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -19,7 +19,7 @@ OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT=	AALIB
 ZVBI_DESC=	Enable libzvbi support
 
-USES=		gmake iconv jpeg motif perl5 tar:bzip2
+USES=		gmake iconv jpeg motif perl5 tar:bzip2 pkgconfig
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xaw
 CPPFLAGS+=	-I${WRKSRC}/common
@@ -44,10 +44,10 @@ PLIST_SUB+=	AA="@comment "
 .if ${PORT_OPTIONS:MZVBI}
 LIB_DEPENDS+=	libzvbi.so:${PORTSDIR}/devel/libzvbi
 CONFIGURE_ARGS+=--enable-zvbi
-PLIST_SUB+=	ZVBI="" ZVBI5=""
+PLIST_SUB+=	ZVBI=""
 .else
 CONFIGURE_ARGS+=--enable-zvbi=no
-PLIST_SUB+=	ZVBI="@comment " ZVBI5="@comment "
+PLIST_SUB+=	ZVBI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDV}
@@ -79,13 +79,17 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \
 		s|/usr/local|${LOCALBASE}|g; \
 		s|-lquicktime|-L${LOCALBASE}/lib &|g; \
-		s|LIBV4L="yes"|LIBV4L="no"|g' \
+		s|LIBV4L="yes"|LIBV4L="no"|g; \
+		s|-lunicode|-liconv &|g' \
 		${WRKSRC}/configure
 
 	@${REINPLACE_CMD} -e 's|-ldl||g' \
 		${WRKSRC}/console/Subdir.mk \
 		${WRKSRC}/x11/Subdir.mk
 
+	@${REINPLACE_CMD} -e 's|linuxyesyes|bsdyesyes|g' \
+		${WRKSRC}/x11/Subdir.mk
+
 	@${REINPLACE_CMD} -e 's|\(@CFLAGS@.*\)\$$(LIB_FLAGS) |\$$(LIB_FLAGS) \1|g; \
 		s|-Llibng||g' \
 		${WRKSRC}/Makefile.in
diff --git a/multimedia/xawtv/pkg-plist b/multimedia/xawtv/pkg-plist
index 61273cfd1cf6..a9aecbe7c7f5 100644
--- a/multimedia/xawtv/pkg-plist
+++ b/multimedia/xawtv/pkg-plist
@@ -1,7 +1,7 @@
-%%ZVBI5%%bin/alevtd
+%%ZVBI%%bin/alevtd
 bin/dump-mixers
 bin/motv
-%%ZVBI5%%bin/mtt
+%%ZVBI%%bin/mtt
 bin/ntsc-cc
 bin/pia
 bin/propwatch
-- 
cgit