From owner-svn-ports-head@FreeBSD.ORG  Sat Feb  9 12:58:35 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 24AA8537;
 Sat,  9 Feb 2013 12:58:35 +0000 (UTC)
 (envelope-from avilla@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 173A2947;
 Sat,  9 Feb 2013 12:58:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r19CwYmW026834;
 Sat, 9 Feb 2013 12:58:34 GMT (envelope-from avilla@svn.freebsd.org)
Received: (from avilla@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r19CwYfF026833;
 Sat, 9 Feb 2013 12:58:34 GMT (envelope-from avilla@svn.freebsd.org)
Message-Id: <201302091258.r19CwYfF026833@svn.freebsd.org>
From: Alberto Villa <avilla@FreeBSD.org>
Date: Sat, 9 Feb 2013 12:58:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311972 - head/www/qt4-webkit
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Feb 2013 12:58:35 -0000

Author: avilla
Date: Sat Feb  9 12:58:34 2013
New Revision: 311972
URL: http://svnweb.freebsd.org/changeset/ports/311972

Log:
  - Enable video and audio support for real when requested.
  - Correctly disable dependency on GStreamer when option is off.
  - Bump PORTREVISION.
  
  PR:		175644

Modified:
  head/www/qt4-webkit/Makefile

Modified: head/www/qt4-webkit/Makefile
==============================================================================
--- head/www/qt4-webkit/Makefile	Sat Feb  9 12:54:20 2013	(r311971)
+++ head/www/qt4-webkit/Makefile	Sat Feb  9 12:58:34 2013	(r311972)
@@ -3,6 +3,7 @@
 
 PORTNAME=	webkit
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	www
 PKGNAMEPREFIX=	qt4-
 
@@ -45,14 +46,12 @@ EXTRA_PATCHES=	${.CURDIR}/../../devel/qt
 OPTIONS_DEFINE=	GSTREAMER
 OPTIONS_DEFAULT=	GSTREAMER
 
-GSTREAMER_DESC=	HTML5 audio and video support
+GSTREAMER_DESC=	HTML5 audio and video via GStreamer
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGSTREAMER}
 USE_GSTREAMER=	yes
-.else
-CONFIGURE_ARGS+=	-no-gstreamer
 .endif
 
 .include <bsd.port.pre.mk>
@@ -68,6 +67,13 @@ pre-configure:
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${REINPLACE_CMD} -e 's|linux-\*|unix|g' \
+		${BUILD_WRKSRC}/WebCore/features.pri \
+		${BUILD_WRKSRC}/JavaScriptCore/wtf/wtf.pri
+.if ! ${PORT_OPTIONS:MGSTREAMER}
+	${REINPLACE_CMD} -e 's|.*exists.*gstreamer.*|false {|' \
+		${BUILD_WRKSRC}/WebCore/features.pri
+.endif
 # Avoid building and installing several tests. Should this be made an option?
 	${REINPLACE_CMD} -e '/WebKit\/qt\/tests/ d' \
 		${BUILD_WRKSRC}/WebKit.pro