From owner-svn-ports-head@freebsd.org Fri Jan 1 14:45:22 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E32DA5EFD2; Fri, 1 Jan 2016 14:45:22 +0000 (UTC) (envelope-from oliver@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C59FD179E; Fri, 1 Jan 2016 14:45:21 +0000 (UTC) (envelope-from oliver@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u01EjK0D070373; Fri, 1 Jan 2016 14:45:20 GMT (envelope-from oliver@FreeBSD.org) Received: (from oliver@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u01EjKnk070371; Fri, 1 Jan 2016 14:45:20 GMT (envelope-from oliver@FreeBSD.org) Message-Id: <201601011445.u01EjKnk070371@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oliver set sender to oliver@FreeBSD.org using -f From: Oliver Lehmann Date: Fri, 1 Jan 2016 14:45:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404999 - head/multimedia/xawtv X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2016 14:45:22 -0000 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