From owner-svn-ports-all@freebsd.org  Sat Jul  8 10:44:15 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 01772D96E1A;
 Sat,  8 Jul 2017 10:44:15 +0000 (UTC)
 (envelope-from rakuco@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 C49A67C587;
 Sat,  8 Jul 2017 10:44:14 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v68AiDcS046443;
 Sat, 8 Jul 2017 10:44:13 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v68AiDCF046442;
 Sat, 8 Jul 2017 10:44:13 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201707081044.v68AiDCF046442@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat, 8 Jul 2017 10:44:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r445316 - head/Mk
X-SVN-Group: ports-head
X-SVN-Commit-Author: rakuco
X-SVN-Commit-Paths: head/Mk
X-SVN-Commit-Revision: 445316
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Jul 2017 10:44:15 -0000

Author: rakuco
Date: Sat Jul  8 10:44:13 2017
New Revision: 445316
URL: https://svnweb.freebsd.org/changeset/ports/445316

Log:
  Fix qt5-websockets-qml's dependency path in bsd.qt.mk.
  
  libdeclarative_qmlwebsockets.so is not installed into ${QT_LIBDIR}, which
  causes the dependency logic in bsd.qt.mk to actually do something equivalent to
  this instead:
  
      BUILD_DEPENDS+=  ${QT_LIBDIR}/${QT_QMLDIR}/QtWebSockets/libdeclarative_qmlwebsockets.so:www/qt5-websockets-qml
      RUN_DEPENDS+=    ${QT_LIBDIR}/${QT_QMLDIR}/QtWebSockets/libdeclarative_qmlwebsockets.so:www/qt5-websockets-qml
  
  which translates into something like
  
      /usr/local/lib/qt5//usr/local/lib/qt5/qml/QtWebSockets/libdeclarative_qmlwebsockets.so:www/qt5-websockets-qml
  
  which obviously does not exist.
  
  Instead of settin websockets-qml_LIB, set websockets-qml_PATH like we do for
  other QML ports, so that our dependency logic does not needlessly prepend
  ${QT_LIBDIR} there. This fixes devel/qt5's build.
  
  PR:		220045

Modified:
  head/Mk/bsd.qt.mk

Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk	Sat Jul  8 10:32:22 2017	(r445315)
+++ head/Mk/bsd.qt.mk	Sat Jul  8 10:44:13 2017	(r445316)
@@ -596,7 +596,7 @@ websockets_PORT=	www/${_QT_RELNAME}-websockets
 websockets_LIB=	libQt${_QT_LIBVER}WebSockets.so
 
 websockets-qml_PORT=	www/${_QT_RELNAME}-websockets-qml
-websockets-qml_LIB=	${QT_QMLDIR}/QtWebSockets/libdeclarative_qmlwebsockets.so
+websockets-qml_PATH=	${QT_QMLDIR}/QtWebSockets/qmldir
 
 webkit_PORT=		www/${_QT_RELNAME}-webkit
 webkit_LIB=	libQt${_QT_LIBVER}WebKit.so