From owner-svn-ports-all@freebsd.org  Mon Jun 13 16:20:32 2016
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 165DDAF1597;
 Mon, 13 Jun 2016 16:20:32 +0000 (UTC) (envelope-from pi@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 DCB732B3D;
 Mon, 13 Jun 2016 16:20:31 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5DGKV90078410;
 Mon, 13 Jun 2016 16:20:31 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5DGKVjh078409;
 Mon, 13 Jun 2016 16:20:31 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201606131620.u5DGKVjh078409@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Mon, 13 Jun 2016 16:20:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416852 - head/devel/qbs
X-SVN-Group: ports-head
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.22
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: Mon, 13 Jun 2016 16:20:32 -0000

Author: pi
Date: Mon Jun 13 16:20:30 2016
New Revision: 416852
URL: https://svnweb.freebsd.org/changeset/ports/416852

Log:
  devel/qbs: don't use QT_LIBDIR
  
  This is preparatory work for a later update to Qt5 which will change
  the meaning of QT_LIBDIR. For qbs, which is not a Qt library, change
  QT_LIBDIR -> lib now to avoid upcoming change.
  
  PR:		210252
  Submitted by:	Adriaan de Groot <groot@kde.org> (kde)

Modified:
  head/devel/qbs/pkg-plist

Modified: head/devel/qbs/pkg-plist
==============================================================================
--- head/devel/qbs/pkg-plist	Mon Jun 13 16:17:09 2016	(r416851)
+++ head/devel/qbs/pkg-plist	Mon Jun 13 16:20:30 2016	(r416852)
@@ -35,16 +35,16 @@ include/qbs/tools/settingsmodel.h
 include/qbs/tools/setupprojectparameters.h
 include/qbs/use_installed_corelib.pri
 include/qbs/use_installed_qtprofilesetup.pri
-%%QT_LIBDIR%%/libqbscore.so
-%%QT_LIBDIR%%/libqbscore.so.1
-%%QT_LIBDIR%%/libqbscore.so.1.5
-%%QT_LIBDIR%%/libqbscore.so.1.5.1
-%%QT_LIBDIR%%/libqbsqtprofilesetup.so
-%%QT_LIBDIR%%/libqbsqtprofilesetup.so.1
-%%QT_LIBDIR%%/libqbsqtprofilesetup.so.1.5
-%%QT_LIBDIR%%/libqbsqtprofilesetup.so.1.5.1
-%%QT_LIBDIR%%/qbs/plugins/libqbs_cpp_scanner.so
-%%QT_LIBDIR%%/qbs/plugins/libqbs_qt_scanner.so
+lib/libqbscore.so
+lib/libqbscore.so.1
+lib/libqbscore.so.1.5
+lib/libqbscore.so.1.5.1
+lib/libqbsqtprofilesetup.so
+lib/libqbsqtprofilesetup.so.1
+lib/libqbsqtprofilesetup.so.1.5
+lib/libqbsqtprofilesetup.so.1.5.1
+lib/qbs/plugins/libqbs_cpp_scanner.so
+lib/qbs/plugins/libqbs_qt_scanner.so
 %%PORTDOCS%%%%DOCSDIR%%/html/android-ndk-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/android-sdk-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/androidapk-item.html