devel/qtcreator: 3.6.0 -> 3.6.1

Changes:
  http://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist/changes-3.6.1.md?h=3.6
- Please see UPDATING for the separation of devel/qbs from devel/qtcreator

Submitted by:	Ralf Nolden <nolden@kde.org> (kde)

4 files changed, 32 insertions, 157 deletions

diff --git a/UPDATING b/UPDATING
index 38a1707253d..d266d795644 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160525:
+  AFFECTS: Users of devel/qtcreator
+  AUTHOR: nolden@kde.org
+
+  QBS (Qt Build System) was previously shipped as part of qtcreator, now
+  it is independently available as devel/qbs. However, on upgrading
+  qtcreator to 3.6.1, the depends will detect qbs through a previously
+  installed qtcreator port and will not build/install correctly
+  (devel/qbs won't be installed automatically as depends)
+
+  The solution is to pkg remove qtcreator, then building works correctly.
+
 20160523:
   AFFECTS: Users of databases/db6
   AUTHOR: mandree@FreeBSD.org
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 66ca3f4e8d1..f4ba06772cc 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -2,21 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	qtcreator
-DISTVERSION=	3.6.0
+DISTVERSION=	3.6.1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
 DISTNAME=	qt-creator-opensource-src-${DISTVERSION}
-DIST_SUBDIR=	KDE
+DIST_SUBDIR=	KDE/Qt/qtcreator
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	C++ and QML IDE for Qt development
 
+LICENSE=	GPLv3 LGPL21 LGPL3
+LICENSE_COMB=	dual
+
+# depend on the split out qbs
+BUILD_DEPENDS=	qbs:devel/qbs
+RUN_DEPENDS=	qbs:devel/qbs
+
 USE_LDCONFIG=	${LOCALBASE}/lib/${PORTNAME}
-USES=		qmake:outsource compiler:c++11-lib
+USES=		qmake compiler:c++11-lib
+INSTALLS_ICONS=	yes
 USE_QT5=	buildtools concurrent core declarative designer gui linguist network\
 		qml quick quickcontrols script script sql svg webkit widgets xml\
 		xmlpatterns
 
+# be paranoid and do not extract qbs (devel/qbs) copy from source tree
+EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/src/shared/qbs'
+# Set QBS_INSTALL_DIR for QBS plugin build and set config parameter to build
+# the qbsprojectmanager plugin without compile error
+QMAKE_ARGS+=	QBS_INSTALL_DIR=${PREFIX} CONFIG+=qbs_enable_project_file_updates
+
 # Enforce installation to ${PREFIX}.
 QMAKE_ARGS+=	QTC_PREFIX=${PREFIX}
 
@@ -33,7 +47,7 @@ post-patch:
 				${WRKSRC}/share/qtcreator/debugger/dumper.py
 	${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/bin/ant|' \
 				${WRKSRC}/src/plugins/android/androidsettingswidget.cpp
-	${REINPLACE_CMD} -e '/unix:LIBS += -ldl/d' \
+	${REINPLACE_CMD} -e '/unix:!openbsd: LIBS += -ldl/d' \
 				${WRKSRC}/src/libs/sqlite/sqlite-lib.pri
 
 .include <bsd.port.mk>
diff --git a/devel/qtcreator/distinfo b/devel/qtcreator/distinfo
index 8d6dbf3d6ed..261e7ee4a59 100644
--- a/devel/qtcreator/distinfo
+++ b/devel/qtcreator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-creator-opensource-src-3.6.0.tar.gz) = b130104963053e21f227b08009545894af33df495445a8651843bad4b52a1dec
-SIZE (KDE/qt-creator-opensource-src-3.6.0.tar.gz) = 23127195
+SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-3.6.1.tar.gz) = e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2
+SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-3.6.1.tar.gz) = 23144233
diff --git a/devel/qtcreator/pkg-plist b/devel/qtcreator/pkg-plist
index 644f30bf4a8..b4c27db9e04 100644
--- a/devel/qtcreator/pkg-plist
+++ b/devel/qtcreator/pkg-plist
@@ -1,12 +1,4 @@
-bin/qbs
-bin/qbs-config
-bin/qbs-config-ui
-bin/qbs-qmltypes
-bin/qbs-setup-android
-bin/qbs-setup-qt
-bin/qbs-setup-toolchains
 bin/qtcreator
-bin/qtcreator.sh
 lib/qtcreator/libAggregation.so
 lib/qtcreator/libAggregation.so.1
 lib/qtcreator/libAggregation.so.1.0
@@ -63,14 +55,6 @@ lib/qtcreator/libUtils.so
 lib/qtcreator/libUtils.so.1
 lib/qtcreator/libUtils.so.1.0
 lib/qtcreator/libUtils.so.1.0.0
