Index: head/audio/musescore/Makefile =================================================================== --- head/audio/musescore/Makefile (revision 440940) +++ head/audio/musescore/Makefile (revision 440941) @@ -1,62 +1,62 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= musescore PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${PORTVERSION}/ DISTNAME= MuseScore-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Free music composition & notation software LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.GPL LIB_DEPENDS= libmp3lame.so:audio/lame \ libsndfile.so:audio/libsndfile \ libvorbis.so:audio/libvorbis USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ pkgconfig shared-mime-info zip -USE_QT5= concurrent declarative designer help network scripttools svg \ +USE_QT5= concurrent designer help network scripttools svg \ webkit xml xmlpatterns \ buildtools_build linguisttools_build qmake_build uitools_build ALL_TARGET= lrelease manpages all DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R} BROKEN_aarch64= Fails to compile: error: constant expression evaluates to -1 OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO OPTIONS_DEFAULT= PORTAUDIO ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= BUILD_ALSA JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= BUILD_JACK PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CMAKE_BOOL= BUILD_PORTAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= BUILD_PULSEAUDIO .include .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-inconsistent-missing-override .endif post-patch: @${FIND} ${WRKSRC} -name "CMakeLists.txt" -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e \ '/RELEASE/s|-O2 || ; \ /COMPILE_FLAGS/s|-g || ; \ /COMPILE_FLAGS/s|$${PCH_INCLUDE} |-include $${PROJECT_BINARY_DIR}/all.h |' @${REINPLACE_CMD} -e \ 's||| ; \ s||| ; \ s||| ; \ s|||' ${WRKSRC}/all.h .include Index: head/devel/qt5/Makefile =================================================================== --- head/devel/qt5/Makefile (revision 440940) +++ head/devel/qt5/Makefile (revision 440941) @@ -1,13 +1,14 @@ # $FreeBSD$ PORTNAME= qt5 DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform application and UI framework (metaport) -USE_QT5= ${_USE_QT_ALL:Nphonon4:S/$/_run/} # phonon4 is not part of Qt itself. +USE_QT5= ${_USE_QT_ALL:Nphonon4:Ndeclarative:S/$/_run/} # phonon4 is not part of Qt itself. USES= metaport .include Index: head/devel/qtcreator/Makefile =================================================================== --- head/devel/qtcreator/Makefile (revision 440940) +++ head/devel/qtcreator/Makefile (revision 440941) @@ -1,75 +1,76 @@ # Created by: Kris Moore # $FreeBSD$ PORTNAME= qtcreator DISTVERSION= 4.2.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION} DISTNAME= qt-creator-opensource-src-${DISTVERSION} DIST_SUBDIR= KDE/Qt/qtcreator MAINTAINER= kde@FreeBSD.org COMMENT= C++ and QML IDE for Qt development # depend on the split out qbs LIB_DEPENDS= libqbscore.so:devel/qbs USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} USES= qmake compiler:c++11-lib tar:xz USE_GL= gl -USE_QT5= buildtools concurrent core declarative designer gui help \ +USE_QT5= buildtools concurrent core designer gui help \ linguist network printsupport qdoc 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} # Required for building the port with GCC: the define below is required for # std::to_string() to exist. More details in ports/193528. QMAKE_ARGS+= DEFINES+=_GLIBCXX_USE_C99 DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" \ "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true BROKEN_aarch64= fails to build: invokes x86 asm OPTIONS_DEFINE= DOCS EXAMPLES DOCS_DESC= Install the Qt5 api documentation DOCS_USE= QT5=doc_run EXAMPLES_DESC= Install the Qt5 example projects EXAMPLES_USE= QT5=examples_run OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ALL_TARGET= all INSTALL_TARGET= install DOCS_ALL_TARGET= docs DOCS_INSTALL_TARGET= install_docs PLIST_SUB= SHLIB_VER="${PORTVERSION}" # Fix paths for gnuplot and ant. post-patch: ${REINPLACE_CMD} -e 's|/usr/bin/gnuplot|${LOCALBASE}/bin/gnuplot|' \ ${WRKSRC}/share/qtcreator/debugger/dumper.py ${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/bin/ant|' \ ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp 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. ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${WRKSRC}/lib' >> ${WRKSRC}/.qmake.cache .include Index: head/graphics/luminance-qt5/Makefile =================================================================== --- head/graphics/luminance-qt5/Makefile (revision 440940) +++ head/graphics/luminance-qt5/Makefile (revision 440941) @@ -1,57 +1,62 @@ # Created by: Yinghong Liu # $FreeBSD$ PORTNAME= luminance-hdr DISTVERSION= 2.4.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} PKGNAMESUFFIX= -qt5 MAINTAINER= h2+fbsdports@fsfe.org COMMENT= Complete open source solution for HDR photography LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 LIB_DEPENDS= libfftw3f.so:math/fftw3-float \ libexiv2.so:graphics/exiv2 \ libIlmImf.so:graphics/OpenEXR \ libtiff.so:graphics/tiff \ libgsl.so:math/gsl \ libraw_r.so:graphics/libraw \ libboost_system.so:devel/boost-libs USES= cmake:outsource jpeg pkgconfig tar:bzip2 -USE_QT5= concurrent declarative gui printsupport sql webkit xml \ +USE_QT5= concurrent gui printsupport sql webkit xml \ buildtools_build linguist_build qmake_build \ imageformats_run INSTALLS_ICONS= yes MAKE_JOBS_UNSAFE=yes CONFLICTS_INSTALL= luminance-hdr-[0-9]* OPTIONS_DEFINE= DOCS post-patch: +# Remove the non-required dependency on Qt5 Declarative. This can be dropped +# once www/qt5-webengine lands in the portstree and this port can be updated to +# a version >= 2.5.0. + @${REINPLACE_CMD} -e '/Qt5Declarative/d' \ + ${WRKSRC}/CMakeLists.txt # Do not install yet another copy of GPL (we use license framework instead) # and fix installation path for docs (but not for internal help files) @${REINPLACE_CMD} -e '/LICENSE/d ; \ /#info files/s,share/luminance-hdr,${DOCSDIR_REL},' \ ${WRKSRC}/CMakeLists.txt # Point to the right location for program where to look for GPL text @${REINPLACE_CMD} -e 's,LICENSE,${LICENSE}, ; \ s,share/doc/luminance-hdr,share/licenses/${PKGNAME},' \ ${WRKSRC}/src/UI/UMessageBox.cpp # Allow builds from release distfile to display correct git hash in "About" # dialog window @${REINPLACE_CMD} -e \ 's,@GIT_SHA1@,be5409f2ed028b0a509d3f4cd44a970a09d2ef6c,' \ ${WRKSRC}/src/Common/GitSHA1.cpp.in pre-install: QT_BINDIR_REL=bin .include Index: head/polish/kadu/Makefile =================================================================== --- head/polish/kadu/Makefile (revision 440940) +++ head/polish/kadu/Makefile (revision 440941) @@ -1,72 +1,72 @@ # Created by: Jacek Pelka # $FreeBSD$ PORTNAME= kadu PORTVERSION= 4.3 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= polish net-im MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \ http://download.kadu.im/stable/:kadu \ http://download.kadu.im/additions/:additions DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:kadu DIST_SUBDIR= kadu EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= pawel@FreeBSD.org COMMENT= Internet communicator supporting Gadu-Gadu and Jabber/XMPP LICENSE= GPLv2 BUILD_DEPENDS= bash:shells/bash \ pl-libgadu>=1.12.2:polish/libgadu LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \ libsndfile.so:audio/libsndfile \ libinjeqt.so:devel/injeqt \ libqca-qt5.so:devel/qca-qt5 \ libidn.so:dns/libidn \ libqxmpp.so:net-im/qxmpp-qt5 \ libgadu.so:polish/libgadu \ libgcrypt.so:security/libgcrypt \ libotr.so.5:security/libotr \ libenchant.so:textproc/enchant # TODO ntrack and ntrack-qt (needs porting) ? # TODO separate ports for plugins and themes (possible starting with 0.10) GG6_EMOTS_DISTFILE= kompatybilne_z_GG6.tar.gz GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz USES= cmake compiler:c++11-lib execinfo gettext-runtime \ libarchive pkgconfig readline tar:bzip2 USE_XORG= x11 xext xfixes xscrnsaver USE_GNOME= glib20 -USE_QT5= concurrent core dbus declarative gui multimedia network \ +USE_QT5= concurrent core dbus gui multimedia network \ qml quick script scripttools sql webkit widgets x11extras \ xml xmlpatterns buildtools_build linguisttools_build \ qmake_build imageformats_run sql-sqlite3_run # Setting KADU_VERSION disables git invocation CMAKE_ARGS= -DKADU_VERSION:STRING="${DISTVERSION}" -DWITH_ENCHANT=ON \ -DENABLE_TESTS=OFF LDFLAGS+= -lexecinfo OPTIONS_DEFINE= GG_EMOTS OPTIONS_SUB= yes GG_EMOTS_DESC= GG-compatible emoticons GG_EMOTS_DISTFILES= ${GG6_EMOTS_DISTFILE}:additions \ ${GG7_EMOTS_DISTFILE}:additions post-patch: @${REINPLACE_CMD} '/kadu_add_test/ s|^|#|' \ ${WRKSRC}/kadu-core/plugin/CMakeLists.txt post-install-GG_EMOTS-on: @${MKDIR} ${WRKSRC}/varia/themes/emoticons @cd ${WRKSRC}/varia/themes/emoticons && \ ${TAR} -zxf ${_DISTDIR}/${GG6_EMOTS_DISTFILE} && \ ${MV} kompatybilne_z_GG6 gg6_compatible && \ cd gg6_compatible && ${TAR} -zxf ${_DISTDIR}/${GG7_EMOTS_DISTFILE} @cd ${WRKSRC}/varia/themes/emoticons && \ ${COPYTREE_SHARE} gg6_compatible ${STAGEDIR}${DATADIR}/themes/emoticons .include Index: head/x11-toolkits/qt5-declarative/Makefile =================================================================== --- head/x11-toolkits/qt5-declarative/Makefile (revision 440940) +++ head/x11-toolkits/qt5-declarative/Makefile (revision 440941) @@ -1,26 +1,29 @@ # $FreeBSD$ PORTNAME= declarative DISTVERSION= 5.5.1 # QtQuick1 was last released with Qt 5.5. CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4-compatible declarative UI framework +DEPRECATED= Has not been released since Qt 5.5 -- installation can lead to runtime conflicts with qt5-quick +EXPIRATION_DATE= 2017-06-30 + DISTINFO_FILE= ${MASTERDIR}/distinfo QT5_VERSION= ${DISTVERSION} USE_QT5= core designer gui network opengl script sql webkit \ widgets xmlpatterns buildtools_build QT_DIST= quick1 USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} # qt5logo.png is installed by qt5-widgets. DESKTOP_ENTRIES="Qt 5 QML viewer" "" \ "${PREFIX}/share/pixmaps/qt5logo.png" \ "${PREFIX}/${QT_BINDIR_REL}/qmlviewer" \ "Development;Qt;" true .include