Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Jan 2016 14:45:20 +0000 (UTC)
From:      Oliver Lehmann <oliver@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r404999 - head/multimedia/xawtv
Message-ID:  <201601011445.u01EjKnk070371@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: oliver
Date: Fri Jan  1 14:45:20 2016
New Revision: 404999
URL: https://svnweb.freebsd.org/changeset/ports/404999

Log:
  fix ZVBI and QUICKTIME builds
  
  PR:		192308

Modified:
  head/multimedia/xawtv/Makefile
  head/multimedia/xawtv/pkg-plist

Modified: head/multimedia/xawtv/Makefile
==============================================================================
--- head/multimedia/xawtv/Makefile	Fri Jan  1 14:26:25 2016	(r404998)
+++ head/multimedia/xawtv/Makefile	Fri Jan  1 14:45:20 2016	(r404999)
@@ -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

Modified: head/multimedia/xawtv/pkg-plist
==============================================================================
--- head/multimedia/xawtv/pkg-plist	Fri Jan  1 14:26:25 2016	(r404998)
+++ head/multimedia/xawtv/pkg-plist	Fri Jan  1 14:45:20 2016	(r404999)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601011445.u01EjKnk070371>