Index: head/devel/qbs/Makefile =================================================================== --- head/devel/qbs/Makefile (revision 440019) +++ head/devel/qbs/Makefile (revision 440020) @@ -1,49 +1,52 @@ # $FreeBSD$ PORTNAME= qbs -PORTVERSION= 1.7.1 -PORTREVISION= 1 +PORTVERSION= 1.7.2 DISTVERSIONPREFIX= src- CATEGORIES= devel MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/Qt/qbs MAINTAINER= kde@FreeBSD.org COMMENT= Qt Build Suite LICENSE= GPLv3 LGPL21 LICENSE_COMB= dual USES= compiler:c++11-lib qmake:outsource USE_GL= gl USE_LDCONFIG= yes USE_QT5= buildtools_build core concurrent gui network script testlib \ widgets xml QMAKE_SOURCE_PATH= ${WRKSRC}/qbs.pro OPTIONS_DEFINE= DOCS DOCS_USE= QT5=help_build,qdoc_build,sql-sqlite3_build OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ALL_TARGET= all 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 # is a problem when a Qt port is being upgraded, since an existing library # would end up being picked up instead of those built in ${WRKSRC}/lib. Since # qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the # 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. ${MKDIR} ${CONFIGURE_WRKSRC} ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache + +# The file in question is not used on FreeBSD. To silence stage-qa, remove it from stage-dir. +post-install: + ${RM} ${STAGEDIR}${DATADIR}/modules/bundle/update-specs.sh .include Index: head/devel/qbs/distinfo =================================================================== --- head/devel/qbs/distinfo (revision 440019) +++ head/devel/qbs/distinfo (revision 440020) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485378730 -SHA256 (KDE/Qt/qbs/qbs-src-1.7.1.tar.gz) = e4f5627ffcdba4d74a432f89215e7df1c1657f5416b61612467a7a9267cd4851 -SIZE (KDE/Qt/qbs/qbs-src-1.7.1.tar.gz) = 994738 +TIMESTAMP = 1493271729 +SHA256 (KDE/Qt/qbs/qbs-src-1.7.2.tar.gz) = ab82fb9f9fd72617b175b73ebadd3a3ac8a089af741edb777ead6dc9937394b0 +SIZE (KDE/Qt/qbs/qbs-src-1.7.2.tar.gz) = 995710 Index: head/devel/qbs/pkg-plist =================================================================== --- head/devel/qbs/pkg-plist (revision 440019) +++ head/devel/qbs/pkg-plist (revision 440020) @@ -1,300 +1,299 @@ bin/qbs bin/qbs-config bin/qbs-config-ui bin/qbs-qmltypes bin/qbs-setup-android bin/qbs-setup-qt bin/qbs-setup-toolchains include/qbs/api/jobs.h include/qbs/api/languageinfo.h include/qbs/api/project.h include/qbs/api/projectdata.h include/qbs/api/rulecommand.h include/qbs/api/runenvironment.h include/qbs/buildgraph/forward_decls.h include/qbs/language/forward_decls.h include/qbs/logging/ilogsink.h include/qbs/qbs.h include/qbs/qbs_version.pri include/qbs/qtenvironment.h include/qbs/qtprofilesetup.h include/qbs/tools/architectures.h include/qbs/tools/buildoptions.h include/qbs/tools/cleanoptions.h include/qbs/tools/codelocation.h include/qbs/tools/commandechomode.h include/qbs/tools/error.h include/qbs/tools/generateoptions.h include/qbs/tools/installoptions.h include/qbs/tools/preferences.h include/qbs/tools/processresult.h include/qbs/tools/profile.h include/qbs/tools/qbs_export.h include/qbs/tools/settings.h include/qbs/tools/settingsmodel.h include/qbs/tools/setupprojectparameters.h include/qbs/tools/toolchains.h include/qbs/use_installed_corelib.pri include/qbs/use_installed_qtprofilesetup.pri lib/libqbscore.so lib/libqbscore.so.1 lib/libqbscore.so.1.7 lib/libqbscore.so.%%SHLIB_VERSION%% lib/libqbsqtprofilesetup.so lib/libqbsqtprofilesetup.so.1 lib/libqbsqtprofilesetup.so.1.7 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 %%PORTDOCS%%%%DOCSDIR%%/html/android-sdk-module.html %%PORTDOCS%%%%DOCSDIR%%/html/androidapk-item.html %%PORTDOCS%%%%DOCSDIR%%/html/application-item.html %%PORTDOCS%%%%DOCSDIR%%/html/applicationextension-item.html %%PORTDOCS%%%%DOCSDIR%%/html/archiver-module.html %%PORTDOCS%%%%DOCSDIR%%/html/artifact-item.html %%PORTDOCS%%%%DOCSDIR%%/html/autotestrunner-item.html %%PORTDOCS%%%%DOCSDIR%%/html/building-applications.html %%PORTDOCS%%%%DOCSDIR%%/html/building.html %%PORTDOCS%%%%DOCSDIR%%/html/bundle-module.html %%PORTDOCS%%%%DOCSDIR%%/html/commands.html %%PORTDOCS%%%%DOCSDIR%%/html/configuring.html %%PORTDOCS%%%%DOCSDIR%%/html/cpp-module.html %%PORTDOCS%%%%DOCSDIR%%/html/cppapplication-item.html %%PORTDOCS%%%%DOCSDIR%%/html/custom-modules.html %%PORTDOCS%%%%DOCSDIR%%/html/depends-item.html %%PORTDOCS%%%%DOCSDIR%%/html/dynamiclibrary-item.html %%PORTDOCS%%%%DOCSDIR%%/html/export-item.html %%PORTDOCS%%%%DOCSDIR%%/html/filetagger-item.html %%PORTDOCS%%%%DOCSDIR%%/html/group-item.html %%PORTDOCS%%%%DOCSDIR%%/html/ib-module.html %%PORTDOCS%%%%DOCSDIR%%/html/images/arrow_bc.png %%PORTDOCS%%%%DOCSDIR%%/html/images/bgrContent.png %%PORTDOCS%%%%DOCSDIR%%/html/images/btn_next.png %%PORTDOCS%%%%DOCSDIR%%/html/images/btn_prev.png %%PORTDOCS%%%%DOCSDIR%%/html/images/bullet_dn.png %%PORTDOCS%%%%DOCSDIR%%/html/images/bullet_sq.png %%PORTDOCS%%%%DOCSDIR%%/html/images/home.png %%PORTDOCS%%%%DOCSDIR%%/html/images/ico_note.png %%PORTDOCS%%%%DOCSDIR%%/html/images/ico_note_attention.png %%PORTDOCS%%%%DOCSDIR%%/html/images/ico_out.png %%PORTDOCS%%%%DOCSDIR%%/html/images/logo.png %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/innosetup-item.html %%PORTDOCS%%%%DOCSDIR%%/html/innosetup-module.html %%PORTDOCS%%%%DOCSDIR%%/html/installing-files.html %%PORTDOCS%%%%DOCSDIR%%/html/installpackage-item.html %%PORTDOCS%%%%DOCSDIR%%/html/java-module.html %%PORTDOCS%%%%DOCSDIR%%/html/javaclasscollection-item.html %%PORTDOCS%%%%DOCSDIR%%/html/javajarfile-item.html %%PORTDOCS%%%%DOCSDIR%%/html/jsextension-environment.html %%PORTDOCS%%%%DOCSDIR%%/html/jsextension-file.html %%PORTDOCS%%%%DOCSDIR%%/html/jsextension-fileinfo.html %%PORTDOCS%%%%DOCSDIR%%/html/jsextension-process.html %%PORTDOCS%%%%DOCSDIR%%/html/jsextension-propertylist.html %%PORTDOCS%%%%DOCSDIR%%/html/jsextension-temporarydir.html %%PORTDOCS%%%%DOCSDIR%%/html/jsextension-textfile.html %%PORTDOCS%%%%DOCSDIR%%/html/jsextension-utilities.html %%PORTDOCS%%%%DOCSDIR%%/html/jsextensions-general.html %%PORTDOCS%%%%DOCSDIR%%/html/language-introduction.html %%PORTDOCS%%%%DOCSDIR%%/html/lex-yacc-module.html %%PORTDOCS%%%%DOCSDIR%%/html/list-of-builtin-services.html %%PORTDOCS%%%%DOCSDIR%%/html/list-of-convenience-items.html %%PORTDOCS%%%%DOCSDIR%%/html/list-of-items.html %%PORTDOCS%%%%DOCSDIR%%/html/list-of-language-items.html %%PORTDOCS%%%%DOCSDIR%%/html/list-of-modules.html %%PORTDOCS%%%%DOCSDIR%%/html/list-of-tools.html %%PORTDOCS%%%%DOCSDIR%%/html/loadablemodule-item.html %%PORTDOCS%%%%DOCSDIR%%/html/module-item.html %%PORTDOCS%%%%DOCSDIR%%/html/nodejs-module.html %%PORTDOCS%%%%DOCSDIR%%/html/nsis-module.html %%PORTDOCS%%%%DOCSDIR%%/html/overview.html %%PORTDOCS%%%%DOCSDIR%%/html/probe-item.html %%PORTDOCS%%%%DOCSDIR%%/html/product-item.html %%PORTDOCS%%%%DOCSDIR%%/html/project-item.html %%PORTDOCS%%%%DOCSDIR%%/html/properties-item.html %%PORTDOCS%%%%DOCSDIR%%/html/propertyoptions-item.html %%PORTDOCS%%%%DOCSDIR%%/html/qbs-module.html %%PORTDOCS%%%%DOCSDIR%%/html/qbs.index %%PORTDOCS%%%%DOCSDIR%%/html/qbs.qhp %%PORTDOCS%%%%DOCSDIR%%/html/qbs.qhp.sha1 %%PORTDOCS%%%%DOCSDIR%%/html/qt-modules.html %%PORTDOCS%%%%DOCSDIR%%/html/qt-versions.html %%PORTDOCS%%%%DOCSDIR%%/html/qtapplication-item.html %%PORTDOCS%%%%DOCSDIR%%/html/qtguiapplication-item.html %%PORTDOCS%%%%DOCSDIR%%/html/reference.html %%PORTDOCS%%%%DOCSDIR%%/html/rule-item.html %%PORTDOCS%%%%DOCSDIR%%/html/running-applications.html %%PORTDOCS%%%%DOCSDIR%%/html/scanner-item.html %%PORTDOCS%%%%DOCSDIR%%/html/setup.html %%PORTDOCS%%%%DOCSDIR%%/html/shell.html %%PORTDOCS%%%%DOCSDIR%%/html/staticlibrary-item.html %%PORTDOCS%%%%DOCSDIR%%/html/style/offline-simple.css %%PORTDOCS%%%%DOCSDIR%%/html/style/offline.css %%PORTDOCS%%%%DOCSDIR%%/html/subproject-item.html %%PORTDOCS%%%%DOCSDIR%%/html/system-requirements.html %%PORTDOCS%%%%DOCSDIR%%/html/typescript-module.html %%PORTDOCS%%%%DOCSDIR%%/html/usage.html %%PORTDOCS%%%%DOCSDIR%%/html/wix-module.html %%PORTDOCS%%%%DOCSDIR%%/html/xcode-module.html %%PORTDOCS%%%%DOCSDIR%%/html/xpcservice-item.html %%PORTDOCS%%%%DOCSDIR%%/qbs.qch %%DATADIR%%/examples/app-and-lib/app/app.qbs %%DATADIR%%/examples/app-and-lib/app/main.cpp %%DATADIR%%/examples/app-and-lib/app_and_lib.qbs %%DATADIR%%/examples/app-and-lib/lib/lib.cpp %%DATADIR%%/examples/app-and-lib/lib/lib.h %%DATADIR%%/examples/app-and-lib/lib/lib.qbs %%DATADIR%%/examples/cocoa-application/CocoaApplication.qbs %%DATADIR%%/examples/cocoa-application/CocoaApplication.xcodeproj/project.pbxproj %%DATADIR%%/examples/cocoa-application/CocoaApplication/AppDelegate.h %%DATADIR%%/examples/cocoa-application/CocoaApplication/AppDelegate.m %%DATADIR%%/examples/cocoa-application/CocoaApplication/CocoaApplication-Info.plist %%DATADIR%%/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch %%DATADIR%%/examples/cocoa-application/CocoaApplication/en.lproj/Credits.rtf %%DATADIR%%/examples/cocoa-application/CocoaApplication/en.lproj/InfoPlist.strings %%DATADIR%%/examples/cocoa-application/CocoaApplication/en.lproj/MainMenu.xib %%DATADIR%%/examples/cocoa-application/CocoaApplication/main.m %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication.qbs %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Info.plist %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/Default-568h@2x.png %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/Default.png %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/Default@2x.png %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/DetailViewController_iPad.xib %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/DetailViewController_iPhone.xib %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/InfoPlist.strings %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/MasterViewController_iPad.xib %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/en.lproj/MasterViewController_iPhone.xib %%DATADIR%%/examples/cocoa-touch-application/CocoaTouchApplication/main.m %%DATADIR%%/examples/code-generator/code-generator.qbs %%DATADIR%%/examples/code-generator/hwgen.cpp %%DATADIR%%/examples/collidingmice/collidingmice.qbs %%DATADIR%%/examples/collidingmice/images/cheese.jpg %%DATADIR%%/examples/collidingmice/main.cpp %%DATADIR%%/examples/collidingmice/mice.qrc %%DATADIR%%/examples/collidingmice/mouse.cpp %%DATADIR%%/examples/collidingmice/mouse.h %%DATADIR%%/examples/examples.qbs %%DATADIR%%/examples/helloworld-complex/hello.qbs %%DATADIR%%/examples/helloworld-complex/src/foo.cpp %%DATADIR%%/examples/helloworld-complex/src/foo.h %%DATADIR%%/examples/helloworld-complex/src/main.cpp %%DATADIR%%/examples/helloworld-complex/src/specialfeature.cpp %%DATADIR%%/examples/helloworld-complex/src/specialfeature.h %%DATADIR%%/examples/helloworld-minimal/hello.qbs %%DATADIR%%/examples/helloworld-minimal/main.cpp %%DATADIR%%/examples/helloworld-qt/hello.qbs %%DATADIR%%/examples/helloworld-qt/main.cpp %%DATADIR%%/examples/install-bundle/coreutils.cpp %%DATADIR%%/examples/install-bundle/coreutils.h %%DATADIR%%/examples/install-bundle/install-bundle.qbs %%DATADIR%%/examples/install-bundle/main.cpp %%DATADIR%%/imports/qbs/BundleTools/bundle-tools.js %%DATADIR%%/imports/qbs/DarwinTools/darwin-tools.js %%DATADIR%%/imports/qbs/ModUtils/utils.js %%DATADIR%%/imports/qbs/PathTools/path-tools.js %%DATADIR%%/imports/qbs/Probes/AndroidNdkProbe.qbs %%DATADIR%%/imports/qbs/Probes/AndroidSdkProbe.qbs %%DATADIR%%/imports/qbs/Probes/BinaryProbe.qbs %%DATADIR%%/imports/qbs/Probes/FrameworkProbe.qbs %%DATADIR%%/imports/qbs/Probes/GccProbe.qbs %%DATADIR%%/imports/qbs/Probes/IncludeProbe.qbs %%DATADIR%%/imports/qbs/Probes/InnoSetupProbe.qbs %%DATADIR%%/imports/qbs/Probes/JdkProbe.qbs %%DATADIR%%/imports/qbs/Probes/MsvcProbe.qbs %%DATADIR%%/imports/qbs/Probes/NodeJsProbe.qbs %%DATADIR%%/imports/qbs/Probes/NpmProbe.qbs %%DATADIR%%/imports/qbs/Probes/PathProbe.qbs %%DATADIR%%/imports/qbs/Probes/PkgConfigProbe.qbs %%DATADIR%%/imports/qbs/Probes/TypeScriptProbe.qbs %%DATADIR%%/imports/qbs/Probes/WiXProbe.qbs %%DATADIR%%/imports/qbs/Probes/path-probe.js %%DATADIR%%/imports/qbs/UnixUtils/unix-utils.js %%DATADIR%%/imports/qbs/WindowsUtils/windows-utils.js %%DATADIR%%/imports/qbs/base/AndroidApk.qbs %%DATADIR%%/imports/qbs/base/Application.qbs %%DATADIR%%/imports/qbs/base/ApplicationExtension.qbs %%DATADIR%%/imports/qbs/base/AutotestRunner.qbs %%DATADIR%%/imports/qbs/base/CppApplication.qbs %%DATADIR%%/imports/qbs/base/DynamicLibrary.qbs %%DATADIR%%/imports/qbs/base/InnoSetup.qbs %%DATADIR%%/imports/qbs/base/InstallPackage.qbs %%DATADIR%%/imports/qbs/base/JavaClassCollection.qbs %%DATADIR%%/imports/qbs/base/JavaJarFile.qbs %%DATADIR%%/imports/qbs/base/Library.qbs %%DATADIR%%/imports/qbs/base/LoadableModule.qbs %%DATADIR%%/imports/qbs/base/NSISSetup.qbs %%DATADIR%%/imports/qbs/base/NetModule.qbs %%DATADIR%%/imports/qbs/base/NodeJSApplication.qbs %%DATADIR%%/imports/qbs/base/QtApplication.qbs %%DATADIR%%/imports/qbs/base/QtGuiApplication.qbs %%DATADIR%%/imports/qbs/base/StaticLibrary.qbs %%DATADIR%%/imports/qbs/base/WindowsInstallerPackage.qbs %%DATADIR%%/imports/qbs/base/WindowsSetupPackage.qbs %%DATADIR%%/imports/qbs/base/XPCService.qbs %%DATADIR%%/modules/Android/ndk/ndk.qbs %%DATADIR%%/modules/Android/ndk/utils.js %%DATADIR%%/modules/Android/sdk/sdk.qbs %%DATADIR%%/modules/Android/sdk/utils.js %%DATADIR%%/modules/archiver/archiver.qbs %%DATADIR%%/modules/bundle/BundleModule.qbs %%DATADIR%%/modules/bundle/MacOSX-Package-Types.xcspec %%DATADIR%%/modules/bundle/MacOSX-Product-Types.xcspec %%DATADIR%%/modules/bundle/bundle.js -%%DATADIR%%/modules/bundle/update-specs.sh %%DATADIR%%/modules/cli/CLIModule.qbs %%DATADIR%%/modules/cli/cli.js %%DATADIR%%/modules/cli/mono.qbs %%DATADIR%%/modules/cli/windows-dotnet.qbs %%DATADIR%%/modules/cpp/CppModule.qbs %%DATADIR%%/modules/cpp/DarwinGCC.qbs %%DATADIR%%/modules/cpp/GenericGCC.qbs %%DATADIR%%/modules/cpp/LinuxGCC.qbs %%DATADIR%%/modules/cpp/UnixGCC.qbs %%DATADIR%%/modules/cpp/android-gcc.qbs %%DATADIR%%/modules/cpp/gcc.js %%DATADIR%%/modules/cpp/genericunix-gcc.qbs %%DATADIR%%/modules/cpp/ios-gcc.qbs %%DATADIR%%/modules/cpp/macos-gcc.qbs %%DATADIR%%/modules/cpp/msvc.js %%DATADIR%%/modules/cpp/tvos-gcc.qbs %%DATADIR%%/modules/cpp/watchos-gcc.qbs %%DATADIR%%/modules/cpp/windows-mingw.qbs %%DATADIR%%/modules/cpp/windows-msvc.qbs %%DATADIR%%/modules/ib/IBModule.qbs %%DATADIR%%/modules/ib/ib.js %%DATADIR%%/modules/innosetup/InnoSetupModule.qbs %%DATADIR%%/modules/java/JavaModule.qbs %%DATADIR%%/modules/java/io/qt/qbs/Artifact.java %%DATADIR%%/modules/java/io/qt/qbs/ArtifactListJsonWriter.java %%DATADIR%%/modules/java/io/qt/qbs/ArtifactListTextWriter.java %%DATADIR%%/modules/java/io/qt/qbs/ArtifactListWriter.java %%DATADIR%%/modules/java/io/qt/qbs/ArtifactListXmlWriter.java %%DATADIR%%/modules/java/io/qt/qbs/tools/JavaCompilerScannerTool.java %%DATADIR%%/modules/java/io/qt/qbs/tools/utils/ArtifactProcessor.java %%DATADIR%%/modules/java/io/qt/qbs/tools/utils/ArtifactScanner.java %%DATADIR%%/modules/java/io/qt/qbs/tools/utils/JavaCompilerOptions.java %%DATADIR%%/modules/java/io/qt/qbs/tools/utils/JavaCompilerScanner.java %%DATADIR%%/modules/java/io/qt/qbs/tools/utils/NullFileObject.java %%DATADIR%%/modules/java/utils.js %%DATADIR%%/modules/lex_yacc/lexyacc.js %%DATADIR%%/modules/lex_yacc/lexyacc.qbs %%DATADIR%%/modules/nodejs/NodeJS.qbs %%DATADIR%%/modules/nodejs/nodejs.js %%DATADIR%%/modules/nsis/NSISModule.qbs %%DATADIR%%/modules/qbs/common.qbs %%DATADIR%%/modules/typescript/TypeScriptModule.qbs %%DATADIR%%/modules/typescript/qbs-tsc-scan/.gitignore %%DATADIR%%/modules/typescript/qbs-tsc-scan/qbs-tsc-scan.ts %%DATADIR%%/modules/typescript/typescript.js %%DATADIR%%/modules/wix/WiXModule.qbs %%DATADIR%%/modules/xcode/xcode.js %%DATADIR%%/modules/xcode/xcode.qbs