-lib/qtcreator/libqbscore.so
-lib/qtcreator/libqbscore.so.1
-lib/qtcreator/libqbscore.so.1.4
-lib/qtcreator/libqbscore.so.1.4.4
-lib/qtcreator/libqbsqtprofilesetup.so
-lib/qtcreator/libqbsqtprofilesetup.so.1
-lib/qtcreator/libqbsqtprofilesetup.so.1.4
-lib/qtcreator/libqbsqtprofilesetup.so.1.4.4
 lib/qtcreator/plugins/libAnalyzerBase.so
 lib/qtcreator/plugins/libAndroid.so
 lib/qtcreator/plugins/libAutotoolsProjectManager.so
@@ -126,8 +110,6 @@ lib/qtcreator/plugins/libValgrind.so
 lib/qtcreator/plugins/libVcsBase.so
 lib/qtcreator/plugins/libWelcome.so
 lib/qtcreator/plugins/libWinRt.so
-lib/qtcreator/plugins/qbs/plugins/libqbs_cpp_scanner.so
-lib/qtcreator/plugins/qbs/plugins/libqbs_qt_scanner.so
 lib/qtcreator/plugins/qmldesigner/libcomponentsplugin.so
 lib/qtcreator/plugins/qmldesigner/libqtquickplugin.so
 libexec/qtcreator/buildoutputparser
@@ -189,139 +171,6 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
 %%DATADIR%%/glsl/glsl_es_100.vert
 %%DATADIR%%/glsl/glsl_es_100_common.glsl
 %%DATADIR%%/modeleditor/standard.def
