diff options
| author | tcberner <tcberner@FreeBSD.org> | 2016-11-11 16:58:20 +0000 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2016-11-11 16:58:20 +0000 |
| commit | 9808414e6dc1f972db6b73fb357ff30638e9dec6 (patch) | |
| tree | 6aa84aba71cc8076cc06280152efa207861d42ba | |
| parent | 27753fb2974f4b2f8e7b40af2961f0d92f9a52af (diff) | |
| download | FreeBSD-ports-9808414e6dc1f972db6b73fb357ff30638e9dec6.zip FreeBSD-ports-9808414e6dc1f972db6b73fb357ff30638e9dec6.tar.gz | |
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)
| -rw-r--r-- | devel/qbs/Makefile | 8 | ||||
| -rw-r--r-- | devel/qbs/distinfo | 6 | ||||
| -rw-r--r-- | devel/qbs/pkg-plist | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile index 03e75d6..4c3c4e1 100644 --- a/devel/qbs/Makefile +++ b/devel/qbs/Makefile @@ -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> diff --git a/devel/qbs/distinfo b/devel/qbs/distinfo index 4376923..07b5402 100644 --- a/devel/qbs/distinfo +++ b/devel/qbs/distinfo @@ -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 diff --git a/devel/qbs/pkg-plist b/devel/qbs/pkg-plist index 3113fac..b73fc03 100644 --- a/devel/qbs/pkg-plist +++ b/devel/qbs/pkg-plist @@ -39,11 +39,11 @@ include/qbs/use_installed_qtprofilesetup.pri 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 |
