Date: Fri, 11 Nov 2016 16:58:20 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425894 - head/devel/qbs Message-ID: <201611111658.uABGwKac023799@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Nov 11 16:58:20 2016 New Revision: 425894 URL: https://svnweb.freebsd.org/changeset/ports/425894 Log: Update devel/qbs to 1.6.1 While here, also add a PLIST_SUB for the .so-version, and fix up the workaround for inplace updates, to use CONFIGURE_WRKSRC instead of WRKSRC, as we are using qmake:outsource (see r422785). Approved by: rakuco (mentor) Modified: head/devel/qbs/Makefile head/devel/qbs/distinfo head/devel/qbs/pkg-plist Modified: head/devel/qbs/Makefile ============================================================================== --- head/devel/qbs/Makefile Fri Nov 11 16:49:21 2016 (r425893) +++ head/devel/qbs/Makefile Fri Nov 11 16:58:20 2016 (r425894) @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= qbs -PORTVERSION= 1.6.0 +PORTVERSION= 1.6.1 DISTVERSIONPREFIX= src- -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/Qt/qbs @@ -32,6 +31,8 @@ INSTALL_TARGET= install DOCS_ALL_TARGET= docs DOCS_INSTALL_TARGET= install_docs +PLIST_SUB= SHLIB_VERSION="${PORTVERSION}" + pre-configure: # We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to # the linker before -L/usr/local/lib. By default, the opposite happens, which @@ -41,6 +42,7 @@ pre-configure: # latter to get the linker path order right. qmake is smart enough to strip # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them. # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. - ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${WRKSRC}/lib' >> ${WRKSRC}/.qmake.cache + ${MKDIR} ${CONFIGURE_WRKSRC} + ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache .include <bsd.port.mk> Modified: head/devel/qbs/distinfo ============================================================================== --- head/devel/qbs/distinfo Fri Nov 11 16:49:21 2016 (r425893) +++ head/devel/qbs/distinfo Fri Nov 11 16:58:20 2016 (r425894) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472157751 -SHA256 (KDE/Qt/qbs/qbs-src-1.6.0.tar.gz) = ae850e957e4a811a193b02a067321722dd0e5fc50b7c370ec34273c1565e78ab -SIZE (KDE/Qt/qbs/qbs-src-1.6.0.tar.gz) = 928684 +TIMESTAMP = 1478880548 +SHA256 (KDE/Qt/qbs/qbs-src-1.6.1.tar.gz) = 72bbba4ac0ede177df52e44e79692752016ecd1c26b9ae86c76b0df1e18cbb10 +SIZE (KDE/Qt/qbs/qbs-src-1.6.1.tar.gz) = 934229 Modified: head/devel/qbs/pkg-plist ============================================================================== --- head/devel/qbs/pkg-plist Fri Nov 11 16:49:21 2016 (r425893) +++ head/devel/qbs/pkg-plist Fri Nov 11 16:58:20 2016 (r425894) @@ -39,11 +39,11 @@ include/qbs/use_installed_qtprofilesetup lib/libqbscore.so lib/libqbscore.so.1 lib/libqbscore.so.1.6 -lib/libqbscore.so.1.6.0 +lib/libqbscore.so.%%SHLIB_VERSION%% lib/libqbsqtprofilesetup.so lib/libqbsqtprofilesetup.so.1 lib/libqbsqtprofilesetup.so.1.6 -lib/libqbsqtprofilesetup.so.1.6.0 +lib/libqbsqtprofilesetup.so.%%SHLIB_VERSION%% lib/qbs/plugins/libqbs_cpp_scanner.so lib/qbs/plugins/libqbs_qt_scanner.so %%PORTDOCS%%%%DOCSDIR%%/html/android-ndk-module.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611111658.uABGwKac023799>