diff options
49 files changed, 207 insertions, 286 deletions
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index 19ee4b66c4ab..df834b215985 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -172,7 +172,7 @@ _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_fe ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf -. if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64 +. if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64 _EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf @@ -204,15 +204,6 @@ QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}" QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}" . endif -# Add a RUN_DEPENDS on misc/qtchooser to select the binaries. -# The binaries of both supported Qt versions are installed to -# ${LOCALBASE}/lib/qt${_QT_VER}/bin. The port misc/qtchooser installs -# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct -# one depending on the value of QT_SELECT (which we pass to both -# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports -# RUN_DEPEND on it. -RUN_DEPENDS+= qtchooser:misc/qtchooser - PLIST_SUB+= SHORTVER=${DISTVERSION:R} \ FULLVER=${DISTVERSION:C/-.*//} @@ -248,7 +239,7 @@ _QT_TOOLS+= ${UIC} _QT5_BASE= core dbus gui network sql widgets _QT5_ADDITIONAL_LINK?= # Ensure definition -.if ${_QT_VER:M5} +. if ${_QT_VER:M5} post-patch: gcc-post-patch gcc-post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ @@ -259,7 +250,7 @@ gcc-post-patch: ${WRKSRC}/mkspecs/common/g++-base.conf \ ${WRKSRC}/mkspecs/common/bsd/bsd.conf \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf -.endif +. endif pre-configure: qtbase-pre-configure qtbase-pre-configure: @@ -353,11 +344,9 @@ _sub_need_remove= \#\# _sub_need_add= \#\# _sub_need_remove= . endif -# Handle misc/qtchooser wrapper installation and deinstallation # If a port installs Qt version-specific binaries (e.g. "designer" which # existed as a Qt4 application and exists as a Qt5 application and will -# probably be a Qt6 application) which should have a qtchooser-based wrapper, -# the port should set `QT_BINARIES=yes`. +# probably be a Qt6 application) the port should set `QT_BINARIES=yes`. . if defined(QT_BINARIES) _sub_need_bin= . else diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 8479ed2b0c13..932d1fd4cd0e 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -70,18 +70,21 @@ QT_ETCDIR_REL?= etc/xdg QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME} QT_TESTDIR_REL?= ${QT_DATADIR_REL}/tests QT_CMAKEDIR_REL?= lib/cmake -QT_QTCHOOSERDIR_REL?= ${QT_ETCDIR_REL}/qtchooser # Not customizable. QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs _QT_LIBVER= ${_QT_VERSION:R:R} +LCONVERT?= ${QT_BINDIR}/lconvert LRELEASE?= ${QT_BINDIR}/lrelease LUPDATE?= ${QT_BINDIR}/lupdate MOC?= ${QT_BINDIR}/moc RCC?= ${QT_BINDIR}/rcc UIC?= ${QT_BINDIR}/uic QMAKE?= ${QT_BINDIR}/qmake +QCOLLECTIONGENERATOR?= ${QT_BINDIR}/qcollectiongenerator +QHELPGENERATOR?= ${QT_BINDIR}/qhelpgenerator + # Needed to redefine the qmake target for internal Qt configuration. _QMAKE?= ${QMAKE} QMAKESPECNAME?= freebsd-${QMAKE_COMPILER} @@ -95,7 +98,7 @@ QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo . for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \ QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \ - CMAKE QTCHOOSER + CMAKE QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} # Export all directories to the plist substituion for QT_DIST ports. # For the others, exclude QT_CMAKEDIR and QT_ETCDIR. @@ -5,6 +5,19 @@ 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. +20210704: + AFFECTS: users of misc/qtchooser + AUTHOR: kde@FreeBSD.org + + QtChooser allows you to select your version of Qt among those installed. + However, this tool is no longer supported upstream and will not be + available for Qt6. + + By default, our Qt installations are done in: + ${LOCALBASE}/lib/qt${QT_VERSION} as recommended. + We have added symbolic linking for the main binaries to + ${LOCALBASE}/bin with the suffix -qt5. + 20210628: AFFECTS: users of misc/openhab AUTHOR: netchild@FreeBSD.org diff --git a/audio/abgate-lv2/Makefile b/audio/abgate-lv2/Makefile index fa6004ddf3b7..396d756d9e75 100644 --- a/audio/abgate-lv2/Makefile +++ b/audio/abgate-lv2/Makefile @@ -1,7 +1,7 @@ PORTNAME= abGate DISTVERSIONPREFIX= v DISTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio PKGNAMESUFFIX= -lv2 @@ -22,6 +22,9 @@ USE_GL= gl USE_GNOME= atkmm gtk20 gtkmm24 libsigc++20 USE_LDCONFIG= yes +# Makefile directly calls 'qmake' binary. Give it such. +BINARY_ALIAS= qmake=${QMAKE} + post-patch: @${REINPLACE_CMD} -e ' \ s|PREFIX = |PREFIX ?= |; \ diff --git a/audio/guidolib/Makefile b/audio/guidolib/Makefile index b14095435821..6776f1b46c4c 100644 --- a/audio/guidolib/Makefile +++ b/audio/guidolib/Makefile @@ -1,7 +1,7 @@ PORTNAME= guidolib DISTVERSIONPREFIX= v DISTVERSION= 168 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio graphics print MAINTAINER= yuri@FreeBSD.org @@ -32,6 +32,8 @@ OPTIONS_DEFINE= DOCS EXAMPLES PORTDOCS= * PORTEXAMPLES= * +BINARY_ALIAS= qmake=${QMAKE} + post-extract: @${RM} -r ${WRKSRC}/src/midisharelight diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile index d2b9e16a0c5f..27ca84ac9062 100644 --- a/audio/musescore/Makefile +++ b/audio/musescore/Makefile @@ -1,6 +1,7 @@ PORTNAME= musescore DISTVERSIONPREFIX= v DISTVERSION= 3.6.1 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= adridg@FreeBSD.org diff --git a/audio/musescore/files/patch-CMakeLists.txt b/audio/musescore/files/patch-CMakeLists.txt index 69357019d21e..efc92056415c 100644 --- a/audio/musescore/files/patch-CMakeLists.txt +++ b/audio/musescore/files/patch-CMakeLists.txt @@ -5,6 +5,15 @@ up with the dependency loop; make handles this without complaint) --- CMakeLists.txt.orig 2021-01-27 17:12:14 UTC +++ CMakeLists.txt +@@ -25,7 +25,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0) + include(build/functions.cmake) # library of CMake functions ("fn__" namespace) + + # Print Qt version or fail the build if Qt (qmake) is not in PATH. +-fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake) ++fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake qmake-qt5) + + # Libraries linked via full path no longer produce linker search paths. + cmake_policy(SET CMP0003 NEW) @@ -276,7 +276,7 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") if (NOT MSVC) diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index c173b88dde18..c4e79075928c 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,6 +1,6 @@ PORTNAME= FreeCAD DISTVERSION= 0.19.2 -PORTREVISION= 1 +PORTREVISION= 2 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e @@ -12,7 +12,7 @@ COMMENT= General purpose 3D CAD modeller LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyside2-tools>5.14.0:devel/pyside2-tools@${PY_FLAVOR} \ +BUILD_DEPENDS= pyside_tool.py:devel/pyside2-tools@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libexpat.so:textproc/expat2 \ @@ -34,7 +34,7 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} -USES= dos2unix compiler:c++11-lib cmake gl eigen:3 fortran jpeg \ +USES= dos2unix compiler:c++17-lang cmake gl eigen:3 fortran jpeg \ localbase:ldflags pkgconfig python:3.7+ localbase qt:5 xorg USE_GITHUB= yes USE_XORG= ice sm x11 xext xt @@ -53,9 +53,10 @@ CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DPYTHON_PACKAGES_PATH="${PYTHON_SITELIBDIR}" \ -DPYTHON_EXECUTABLE="${PYTHON_CMD}" \ -DBUILD_ASSEMBLY="OFF" -DBUILD_FLAT_MESH="ON" \ - -DPYSIDE2RCCBINARY="${LOCALBASE}/bin/rcc" \ - -DPYSIDE2UICBINARY="${LOCALBASE}/bin/uic" \ - -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2 + -DPYSIDE2RCCBINARY="${RCC}" \ + -DPYSIDE2UICBINARY="${UIC}" \ + -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2 \ + -DBUILD_ENABLE_CXX_STD=C++17 CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} diff --git a/cad/ldview/Makefile b/cad/ldview/Makefile index 28a3d9d945fa..5744c75da92b 100644 --- a/cad/ldview/Makefile +++ b/cad/ldview/Makefile @@ -1,7 +1,7 @@ PORTNAME= ldview DISTVERSIONPREFIX= v DISTVERSION= 4.4_Beta5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -36,7 +36,7 @@ post-patch: @${REINPLACE_CMD} -e 's|"/usr/share/ldraw"|"${PREFIX}/share/ldraw"|' ${WRKSRC}/ModelViewerWidget.cpp pre-configure: - @cd ${WRKSRC} && lrelease LDView.pro + @cd ${WRKSRC} && ${LRELEASE} LDView.pro post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/LDView diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile index 99d3b1e4520c..51d26c90fe1c 100644 --- a/devel/py-qt5-qscintilla2/Makefile +++ b/devel/py-qt5-qscintilla2/Makefile @@ -1,6 +1,6 @@ PORTNAME= qscintilla2 PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_QSCI2} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt5- @@ -30,7 +30,7 @@ post-extract: ${CP} ${WRKSRC}/pyproject-qt5.toml ${WRKSRC}/pyproject.toml do-build: - (cd ${WRKSRC} ; sip-build-${PYTHON_VER} --verbose --no-make --build-dir build ; ${MAKE} -C ./build ) + (cd ${WRKSRC} ; sip-build-${PYTHON_VER} --qmake ${QMAKE} --verbose --no-make --build-dir build ; ${MAKE} -C ./build ) do-install: (cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} ) diff --git a/devel/pyside2/Makefile b/devel/pyside2/Makefile index 524f0c91f1ed..c82d074f2ec7 100644 --- a/devel/pyside2/Makefile +++ b/devel/pyside2/Makefile @@ -1,6 +1,6 @@ PORTNAME= pyside2 DISTVERSION= 5.15.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -44,14 +44,12 @@ USE_QT+= webengine PLIST_SUB+= WEBENGINE="@comment " .endif -# AVOID a build_fs_violation with poudriere -post-build: - ${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/__pycache__ - ${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/__pycache__ - ${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__ -post-stage: - ${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/__pycache__ - ${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/__pycache__ - ${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__ +post-install: + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .include <bsd.port.post.mk> diff --git a/devel/pyside2/pkg-plist b/devel/pyside2/pkg-plist index dfe47bf2c999..9ebbd41591dc 100644 --- a/devel/pyside2/pkg-plist +++ b/devel/pyside2/pkg-plist @@ -112,6 +112,12 @@ lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/PySide2/__init__.py %%PYTHON_SITELIBDIR%%/PySide2/_config.py %%PYTHON_SITELIBDIR%%/PySide2/_git_pyside_version.py +%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/__init__%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_config%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_config%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_git_pyside_version%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/PySide2/__pycache__/_git_pyside_version%%PYVERSTR%%.pyc libdata/pkgconfig/pyside2.pc share/PySide2/glue/qtcharts.cpp share/PySide2/glue/qtcore.cpp diff --git a/devel/qt5-buildtools/Makefile b/devel/qt5-buildtools/Makefile index cbb19ff97a77..0f7ad4d0a3be 100644 --- a/devel/qt5-buildtools/Makefile +++ b/devel/qt5-buildtools/Makefile @@ -1,6 +1,6 @@ PORTNAME= buildtools DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -39,5 +39,6 @@ post-install: .endfor ${INSTALL_SCRIPT} ${WRKSRC}/bin/syncqt.pl \ ${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}/syncqt.pl - + ${RLN} ${STAGEDIR}${QT_BINDIR}/moc ${STAGEDIR}${PREFIX}/bin/moc-qt5 + ${RLN} ${STAGEDIR}${QT_BINDIR}/rcc ${STAGEDIR}${PREFIX}/bin/rcc-qt5 .include <bsd.port.mk> diff --git a/devel/qt5-buildtools/pkg-plist b/devel/qt5-buildtools/pkg-plist index caee9e90d353..342cc0612b59 100644 --- a/devel/qt5-buildtools/pkg-plist +++ b/devel/qt5-buildtools/pkg-plist @@ -1,6 +1,8 @@ %%QT_BINDIR%%/moc +bin/moc-qt5 %%DEBUG%%%%QT_BINDIR%%/moc.debug %%QT_BINDIR%%/rcc +bin/rcc-qt5 %%DEBUG%%%%QT_BINDIR%%/rcc.debug %%QT_BINDIR%%/syncqt.pl %%QT_LIBDIR%%/libQt5Bootstrap.a diff --git a/devel/qt5-linguisttools/Makefile b/devel/qt5-linguisttools/Makefile index a54a7b1c8f5c..0311af3064e6 100644 --- a/devel/qt5-linguisttools/Makefile +++ b/devel/qt5-linguisttools/Makefile @@ -1,5 +1,6 @@ PORTNAME= linguisttools DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -22,6 +23,7 @@ post-install: .for f in lrelease lupdate ${INSTALL_MAN} ${WRKSRC}/src/linguist/${f}/${f}.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 + ${RLN} ${STAGEDIR}${QT_BINDIR}/${f} ${STAGEDIR}${PREFIX}/bin/${f}-qt5 .endfor .include <bsd.port.mk> diff --git a/devel/qt5-linguisttools/pkg-plist b/devel/qt5-linguisttools/pkg-plist index 710ffca62541..848a917df542 100644 --- a/devel/qt5-linguisttools/pkg-plist +++ b/devel/qt5-linguisttools/pkg-plist @@ -6,10 +6,12 @@ %%QT_BINDIR%%/lprodump %%DEBUG%%%%QT_BINDIR%%/lprodump.debug %%QT_BINDIR%%/lrelease +bin/lrelease-qt5 %%QT_BINDIR%%/lrelease-pro %%DEBUG%%%%QT_BINDIR%%/lrelease-pro.debug %%DEBUG%%%%QT_BINDIR%%/lrelease.debug %%QT_BINDIR%%/lupdate +bin/lupdate-qt5 %%QT_BINDIR%%/lupdate-pro %%DEBUG%%%%QT_BINDIR%%/lupdate-pro.debug %%DEBUG%%%%QT_BINDIR%%/lupdate.debug diff --git a/devel/qt5-qdbus/Makefile b/devel/qt5-qdbus/Makefile index e07e139740a8..811103590a7f 100644 --- a/devel/qt5-qdbus/Makefile +++ b/devel/qt5-qdbus/Makefile @@ -1,5 +1,6 @@ PORTNAME= qdbus DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -14,4 +15,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_BINARIES= yes +post-install: + ${RLN} ${STAGEDIR}${QT_BINDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-qt5 + .include <bsd.port.mk> diff --git a/devel/qt5-qdbus/pkg-plist b/devel/qt5-qdbus/pkg-plist index 5a66e33bce87..c69eb1749fec 100644 --- a/devel/qt5-qdbus/pkg-plist +++ b/devel/qt5-qdbus/pkg-plist @@ -1,2 +1,3 @@ +bin/qdbus-qt5 %%QT_BINDIR%%/qdbus %%DEBUG%%%%QT_BINDIR%%/qdbus.debug diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile index 961c3036bcfe..421d4694e8a4 100644 --- a/devel/qt5-qmake/Makefile +++ b/devel/qt5-qmake/Makefile @@ -1,5 +1,6 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -42,5 +43,6 @@ post-build: ${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" BUILD_QMAKE=1 \ ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} - +post-install: + ${RLN} ${STAGEDIR}${QT_BINDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-qt5 .include <bsd.port.mk> diff --git a/devel/qt5-qmake/pkg-plist b/devel/qt5-qmake/pkg-plist index e7c83c09bf25..047a7a903111 100644 --- a/devel/qt5-qmake/pkg-plist +++ b/devel/qt5-qmake/pkg-plist @@ -1,4 +1,5 @@ %%QT_BINDIR%%/qmake +bin/qmake-qt5 %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/aix-g++/qmake.conf diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index 70b2d72ad1e7..fb994d67e3a1 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -1,6 +1,6 @@ PORTNAME= qt5 DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org diff --git a/devel/qt5/files/pkg-change.in b/devel/qt5/files/pkg-change.in index a6634795e865..a55ad00e3f40 100644 --- a/devel/qt5/files/pkg-change.in +++ b/devel/qt5/files/pkg-change.in @@ -35,8 +35,7 @@ ## clean up the config file and directories entirely. ## ## A module with versionable binaries (like "designer" which might have -## a Qt4, Qt5 and Qt6 version) can update the unversioned binary names -## via qt-chooser. +## a Qt4, Qt5 and Qt6 version). ## ## ## On deinstall, we need QT_INCDIR separately, so define variables $qi and $qc @@ -69,11 +68,6 @@ ## @install@need_remove [ \! -e "$qc" ] && touch "$qc" @install@need_remove sed -i "" "/qconfig-$qm\.h/ d" "$qc" -## -## If there are binaries, and qtchooser is installed, update it. -## (This code is identical in install- and deinstall-scripts) -## -@install@need_bin { type update-qtchooser-wrapper && update-qtchooser-wrapper ; } >/dev/null 2>&1 @install ;; @deinstall POST-DEINSTALL) ## @@ -94,12 +88,5 @@ @deinstall rmdir "$qi" @deinstall ) > /dev/null 2>&1 ## -## If there are binaries, and qtchooser is installed, update it. -## (This code is identical in install- and deinstall-scripts) -## -@deinstall@need_bin { type update-qtchooser-wrapper && update-qtchooser-wrapper ; } >/dev/null 2>&1 @deinstall ;; esac -## Avoid exit code from any of the commands-above (e.g. checking for -## qtchooser updates) from leaking out of this script: be true. - : diff --git a/devel/shiboken2/Makefile b/devel/shiboken2/Makefile index c8612ca704c4..6cbf45266fbf 100644 --- a/devel/shiboken2/Makefile +++ b/devel/shiboken2/Makefile @@ -1,6 +1,6 @@ PORTNAME= shiboken2 DISTVERSION= 5.15.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -41,4 +41,12 @@ PLIST_SUB+= PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER} WRKSRC= ${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/shiboken2 +post-install: + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + .include <bsd.port.post.mk> diff --git a/devel/shiboken2/pkg-plist b/devel/shiboken2/pkg-plist index 8ed086ebff13..c9b2ddfc6e91 100644 --- a/devel/shiboken2/pkg-plist +++ b/devel/shiboken2/pkg-plist @@ -33,18 +33,49 @@ lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets.cmake lib/cmake/Shiboken2-%%DISTVERSION%%/shiboken_helpers.cmake lib/libshiboken2%%PYVERSTR%%.so -lib/libshiboken2%%PYVERSTR%%.so.5.15 lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%% +lib/libshiboken2%%PYVERSTR%%.so.5.15 +libdata/pkgconfig/shiboken2.pc %%PYTHON_SITELIBDIR%%/shiboken2/__init__.py +%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/__init__%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_config%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_config%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_git_shiboken_module_version%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_git_shiboken_module_version%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/shiboken2/_config.py %%PYTHON_SITELIBDIR%%/shiboken2/_git_shiboken_module_version.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__feature__.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__init__.py +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__feature__%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__feature__%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__init__%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__init__.py +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/__init__%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/errorhandler%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/errorhandler%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/importhandler%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/importhandler%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/layout%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/layout%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/loader%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/loader%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/mapping%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/mapping%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/parser%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/parser%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/errorhandler.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/importhandler.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/layout.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__init__.py +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/__init__%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/enum_sig%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/enum_sig%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/tool%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/tool%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/enum_sig.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/tool.py %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/loader.py @@ -52,6 +83,11 @@ lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/parser.py %%PYTHON_SITELIBDIR%%/shiboken2/shiboken2%%PYVERSTR%%.so %%PYTHON_SITELIBDIR%%/shiboken2_generator/__init__.py +%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/__init__%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_config%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_config%%PYVERSTR%%.pyc +%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_git_shiboken_generator_version%%PYVERSTR%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_git_shiboken_generator_version%%PYVERSTR%%.pyc %%PYTHON_SITELIBDIR%%/shiboken2_generator/_config.py %%PYTHON_SITELIBDIR%%/shiboken2_generator/_git_shiboken_generator_version.py -libdata/pkgconfig/shiboken2.pc diff --git a/editors/encryptpad/Makefile b/editors/encryptpad/Makefile index 5257595e6180..27c6df9d9a38 100644 --- a/editors/encryptpad/Makefile +++ b/editors/encryptpad/Makefile @@ -3,7 +3,7 @@ PORTNAME= encryptpad DISTVERSIONPREFIX= v DISTVERSION= 0.5.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors security MAINTAINER= dmgk@FreeBSD.org @@ -23,7 +23,8 @@ GH_PROJECT= EncryptPad USE_GL= gl USE_QT= core gui widgets buildtools_build qmake_build -BINARY_ALIAS= python=${PYTHON_CMD} +BINARY_ALIAS= python=${PYTHON_CMD} \ + qmake=${QMAKE} PORTDOCS= * diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index b7652c592b64..64e6ea41e871 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -2,7 +2,7 @@ PORTNAME= djview PORTVERSION= 4.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/djvu/DjView/${PORTVERSION} @@ -34,6 +34,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R}-${PORTVERSION} WEBPLUGIN_DIR= ${PREFIX}/lib/djview4/plugins WEBPLUGIN_FILES= nsdejavu.so +BINARY_ALIAS= qmake=${QMAKE} + post-patch: # Use prebuilt icons, without using conversion tool @${REINPLACE_CMD} -e 's/conversion_tool=[[:alpha:]]*/conversion_tool=no/' \ diff --git a/graphics/engauge-digitizer/Makefile b/graphics/engauge-digitizer/Makefile index f0b75d8db31e..8a4f93989ab6 100644 --- a/graphics/engauge-digitizer/Makefile +++ b/graphics/engauge-digitizer/Makefile @@ -1,7 +1,7 @@ PORTNAME= engauge-digitizer DISTVERSIONPREFIX= v DISTVERSION= 12.2.2 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics math science MAINTAINER= yuri@FreeBSD.org @@ -32,8 +32,11 @@ DOCS_USE= QT=help,linguist_build do-patch-NLS-on: @${REINPLACE_CMD} -e 's|QCoreApplication::applicationDirPath () + "/translations",|"${DATADIR}/translations",|' ${WRKSRC}/src/Translator/TranslatorContainer.cpp +do-patch-DOCS-on: + @${REINPLACE_CMD} -e 's|qcollectiongenerator|${QCOLLECTIONGENERATOR}|' ${WRKSRC}/help/build.bash + post-build-NLS-on: - @cd ${WRKSRC} && lrelease engauge.pro + @cd ${WRKSRC} && ${LRELEASE} engauge.pro post-build-DOCS-on: @cd ${WRKSRC}/help && ./build.bash diff --git a/graphics/libprojectm/Makefile b/graphics/libprojectm/Makefile index c69b0560af9b..b1325eddd6fb 100644 --- a/graphics/libprojectm/Makefile +++ b/graphics/libprojectm/Makefile @@ -1,7 +1,7 @@ PORTNAME= libprojectM DISTVERSIONPREFIX= v DISTVERSION= 3.1.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics audio MAINTAINER= yuri@FreeBSD.org @@ -34,7 +34,7 @@ CONFIGURE_SHELL= ${PREFIX}/bin/bash # https://github.com/projectM-visualizer/pro USE_LDCONFIG= yes USE_CXXSTD= c++98 -CXXFLAGS+= -DDATADIR_PATH='\"${LOCALBASE}/share/projectM\"' +CXXFLAGS+= -DDATADIR_PATH='\"${LOCALBASE}/share/projectM\"' -I${LOCALBASE}/lib/qt5 LDFLAGS+= -L${LOCALBASE}/lib/qt5 # https://github.com/projectM-visualizer/projectm/issues/320 BINARY_ALIAS= make=${GMAKE} @@ -45,13 +45,13 @@ OPTIONS_SUB= yes PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_USES= qt:5 -PULSEAUDIO_USE= qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns +PULSEAUDIO_USE= qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build,linguisttools_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio PULSEAUDIO_CONFIGURE_ON= --enable-qt JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_USES= qt:5 -JACK_USE= qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns +JACK_USE= qt=core,gui,opengl,widgets,xml,buildtools_build,qmake_build,linguisttools_build #qt=declarative,network,script,sensors,serialport,sql,xmlpatterns JACK_CONFIGURE_ENABLE= jack JACK_CONFIGURE_ON= --enable-qt @@ -63,6 +63,12 @@ CONFIGURE_ARGS+= --disable-qt .if ${PORT_OPTIONS:MPULSEAUDIO} || ${PORT_OPTIONS:MJACK} PLIST_FILES+= share/icons/hicolor/scalable/apps/projectM.svg +BINARY_ALIAS+= qmake=${QMAKE} \ + moc=${MOC} \ + uic=${UIC} \ + rcc=${RCC} \ + lrelease=${LRELEASE} \ + lupdate=${LUPDATE} .endif pre-configure: diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile index caad551265ac..3418cf85070d 100644 --- a/graphics/py-python-poppler-qt5/Makefile +++ b/graphics/py-python-poppler-qt5/Makefile @@ -1,7 +1,7 @@ PORTNAME= python-poppler-qt5 DISTVERSIONPREFIX= v DISTVERSION= 0.75.0 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,7 +11,7 @@ COMMENT= Python bindings for the Poppler-Qt PDF rendering library LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual -BUILD_DEPENDS= qmake:devel/qt5-qmake +BUILD_DEPENDS= qmake-qt5:devel/qt5-qmake LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 USES= compiler:c++11-lang gl pkgconfig pyqt:5 python:3.5+ qt:5 @@ -32,7 +32,7 @@ _PY_SONAME= ${PYTHON_EXT_SUFFIX} .endif do-build: - (cd ${WRKSRC} ; sip-build --verbose --no-make --build-dir build ; ${MAKE} -C ./build ) + (cd ${WRKSRC} ; sip-build --qmake ${QMAKE} --verbose --no-make --build-dir build ; ${MAKE} -C ./build ) do-install: (cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} ) diff --git a/math/octave/Makefile b/math/octave/Makefile index 257fc435b19b..63a6f3a948ae 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -2,7 +2,7 @@ PORTNAME= octave PORTVERSION= ${OCTAVE_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= GNU @@ -65,9 +65,12 @@ CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf" \ JAVA_HOME=${JAVA_HOME} \ MAKEINFO=${LOCALBASE}/bin/makeinfo \ MKINFO=${LOCALBASE}/bin/makeinfo \ - MOC_QTVER=${LOCALBASE}/bin/moc \ - UIC_QTVER=${LOCALBASE}/bin/uic \ - RCC_QTVER=${LOCALBASE}/bin/rcc \ + MOC_QTVER=${MOC} \ + UIC_QTVER=${UIC} \ + RCC_QTVER=${RCC} \ + LRELEASE_QTVER=${LRELEASE} \ + QCOLLECTIONGENERATOR_QTVER=${QCOLLECTIONGENERATOR} \ + QHELPGENERATOR_QTVER=${QHELPGENERATOR} \ ac_cv_type_max_align_t=yes \ ac_cv_path_SED=${LOCALBASE}/bin/gsed diff --git a/misc/Makefile b/misc/Makefile index eefd3804a87d..3b899e27b543 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -429,7 +429,6 @@ SUBDIR += qt5-examples SUBDIR += qt5-l10n SUBDIR += qt5ct - SUBDIR += qtchooser SUBDIR += quantum++ SUBDIR += raspberrypi-gpioshutdown SUBDIR += raspberrypi-userland diff --git a/misc/qtchooser/Makefile b/misc/qtchooser/Makefile deleted file mode 100644 index 3c7005931336..000000000000 --- a/misc/qtchooser/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -PORTNAME= qtchooser -PORTVERSION= 66 -PORTREVISION= 4 -CATEGORIES= misc -MASTER_SITES= QT/official_releases/${PORTNAME} -DIST_SUBDIR= KDE/Qt/qtchooser - -MAINTAINER= kde@FreeBSD.org -COMMENT= Qt tool wrapper - -LICENSE= GPLv3 LGPL21 -LICENSE_COMB= dual - -USES= gmake tar:xz -DESTDIRNAME= INSTALL_ROOT -MAKE_ARGS= prefix=${PREFIX} - -SUB_FILES= update-qtchooser-wrapper -# Keep this synchronized with Uses/qt.mk -SUB_LIST= QT_SUPPORTED="5" - -# bin/linguist -- the second bunch no longer exists in the ports tree -CONFLICTS_INSTALL= rubygem-github-linguist -CONFLICTS_INSTALL+= rubygem-github-linguist47 rubygem-gitlab-linguist - -QT_QTCHOOSERDIR=${PREFIX}/etc/xdg/qtchooser - -post-patch: - @${REINPLACE_CMD} -e 's,/etc/xdg,${LOCALBASE}/etc/xdg,' \ - ${WRKSRC}/src/${PORTNAME}/main.cpp - -post-install: -# Install qtchooser config file. Note this is not optimal. -# -> we could install the qtchooser config files via devel/qt5-qmake. -# Unfortunately they will be missing for ports that only use say "rcc" -# without qmake. -# So it is easier to install the config files in qtchooser. -# -> As we cannot include Uses/qt.mk at the moment without specifying -# a version, we also do not have the variables needed to sub the variables -# properly (we could use USES=qt:5 just to get _QT_SUPPORTED, but that -# is a lot of overkill). -# -# Always make sure the following is in sync with Uses/qt.mk . -# At the very least all the _QT_SUPPORTED versions should be -# in the .for loop, although we still keep Qt4 around over a year -# after it was removed from the ports tree. -# - ${MKDIR} ${STAGEDIR}${QT_QTCHOOSERDIR} -.for qt_version in 4 5 - ${ECHO} ${PREFIX}/lib/qt${qt_version}/bin > ${STAGEDIR}${QT_QTCHOOSERDIR}/qt${qt_version}.conf - ${ECHO} ${PREFIX}/lib/qt${qt_version} >> ${STAGEDIR}${QT_QTCHOOSERDIR}/qt${qt_version}.conf -.endfor -# Install man page. - ${INSTALL_DATA} ${WRKSRC}/doc/qtchooser.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -# Create the default profile. - cd ${STAGEDIR}/${QT_QTCHOOSERDIR} && ${LN} -s qt5.conf default.conf - ${INSTALL_SCRIPT} ${WRKDIR}/update-qtchooser-wrapper \ - ${STAGEDIR}${PREFIX}/bin/update-qtchooser-wrapper - - -.include <bsd.port.mk> diff --git a/misc/qtchooser/distinfo b/misc/qtchooser/distinfo deleted file mode 100644 index 2ab816e72e3f..000000000000 --- a/misc/qtchooser/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1539022663 -SHA256 (KDE/Qt/qtchooser/qtchooser-66.tar.xz) = b22c21df135d48fc775d26d771170c2c70555704d4625605383be2cd149c7cea -SIZE (KDE/Qt/qtchooser/qtchooser-66.tar.xz) = 32008 diff --git a/misc/qtchooser/files/patch-Makefile b/misc/qtchooser/files/patch-Makefile deleted file mode 100644 index d7e61cc17d58..000000000000 --- a/misc/qtchooser/files/patch-Makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.orig 2018-05-04 07:41:32 UTC -+++ Makefile -@@ -66,12 +66,11 @@ distclean: - - install: - cd src/qtchooser && $(MAKE) install -- for tool in $(TOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done - case `uname -s` in Darwin) \ - for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \ - ;; esac -- $(MKDIR) $(INSTALL_ROOT)$(prefix)/share/man/man1 -- install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/share/man/man1 -+ $(MKDIR) $(INSTALL_ROOT)$(prefix)/man/man1 -+ install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/man/man1 - - uninstall: - cd src/qtchooser && $(MAKE) uninstall diff --git a/misc/qtchooser/files/update-qtchooser-wrapper.in b/misc/qtchooser/files/update-qtchooser-wrapper.in deleted file mode 100644 index 2b2b2c76f02e..000000000000 --- a/misc/qtchooser/files/update-qtchooser-wrapper.in +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -# If a port installs Qt version-specific binaries (e.g. "designer" which -# existed as a Qt4 application and exists as a Qt5 application and will -# probably be a Qt6 application) which should have a qtchooser-based -# wrapper, the port should set `QT_BINARIES=yes`. -# -# When QT_BINARIES is set to yes, compatibility symlinks (in bin/, -# designer -> qtchooser, so that qtchooser can run designer-qt5 or -# whatever is the selected Qt version) are installed by the port. -# -# Versioned binaries in ports are conventionally installed in <ver>/bin/, -# so qt5/bin/designer is the versioned form of "designer". - -PREFIX=%%PREFIX%% -BINDIR=${PREFIX}/bin -QTCHOOSER=${BINDIR}/qtchooser -VERSIONS=%%QT_SUPPORTED%% - -# Sanity-checking. Distinguish weird failure cases by exit code. -if [ ! -d ${BINDIR} ] ; then - echo "Binary directory '${BINDIR}' missing." >&2 - exit 1 -fi - -if [ ! -x ${QTCHOOSER} ] ; then - echo "Qtchooser binary '${QTCHOOSER}' missing." >&2 - exit 2 -fi - -# Remove links-to-qtchooser that are no longer needed. -# -# We check in ${BINDIR} -- only **directly** in bindir, hence the -# `-maxdepth 1` -- for symlinks to qtchooser. Those are unversioned -# names (e.g. designer -> qtchooser) for the case where qtchooser -# should pick the right one. -# -# If there aren't any versioned names for the same, remove the link -# (e.g. when designer is removed from the versioned bin/ directory -# under qt5/bin/, then designer -> qtchooser can go as well). -# -remove_links() { - for file in $(find -L ${BINDIR} -maxdepth 1 -samefile ${QTCHOOSER}) ; do - # Only symlinks count, since qtchooser lives here too - if [ ! -L ${file} ] ; then - continue - fi - # If at least one versioned executable is found for this name, - # keep the qtchooser compatibility symlink for this name; - # otherwise, remove it. - local found=0 - for version in ${VERSIONS} ; do - version_bin_dir=${PREFIX}/lib/qt${version}/bin - target=${version_bin_dir}/$(basename ${file}) - # Only need to find **one** to keep the link. - if [ -x ${target} ] ; then - found=1 - break - fi - done - if [ ${found} -eq 0 ] ; then - rm ${file} - fi - done -} - -# Create links-to-qtchooser when a versioned application is installed. -# -# We check directly under the versioned bin/ directories, not in subdirectories -# of bin/ -- so we need `-maxdepth 1` -- for names which can be hooked up to -# qtchooser. Each of the names in the versioned bin/ dir is connected to -# qtchooser if there isn't already a link of that name. -# -create_links() { - for version in ${VERSIONS} ; do - version_bin_dir=${PREFIX}/lib/qt${version}/bin - if [ -d ${version_bin_dir} ] ; then - for file in $(find ${version_bin_dir} -type f -maxdepth 1) ; do - # target is the **unversioned** one (e.g. - # designer, living in bin/) which needs to - # be pointed at qtchooser because there is a - # **versioned** designer in e.g. qt5/bin/. - target=${BINDIR}/$(basename ${file}) - if [ ! -L ${target} -a ! -f ${target} ] ; then - ln -s ${QTCHOOSER} ${target} - fi - done - fi - done -} - -remove_links -create_links diff --git a/misc/qtchooser/pkg-descr b/misc/qtchooser/pkg-descr deleted file mode 100644 index 693645e3834b..000000000000 --- a/misc/qtchooser/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -The Qt tool chooser wraps the execution of all Qt tools, to allow for -different Qt versions coexistence. - -WWW: https://github.com/qt/qtchooser diff --git a/misc/qtchooser/pkg-message b/misc/qtchooser/pkg-message deleted file mode 100644 index a483281aa96e..000000000000 --- a/misc/qtchooser/pkg-message +++ /dev/null @@ -1,13 +0,0 @@ -[ -{ type: install - message: <<EOM -qtchooser is a wrapper that allows to specify Qt version of binaries for -qmake, moc and other tools will be run when invoking the binaries in $PATH. - -By default, the Qt5 versions are run. It is possible to change the behavior by -setting the QT_SELECT environment variable to "qtX", where X is desired Qt -version, provided that it is offered by the Ports Collection. See qtchooser(1) -for more information. -EOM -} -] diff --git a/misc/qtchooser/pkg-plist b/misc/qtchooser/pkg-plist deleted file mode 100644 index 0a9890519998..000000000000 --- a/misc/qtchooser/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/qtchooser -bin/update-qtchooser-wrapper -etc/xdg/qtchooser/default.conf -etc/xdg/qtchooser/qt4.conf -etc/xdg/qtchooser/qt5.conf -man/man1/qtchooser.1.gz diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 628feebbeb29..36632ffb4a4f 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -2,6 +2,7 @@ PORTNAME= mkvtoolnix PORTVERSION= 58.0.0 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= https://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ @@ -60,11 +61,15 @@ NLS_USES= gettext NLS_CONFIGURE_WITH= gettext QT5_DESC= Build and install GUI application (Qt 5) -QT5_USES= desktop-file-utils qt:5 shared-mime-info -QT5_USE= QT=buildtools_build,concurrent,core,dbus,declarative,gui,multimedia,network,widgets +QT5_USES= desktop-file-utils qt:5 shared-mime-info qmake:no_env +QT5_USE= QT=buildtools_build,concurrent,core,dbus,declarative,gui,linguisttools_build,multimedia,network,widgets QT5_CONFIGURE_ENABLE= qt -QT5_BUILD_DEPENDS= qmake:devel/qt5-qmake QT5_LIB_DEPENDS= libcmark.so:textproc/cmark +QT5_BINARY_ALIAS= qmake=${QMAKE} \ + lconvert=${LCONVERT} \ + moc=${MOC} \ + rcc=${RCC} \ + uic=${UIC} MANTRANS_DESC= Build and install manpage translations MANTRANS_BUILD_DEPENDS= po4a:textproc/po4a diff --git a/multimedia/smplayer-skins/Makefile b/multimedia/smplayer-skins/Makefile index 4528fb9bf6c0..462b4148563e 100644 --- a/multimedia/smplayer-skins/Makefile +++ b/multimedia/smplayer-skins/Makefile @@ -2,7 +2,7 @@ PORTNAME= smplayer-skins DISTVERSION= 20.11.0 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio kde MASTER_SITES= SF/smplayer/SMPlayer-skins/${PORTVERSION} @@ -17,6 +17,8 @@ NO_ARCH= yes DATADIR= ${PREFIX}/share/smplayer +BINARY_ALIAS= rcc=${RCC} + post-patch: @${REINPLACE_CMD} -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \ ${WRKSRC}/Makefile diff --git a/multimedia/smplayer-themes/Makefile b/multimedia/smplayer-themes/Makefile index 65a90c2198a2..e3262648a889 100644 --- a/multimedia/smplayer-themes/Makefile +++ b/multimedia/smplayer-themes/Makefile @@ -2,6 +2,7 @@ PORTNAME= smplayer-themes PORTVERSION= 20.11.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio kde MASTER_SITES= SF/smplayer/SMPlayer-themes/${PORTVERSION}/ @@ -19,6 +20,8 @@ DATADIR= ${PREFIX}/share/smplayer PORTDOCS= Changelog README.txt OPTIONS_DEFINE= DOCS +BINARY_ALIAS= rcc=${RCC} + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/net/wpa_supplicant_gui/Makefile b/net/wpa_supplicant_gui/Makefile index ca30b8896c01..4c29db5bc7c5 100644 --- a/net/wpa_supplicant_gui/Makefile +++ b/net/wpa_supplicant_gui/Makefile @@ -2,7 +2,7 @@ PORTNAME= wpa_supplicant_gui DISTVERSION= 2.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://w1.fi/releases/ \ http://partmedia.users.sourceforge.net/dist/:icons \ @@ -36,6 +36,10 @@ OPTIONS_DEFINE= DEBUG NLS NLS_PLIST_FILES= ${DATADIR_REL}/translations/wpa_gui_de.qm +# The makefile directly calls 'qmake', give it such. +BINARY_ALIAS= qmake=${QMAKE} \ + lrelease=${LRELEASE} + post-patch: @${REINPLACE_CMD} -e \ '/^Exec/s|=.*|=${PREFIX}/sbin/wpa_gui|' \ diff --git a/security/plasma5-kscreenlocker/files/patch-cmake_FindConsoleKit.cmake b/security/plasma5-kscreenlocker/files/patch-cmake_FindConsoleKit.cmake new file mode 100644 index 000000000000..27b130e31e4e --- /dev/null +++ b/security/plasma5-kscreenlocker/files/patch-cmake_FindConsoleKit.cmake @@ -0,0 +1,11 @@ +--- cmake/FindConsoleKit.cmake.orig 2021-05-19 07:41:26 UTC ++++ cmake/FindConsoleKit.cmake +@@ -25,7 +25,7 @@ + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #============================================================================= + find_program(cklistsessions_EXECUTABLE NAMES ck-list-sessions) +-find_program(qdbus_EXECUTABLE NAMES qdbus) ++find_program(qdbus_EXECUTABLE NAMES qdbus-qt5 qdbus) + find_package_handle_standard_args(ConsoleKit + FOUND_VAR + ConsoleKit_FOUND diff --git a/textproc/retext/Makefile b/textproc/retext/Makefile index 1aa45619719f..50bb27574e53 100644 --- a/textproc/retext/Makefile +++ b/textproc/retext/Makefile @@ -1,6 +1,6 @@ PORTNAME= retext DISTVERSION= 7.0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= arved@FreeBSD.org @@ -31,6 +31,6 @@ BINARY_ALIAS= lrelease=${LRELEASE} NO_ARCH= yes post-patch: - ${REINPLACE_CMD} -e "s,lrelease,${LOCALBASE}/bin/lrelease," ${WRKSRC}/setup.py + ${REINPLACE_CMD} -e "s,lrelease,${LRELEASE}," ${WRKSRC}/setup.py .include <bsd.port.mk> diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile index 2b75ff3fe26f..1af2b482cdca 100644 --- a/x11-toolkits/qt5-declarative/Makefile +++ b/x11-toolkits/qt5-declarative/Makefile @@ -1,6 +1,6 @@ PORTNAME= declarative DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -21,6 +21,8 @@ QT_BINARIES= yes QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge +TOOLS= qml qmlcachegen qmleasing qmlformat qmlimportscanner qmllint qmlmin \ + qmlplugindump qmlpreview qmlprofiler qmlscene qmltestrunner qmltyperegistrar post-patch: # qtdeclarative.pro wants to run python, replace that with PYTHON_CMD ${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \ diff --git a/x11-toolkits/qt5-quick3d/Makefile b/x11-toolkits/qt5-quick3d/Makefile index 5ef21a3faf88..e02d9c5b84e8 100644 --- a/x11-toolkits/qt5-quick3d/Makefile +++ b/x11-toolkits/qt5-quick3d/Makefile @@ -1,6 +1,6 @@ PORTNAME= quick3d DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -11,4 +11,6 @@ USES= compiler:c++11-lang qmake qt-dist:5 USE_QT= core declarative gui network opengl \ buildtools_build +QT_BINARIES= yes + .include <bsd.port.mk> diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile index 2073a36767a2..494138b058ae 100644 --- a/x11-toolkits/qt5-widgets/Makefile +++ b/x11-toolkits/qt5-widgets/Makefile @@ -1,6 +1,6 @@ PORTNAME= widgets DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -67,5 +67,6 @@ post-install: .endfor ${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qt5logo.png + ${RLN} ${STAGEDIR}${QT_BINDIR}/uic ${STAGEDIR}${PREFIX}/bin/uic-qt5 .include <bsd.port.mk> diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist index dfb2585415c1..eb3bda481e7f 100644 --- a/x11-toolkits/qt5-widgets/pkg-plist +++ b/x11-toolkits/qt5-widgets/pkg-plist @@ -489,6 +489,7 @@ %%DEBUG%%%%QT_LIBDIR%%/libQt5Widgets.so.%%FULLVER%%.debug %%QT_LIBDIR%%/metatypes/qt5widgets_metatypes.json %%QT_BINDIR%%/uic +bin/uic-qt5 %%DEBUG%%%%QT_BINDIR%%/uic.debug %%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_widgets_private.pri diff --git a/x11/dsbxinput/Makefile b/x11/dsbxinput/Makefile index 714fca5caa75..40ec285b54be 100644 --- a/x11/dsbxinput/Makefile +++ b/x11/dsbxinput/Makefile @@ -1,5 +1,6 @@ PORTNAME= dsbxinput DISTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= mk@nic-nac-project.org @@ -8,13 +9,14 @@ COMMENT= Graphical tool for configuring pointing devices LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= lrelease:devel/qt5-linguisttools RUN_DEPENDS= xinput:x11/xinput -USES= pyqt:5 python:3.7+ +USES= pyqt:5 python:3.7+ qt:5 +USE_QT= linguisttools_build USE_GITHUB= yes GH_ACCOUNT= mrclksr GH_PROJECT= DSBXinput USE_PYQT= core gui widgets +BINARY_ALIAS= lrelease=${LRELEASE} .include <bsd.port.mk> |