-%%DATADIR%%/qbs/share/qbs/examples/app-and-lib/app/app.qbs
-%%DATADIR%%/qbs/share/qbs/examples/app-and-lib/app/main.cpp
-%%DATADIR%%/qbs/share/qbs/examples/app-and-lib/app_and_lib.qbs
-%%DATADIR%%/qbs/share/qbs/examples/app-and-lib/lib/lib.cpp
-%%DATADIR%%/qbs/share/qbs/examples/app-and-lib/lib/lib.h
-%%DATADIR%%/qbs/share/qbs/examples/app-and-lib/lib/lib.qbs
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication.qbs
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication.xcodeproj/project.pbxproj
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication/AppDelegate.h
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication/AppDelegate.m
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication/CocoaApplication-Info.plist
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication/en.lproj/Credits.rtf
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication/en.lproj/InfoPlist.strings
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication/en.lproj/MainMenu.xib
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-application/CocoaApplication/main.m
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication.qbs
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Info.plist
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/Default-568h@2x.png
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/Default.png
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/Default@2x.png
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/DetailViewController_iPad.xib
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/DetailViewController_iPhone.xib
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/InfoPlist.strings
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/MasterViewController_iPad.xib
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/MasterViewController_iPhone.xib
-%%DATADIR%%/qbs/share/qbs/examples/cocoa-touch-application/CocoaTouchApplication/main.m
-%%DATADIR%%/qbs/share/qbs/examples/code-generator/code-generator.qbs
-%%DATADIR%%/qbs/share/qbs/examples/code-generator/hwgen.cpp
-%%DATADIR%%/qbs/share/qbs/examples/collidingmice/collidingmice.qbs
-%%DATADIR%%/qbs/share/qbs/examples/collidingmice/images/cheese.jpg
-%%DATADIR%%/qbs/share/qbs/examples/collidingmice/main.cpp
-%%DATADIR%%/qbs/share/qbs/examples/collidingmice/mice.qrc
-%%DATADIR%%/qbs/share/qbs/examples/collidingmice/mouse.cpp
-%%DATADIR%%/qbs/share/qbs/examples/collidingmice/mouse.h
-%%DATADIR%%/qbs/share/qbs/examples/examples.qbs
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-complex/hello.qbs
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-complex/src/foo.cpp
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-complex/src/foo.h
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-complex/src/main.cpp
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-complex/src/specialfeature.cpp
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-complex/src/specialfeature.h
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-minimal/hello.qbs
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-minimal/main.cpp
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-qt/hello.qbs
-%%DATADIR%%/qbs/share/qbs/examples/helloworld-qt/main.cpp
-%%DATADIR%%/qbs/share/qbs/examples/install-bundle/coreutils.cpp
-%%DATADIR%%/qbs/share/qbs/examples/install-bundle/coreutils.h
-%%DATADIR%%/qbs/share/qbs/examples/install-bundle/install-bundle.qbs
-%%DATADIR%%/qbs/share/qbs/examples/install-bundle/main.cpp
-%%DATADIR%%/qbs/share/qbs/imports/qbs/BundleTools/bundle-tools.js
-%%DATADIR%%/qbs/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
-%%DATADIR%%/qbs/share/qbs/imports/qbs/FileInfo/fileinfo.js
-%%DATADIR%%/qbs/share/qbs/imports/qbs/ModUtils/utils.js
-%%DATADIR%%/qbs/share/qbs/imports/qbs/PathTools/path-tools.js
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/BinaryProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/IncludeProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/JdkProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/NodeJsProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/PathProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/Probes/TypeScriptProbe.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/UnixUtils/unix-utils.js
-%%DATADIR%%/qbs/share/qbs/imports/qbs/WindowsUtils/windows-utils.js
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/AndroidApk.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/Application.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/ApplicationExtension.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/AutotestRunner.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/CppApplication.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/DynamicLibrary.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/InstallPackage.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/JavaClassCollection.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/JavaJarFile.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/Library.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/LoadableModule.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/NSISSetup.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/NodeJSApplication.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/QtApplication.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/QtGuiApplication.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/StaticLibrary.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/WindowsSetupPackage.qbs
-%%DATADIR%%/qbs/share/qbs/imports/qbs/base/XPCService.qbs
-%%DATADIR%%/qbs/share/qbs/modules/Android/ndk/ndk.qbs
-%%DATADIR%%/qbs/share/qbs/modules/Android/ndk/utils.js
-%%DATADIR%%/qbs/share/qbs/modules/Android/sdk/sdk.qbs
-%%DATADIR%%/qbs/share/qbs/modules/Android/sdk/utils.js
-%%DATADIR%%/qbs/share/qbs/modules/archiver/archiver.qbs
-%%DATADIR%%/qbs/share/qbs/modules/bundle/BundleModule.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/CppModule.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/DarwinGCC.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/GenericGCC.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/UnixGCC.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/gcc.js
-%%DATADIR%%/qbs/share/qbs/modules/cpp/genericunix-gcc.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/ios-gcc.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/linux-gcc.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/msvc.js
-%%DATADIR%%/qbs/share/qbs/modules/cpp/osx-gcc.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/windows-mingw.qbs
-%%DATADIR%%/qbs/share/qbs/modules/cpp/windows-msvc.qbs
-%%DATADIR%%/qbs/share/qbs/modules/ib/IBModule.qbs
-%%DATADIR%%/qbs/share/qbs/modules/ib/ib.js
-%%DATADIR%%/qbs/share/qbs/modules/java/JavaModule.qbs
-%%DATADIR%%/qbs/share/qbs/modules/java/io/qt/qbs/Artifact.java
-%%DATADIR%%/qbs/share/qbs/modules/java/io/qt/qbs/ArtifactListJsonWriter.java
-%%DATADIR%%/qbs/share/qbs/modules/java/io/qt/qbs/ArtifactListTextWriter.java
-%%DATADIR%%/qbs/share/qbs/modules/java/io/qt/qbs/ArtifactListWriter.java
-%%DATADIR%%/qbs/share/qbs/modules/java/io/qt/qbs/ArtifactListXmlWriter.java
-%%DATADIR%%/qbs/share/qbs/modules/java/io/qt/qbs/tools/JavaCompilerScannerTool.java
-%%DATADIR%%/qbs/share/qbs/modules/java/io/qt/qbs/tools/utils/JavaCompilerOptions.java
-%%DATADIR%%/qbs/share/qbs/modules/java/io/qt/qbs/tools/utils/JavaCompilerScanner.java
-%%DATADIR%%/qbs/share/qbs/modules/java/io/qt/qbs/tools/utils/NullFileObject.java
-%%DATADIR%%/qbs/share/qbs/modules/java/utils.js
-%%DATADIR%%/qbs/share/qbs/modules/nodejs/NodeJS.qbs
-%%DATADIR%%/qbs/share/qbs/modules/nsis/NSISModule.qbs
-%%DATADIR%%/qbs/share/qbs/modules/qbs/common.qbs
-%%DATADIR%%/qbs/share/qbs/modules/typescript/TypeScriptModule.qbs
-%%DATADIR%%/qbs/share/qbs/modules/typescript/qbs-tsc-scan/.gitignore
-%%DATADIR%%/qbs/share/qbs/modules/typescript/qbs-tsc-scan/qbs-tsc-scan.ts
-%%DATADIR%%/qbs/share/qbs/modules/typescript/typescript.js
-%%DATADIR%%/qbs/share/qbs/modules/wix/WiXModule.qbs
 %%DATADIR%%/qml-type-descriptions/builtins.qmltypes
 %%DATADIR%%/qml-type-descriptions/qbs-bundle.json
 %%DATADIR%%/qml-type-descriptions/qbs.qmltypes