diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile index 6caa55cc4f75..498c3e243410 100644 --- a/astro/kstars/Makefile +++ b/astro/kstars/Makefile @@ -1,36 +1,37 @@ PORTNAME= kstars DISTVERSION= 3.6.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= astro kde MASTER_SITES= KDE/stable/${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= KDE desktop planetarium LICENSE= GPLv2 LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ libindidriver.so:devel/indi \ - libqt5keychain.so:security/qtkeychain \ + libqt5keychain.so:security/qtkeychain@qt5 \ libraw.so:graphics/libraw \ libsecret-1.so:security/libsecret \ libstellarsolver.so:astro/stellarsolver \ libwcs.so:astro/wcslib BUILD_DEPENDS= xplanet:astro/xplanet RUN_DEPENDS= xplanet:astro/xplanet USES= cmake compiler:c++11-lib desktop-file-utils eigen:3 \ gettext gnome kde:5 localbase:ldflags pkgconfig qt:5 tar:xz USE_GNOME= glib20 USE_KDE= attica auth bookmarks codecs completion config configwidgets\ coreaddons crash dbusaddons guiaddons i18n \ iconthemes init itemviews jobwidgets kio newstuff notifications \ notifyconfig parts plotting service solid texteditor \ widgetsaddons xmlgui \ doctools_build ecm_build USE_QT= concurrent core datavis3d dbus declarative gui multimedia \ network opengl printsupport sql svg testlib websockets widgets \ xml \ buildtools_build qmake_build .include diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index f3c7479b9800..6c0518b17c35 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -1,90 +1,90 @@ PORTNAME= mixxx DISTVERSION= 2.3.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MAINTAINER= acm@FreeBSD.org COMMENT= DJ mixing application LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= lv2>=1.14.0:audio/lv2 LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ libFLAC.so:audio/flac \ libfftw3.so:math/fftw3 \ libhidapi.so:comms/hidapi \ libid3tag.so:audio/libid3tag \ libmad.so:audio/libmad \ libmodplug.so:audio/libmodplug \ libportaudio.so:audio/portaudio \ libSoundTouch.so:audio/soundtouch \ libebur128.so:audio/libebur128 \ librubberband.so:audio/rubberband \ libsndfile.so:audio/libsndfile \ libogg.so:audio/libogg \ libvorbisfile.so:audio/libvorbis \ libtag.so:audio/taglib \ libprotobuf.so:devel/protobuf \ liblilv-0.so:audio/lilv \ libportmidi.so:audio/portmidi \ libupower-glib.so:sysutils/upower \ libkeyfinder.so:audio/libkeyfinder \ libmp3lame.so:audio/lame USES= cmake compiler:c++11-lang gl iconv ninja qt:5 pkgconfig sqlite \ ssl xorg USE_XORG= ice sm x11 xext USE_GL= gl glu USE_GITHUB= yes GH_ACCOUNT= mixxxdj USE_QT= buildtools concurrent core dbus gui linguisttools_build network \ opengl qmake_build script scripttools sql sql-sqlite3 svg \ testlib x11extras xml xmlpatterns widgets CONFLICTS= mixxx22* CMAKE_ARGS+= -DINSTALL_USER_UDEV_RULES:BOOL=OFF \ -DOPTIMIZE:STRING=portable \ -DBATTERY:BOOL=OFF \ -DFAAD:BOOL=OFF \ -DMODPLUG:BOOL=ON \ -DMAD:BOOL=ON PORTDOCS= * OPTIONS_DEFINE= BROADCAST DOCS FFMPEG GPERFTOOLS HID OPUS \ QTKEYCHAIN WAVPACK OPTIONS_DEFAULT= BROADCAST FFMPEG HID OPUS QTKEYCHAIN WAVPACK OPTIONS_SUB= yes BROADCAST_DESC= Live Broadcasting (Shoutcast) support #BROADCAST_LIB_DEPENDS= libshout-idjc.so:audio/shout-idjc BROADCAST_CMAKE_BOOL= BROADCAST FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= FFMPEG GPERFTOOLS_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools GPERFTOOLS_CMAKE_BOOL= GPERFTOOLS HID_DESC= USB HID controllers support HID_CMAKE_BOOL= HID OPUS_LIB_DEPENDS= libopus.so:audio/opus \ libopusfile.so:audio/opusfile OPUS_CMAKE_BOOL= OPUS QTKEYCHAIN_DESC= Secure credentials storage for Live Broadcasting profiles -QTKEYCHAIN_LIB_DEPENDS= libqt5keychain.so:security/qtkeychain +QTKEYCHAIN_LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 QTKEYCHAIN_CMAKE_BOOL= QTKEYCHAIN WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CMAKE_BOOL= WAVPACK post-patch: @${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx|" \ ${WRKSRC}/res/linux/org.mixxx.Mixxx.desktop @${REINPLACE_CMD} -e "s,(Q_OS_LINUX),(Q_OS_LINUX) || defined(Q_OS_FREEBSD),g" \ ${WRKSRC}/src/util/screensaver.h @${REINPLACE_CMD} -e "s|QUIET hidapi-libusb|QUIET hidapi|" \ ${WRKSRC}/cmake/modules/Findhidapi.cmake .for i in midi/midimessage.h @${ECHO_CMD} >> ${WRKSRC}/src/controllers/${i} .endfor .include diff --git a/deskutils/akonadi-import-wizard/Makefile b/deskutils/akonadi-import-wizard/Makefile index 591324efb699..e0bd30131b86 100644 --- a/deskutils/akonadi-import-wizard/Makefile +++ b/deskutils/akonadi-import-wizard/Makefile @@ -1,32 +1,33 @@ PORTNAME= akonadi-import-wizard DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Import data from other mail clients to KMail LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ libgpgmepp.so:security/gpgme-cpp \ libqgpgme.so:security/gpgme-qt5 \ - libqt5keychain.so:security/qtkeychain + libqt5keychain.so:security/qtkeychain@qt5 USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= archive auth codecs completion config configwidgets coreaddons \ crash dbusaddons i18n itemmodels kio service wallet \ widgetsaddons xmlgui \ ecm_build # pim components USE_KDE+= akonadi akonadicontacts akonadimime contacts grantleetheme \ identitymanagement imap libkdepim libkleo mailcommon mailimporter \ mailtransport messagelib mime pimcommon pimtextedit USE_QT= concurrent core dbus gui network widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr OPTIONS_DEFINE= DOCS .include diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile index 4daedc7486cb..1ae5f2a4d607 100644 --- a/deskutils/charmtimetracker/Makefile +++ b/deskutils/charmtimetracker/Makefile @@ -1,31 +1,31 @@ PORTNAME= charmtimetracker DISTVERSION= 1.12.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils # PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ MAINTAINER= adridg@FreeBSD.org COMMENT= Time tracker # The top-level license file is GPLv2, but all the sources say # (at your option) GPLv2+ . LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libqt5keychain.so:security/qtkeychain +LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 USES= cmake compiler:c++11-lib pkgconfig qt:5 xorg CMAKE_ARGS= -DCharm_VERSION:STRING=${PORTVERSION} USE_GITHUB= yes GH_ACCOUNT= KDAB GH_PROJECT= Charm USE_QT= core dbus gui \ network printsupport script sql sql-sqlite3 \ widgets xml \ buildtools_build qmake_build testlib_build USE_XORG= ice x11 xcb xext xscrnsaver .include diff --git a/deskutils/kdepim-runtime/Makefile b/deskutils/kdepim-runtime/Makefile index b6d010f43f32..ca6aaa096bef 100644 --- a/deskutils/kdepim-runtime/Makefile +++ b/deskutils/kdepim-runtime/Makefile @@ -1,41 +1,41 @@ PORTNAME= kdepim-runtime DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE PIM tools and services LICENSE= LGPL21 LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libcurl.so:ftp/curl \ libkolabxml.so:textproc/libkolabxml \ libsasl2.so:security/cyrus-sasl2 \ libxerces-c-3.2.so:textproc/xerces-c3 \ - libqt5keychain.so:security/qtkeychain + libqt5keychain.so:security/qtkeychain@qt5 USES= cmake:noninja compiler:c++11-lib gettext kde:5 qca qt:5 \ shared-mime-info tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons guiaddons holidays i18n iconthemes \ itemmodels itemviews jobwidgets kcmutils kdav kdelibs4support kio \ kross notifications notifyconfig parts service solid sonnet \ textwidgets unitconversion wallet widgetsaddons windowsystem \ xmlgui # pim components USE_KDE+= akonadi akonadicontacts akonadimime akonadinotes \ akonadicalendar akonadisearch calendarcore \ calendarutils contacts gapi grantleetheme identitymanagement imap \ kontactinterface ldap libkdepim mailtransport mbox mime pimcommon \ pimtextedit syndication USE_QT= concurrent core dbus declarative gui location network networkauth printsupport speech \ script webchannel webengine widgets xml xmlpatterns \ buildtools_build qmake_build USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr OPTIONS_DEFINE= DOCS .include diff --git a/deskutils/kmail/Makefile b/deskutils/kmail/Makefile index 9f8d471360e0..c48695274977 100644 --- a/deskutils/kmail/Makefile +++ b/deskutils/kmail/Makefile @@ -1,47 +1,48 @@ PORTNAME= kmail DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE mail client LICENSE= LGPL21 LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ libgpgmepp.so:security/gpgme-cpp \ libqgpgme.so:security/gpgme-qt5 \ - libqt5keychain.so:security/qtkeychain + libqt5keychain.so:security/qtkeychain@qt5 RUN_DEPENDS= accountwizard:deskutils/kmail-account-wizard \ akonadiimportwizard:deskutils/akonadi-import-wizard \ mboximporter:deskutils/mbox-importer \ sieveeditor:deskutils/pim-sieve-editor USES= cmake compiler:c++11-lib cpe desktop-file-utils gettext kde:5 qt:5 tar:xz CPE_VENDOR= kde USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons guiaddons i18n iconthemes imap \ itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \ notifications notifyconfig parts service solid sonnet \ syntaxhighlighting texteditor textwidgets unitconversion wallet \ widgetsaddons windowsystem xmlgui \ ecm_build # pim components USE_KDE+= akonadi akonadicontacts akonadimime akonadisearch calendarcore \ calendarutils contacts gravatar grantleetheme \ identitymanagement libkdepim libkleo libksieve \ kontactinterface ldap mailcommon mailtransport messagelib \ mime pimcommon pimtextedit tnef \ kdepim-runtime5_run USE_QT= concurrent core dbus declarative gui location network printsupport \ webchannel webengine widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr OPTIONS_DEFINE= DOCS .include diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile index 1aadc00f9675..396c9f988fb6 100644 --- a/deskutils/nextcloudclient/Makefile +++ b/deskutils/nextcloudclient/Makefile @@ -1,70 +1,70 @@ PORTNAME= nextcloudclient PORTVERSION= 3.5.3 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= deskutils MAINTAINER= mr@FreeBSD.org COMMENT= NextCloud Desktop Syncing Client LICENSE= GPLv2 BUILD_DEPENDS= inkscape:graphics/inkscape LIB_DEPENDS= libinotify.so:devel/libinotify \ - libqt5keychain.so:security/qtkeychain + libqt5keychain.so:security/qtkeychain@qt5 USES= cmake:noninja compiler:c++14-lang desktop-file-utils gmake \ gnome iconv localbase:ldflags pkgconfig qt:5 shared-mime-info \ sqlite ssl USE_QT= buildtools_build concurrent core dbus declarative graphicaleffects \ gui linguist_build location network printsupport qmake_build \ quickcontrols2 sql svg testlib webchannel websockets \ widgets xml CMAKE_ARGS= -DBUILD_UPDATER:BOOL=OFF \ -DCMAKE_INSTALL_MANDIR:STRING=man \ -DWITH_STACK_PROTECTOR:BOOL=OFF USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= nextcloud GH_PROJECT= desktop #OPTIONS_DEFINE= DEBUG DOCS OPTIONS_DEFINE= DEBUG WEBENGINE # DOCS doesn't build currently OPTIONS_DEFAULT_amd64= WEBENGINE OPTIONS_DEFAULT_i386= WEBENGINE OPTIONS_DEFAULT_aarch64= WEBENGINE WEBENGINE_DESC= QT5 Webengine support #DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ # doxygen:devel/doxygen #DOCS_USE= tex=dvipsk:build,latex:build #DOCS_CMAKE_ON= -DWITH_DOC:BOOL=ON WEBENGINE_VARS= USE_QT+=webengine PLIST_SUB= VERSION=${PORTVERSION} .include .ifdef WITH_DEBUG CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Debug .endif post-patch: @${REINPLACE_CMD} -e \ 's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt post-patch-WEBENGINE-off: @${REINPLACE_CMD} -e '/^find_package.*COMPONENTS WebEngineWidgets WebEngine/d' \ ${WRKSRC}/src/CMakeLists.txt pre-configure: @(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample) post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sync-exclude.lst ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile index 4d4832f40bbe..12a3c8d3ed25 100644 --- a/deskutils/owncloudclient/Makefile +++ b/deskutils/owncloudclient/Makefile @@ -1,46 +1,47 @@ PORTNAME= owncloudclient DISTVERSION= 2.8.2 DISTVERSIONSUFFIX= .4246 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= https://download.owncloud.com/desktop/ownCloud/stable/${DISTVERSION}${DISTVERSIONSUFFIX}/source/ DISTNAME= ownCloud-${DISTVERSION}${DISTVERSIONSUFFIX} PATCH_SITES= https://github.com/owncloud/client/commit/ PATCHFILES= ff43c9394b45dd78106069ba89ae92f25abba158.patch:-p1 MAINTAINER= daniel@morante.net COMMENT= OwnCloud Desktop Syncing Client LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libinotify.so:devel/libinotify \ - libqt5keychain.so:security/qtkeychain + libqt5keychain.so:security/qtkeychain@qt5 USES= cmake:noninja compiler:c++11-lib desktop-file-utils gmake \ iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \ sqlite tar:xz USE_KDE= completion config coreaddons jobwidgets kio service \ widgetsaddons windowsystem USE_LDCONFIG= yes USE_QT= concurrent core dbus gui network sql webkit widgets xml \ buildtools_build linguist_build qmake_build CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:STRING=man \ -DSYSCONF_INSTALL_DIR="${PREFIX}/etc" CMAKE_OFF= BUILD_WITH_QT4 WITH_DOC WITH_STACK_PROTECTOR PLIST_SUB= VERSION=${PORTVERSION} OPTIONS_DEFINE= DEBUG DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE:STRING=Debug post-patch: @${REINPLACE_CMD} -e \ 's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt pre-configure: @cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample .include diff --git a/deskutils/pim-sieve-editor/Makefile b/deskutils/pim-sieve-editor/Makefile index 9e18800dab43..252409b39dfa 100644 --- a/deskutils/pim-sieve-editor/Makefile +++ b/deskutils/pim-sieve-editor/Makefile @@ -1,25 +1,26 @@ PORTNAME= pim-sieve-editor DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Mail sieve editor -LIB_DEPENDS= libqt5keychain.so:security/qtkeychain +LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs config configwidgets coreaddons crash \ dbusaddons i18n iconthemes kio service wallet \ widgetsaddons xmlgui \ ecm_build # pim components USE_KDE+= libksieve mailtransport pimcommon USE_QT= concurrent core dbus gui network widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr OPTIONS_DEFINE= DOCS .include diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index 3f8650a94160..ec4578892875 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -1,182 +1,182 @@ PORTNAME= qgis DISTVERSION= 3.22.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ PKGNAMESUFFIX= -ltr MAINTAINER= rhurlin@FreeBSD.org COMMENT= Free and Open Source Geographic Information System LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/LICENSE BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \ opencl>=0:devel/opencl \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.24.1:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libgsl.so:math/gsl \ libhdf5.so:science/hdf5 \ liblazperf.so:archivers/lazperf \ libmdal.so:math/mdal \ libnetcdf.so:science/netcdf \ libOpenCL.so:devel/ocl-icd \ libpdal_base.so:math/pdal \ libproj.so:graphics/proj \ libprotobuf-lite.so:devel/protobuf \ libqjson-qt5.so:devel/qjson \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ - libqt5keychain.so:security/qtkeychain \ + libqt5keychain.so:security/qtkeychain@qt5 \ libqwt6.so:x11-toolkits/qwt6 \ libspatialindex.so:devel/spatialindex \ libspatialite.so:databases/spatialite \ libsz.so:science/libaec \ libxerces-c.so:textproc/xerces-c3 \ libzip.so:archivers/libzip \ libzstd.so:archivers/zstd RUN_DEPENDS= astyle:devel/astyle \ opencl>=0:devel/opencl \ ${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.24.1:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} ### Fortran is needed by numpy, GRASS, etc. USES= bison cmake compiler:features desktop-file-utils \ fortran gl gmake gnome pgsql pyqt:5 python:3.7+ qca qt:5 \ shebangfix sqlite:3 tar:bz2 USE_GL= gl USE_GNOME= libxml2 USE_LDCONFIG= yes USE_PYQT= pyqt5 qscintilla2 pysip sip USE_QT= 3d buildtools_build core concurrent dbus declarative \ designer_build qdoc_build gamepad gui linguist_build location \ network printsupport qmake_build script serialport \ sql sql-pgsql sql-sqlite3 svg uitools_build \ webengine webkit widgets xml SHEBANG_FILES= src/plugins/grass/scripts/*.py CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \ -DLazPerf_INCLUDE_DIR:PATH=${LOCALBASE}/include/lazperf \ -DWITH_INTERNAL_MDAL:BOOL=false \ -DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \ -DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \ -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \ -DQGIS_MANUAL_SUBDIR:PATH=share/man CMAKE_ON= USE_OPENCL WITH_3D WITH_ASTYLE \ WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_POSTGRESQL \ WITH_PDAL CMAKE_OFF= ENABLE_TESTS WITH_QWTPOLAR CONFLICTS_INSTALL= qgis PLIST_SUB= DISTVERSION=${DISTVERSION} .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev CMAKE_OFF+= SUPPRESS_QT_WARNINGS .endif OPTIONS_DEFINE= GRASS SERVER OPTIONS_DEFAULT= GRASS SERVER NO_OPTIONS_SORT= yes OPTIONS_SUB= yes SERVER_DESC= Enable QGIS server GRASS_BUILD_DEPENDS= grass7:databases/grass7 GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS} GRASS_CMAKE_BOOL= WITH_GRASS7 SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE .include # QGIS requires flex >= 2.5.6, see # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501) BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex .endif post-patch: # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances # See bugs 242557 and 241687. .if ${OPSYS} == FreeBSD && ${ARCH} == "i386" @${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \ ${WRKSRC}/src/core/CMakeLists.txt .endif pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 post-install: @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak @${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete @${RM} /tmp/srs.db check: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index de2cb256d8d3..06dfa580e51a 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -1,178 +1,178 @@ PORTNAME= qgis DISTVERSION= 3.26.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ MAINTAINER= rhurlin@FreeBSD.org COMMENT= Free and Open Source Geographic Information System LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/LICENSE BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \ opencl>=0:devel/opencl \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.25.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libgsl.so:math/gsl \ libhdf5.so:science/hdf5 \ libmdal.so:math/mdal \ libnetcdf.so:science/netcdf \ libOpenCL.so:devel/ocl-icd \ libpdal_base.so:math/pdal \ libproj.so:graphics/proj \ libprotobuf-lite.so:devel/protobuf \ libqjson-qt5.so:devel/qjson \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ - libqt5keychain.so:security/qtkeychain \ + libqt5keychain.so:security/qtkeychain@qt5 \ libqwt6.so:x11-toolkits/qwt6 \ libspatialindex.so:devel/spatialindex \ libspatialite.so:databases/spatialite \ libsz.so:science/libaec \ libxerces-c.so:textproc/xerces-c3 \ libzip.so:archivers/libzip \ libzstd.so:archivers/zstd RUN_DEPENDS= astyle:devel/astyle \ opencl>=0:devel/opencl \ ${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Fiona>=0:graphics/py-fiona@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gdal>=3.1.0:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}geopandas>=0.7.0:graphics/py-geopandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.17.3:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jedi>=0.12.1:devel/py-jedi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1.1:textproc/py-markupsafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.25.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rasterio>=0:graphics/py-rasterio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} ### Fortran is needed by numpy, GRASS, etc. USES= bison cmake compiler:features desktop-file-utils \ fortran gl gmake gnome pgsql pyqt:5 python:3.7+ qca qt:5 \ shebangfix sqlite:3 tar:bz2 USE_GL= gl USE_GNOME= libxml2 USE_LDCONFIG= yes USE_PYQT= pyqt5 qscintilla2 pysip sip USE_QT= 3d buildtools_build core concurrent dbus declarative \ designer_build qdoc_build gamepad gui linguist_build location \ network printsupport qmake_build script serialport \ sql sql-pgsql sql-sqlite3 svg uitools_build \ webengine webkit widgets xml SHEBANG_FILES= src/plugins/grass/scripts/*.py CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \ -DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \ -DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \ -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \ -DQGIS_MANUAL_SUBDIR:PATH=share/man CMAKE_ON= USE_OPENCL WITH_3D WITH_ASTYLE \ WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_EPT WITH_INTERNAL_LAZPERF \ WITH_POSTGRESQL WITH_PDAL CMAKE_OFF= ENABLE_TESTS WITH_INTERNAL_MDAL WITH_QWTPOLAR CONFLICTS_INSTALL= qgis-ltr PLIST_SUB= DISTVERSION=${PORTVERSION} .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev CMAKE_OFF+= SUPPRESS_QT_WARNINGS .endif OPTIONS_DEFINE= GRASS SERVER OPTIONS_DEFAULT= GRASS SERVER NO_OPTIONS_SORT= yes OPTIONS_SUB= yes SERVER_DESC= Enable QGIS server GRASS_BUILD_DEPENDS= grass7:databases/grass7 GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS} GRASS_CMAKE_BOOL= WITH_GRASS7 SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE .include # QGIS requires flex >= 2.5.6, see # https://github.com/qgis/QGIS/blob/fb0f334b06e0828e5695ffcaa7c7eb82d6516cb0/INSTALL.md .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1300501) BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/flex .endif post-patch: # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances # See bugs 242557 and 241687. .if ${OPSYS} == FreeBSD && ${ARCH} == "i386" @${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \ ${WRKSRC}/src/core/CMakeLists.txt .endif pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 post-install: @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak @${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete @${RM} /tmp/srs.db check: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile index 551fb6c55206..9112bc187b59 100644 --- a/mail/trojita/Makefile +++ b/mail/trojita/Makefile @@ -1,29 +1,29 @@ PORTNAME= trojita PORTVERSION= 0.7 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/src/ MAINTAINER= marco.broeder@posteo.eu COMMENT= Fast cross-platform IMAP e-mail client using Qt 5 toolkit LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -LIB_DEPENDS= libqt5keychain.so:security/qtkeychain +LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 USE_LDCONFIG= yes CPE_VENDOR= trojita_project CMAKE_ARGS+= -DWITH_CLEARTEXT_PLUGIN:STRING=ON -DWITH_DBUS:STRING=ON \ -DWITH_DESKTOP:STRING=ON \ -DWITH_QTKEYCHAIN_PLUGIN:STRING=ON -DWITH_RAGEL:STRING=OFF \ -DWITH_SHARED_PLUGINS:STRING=ON -DWITH_TESTS:STRING=OFF \ -DWITH_ZLIB:STRING=ON \ -DWITH_QT5:STRING=ON USES= cmake compiler:c++11-lib cpe desktop-file-utils gnome \ localbase:ldflags qt:5 tar:xz USE_QT= buildtools_build linguisttools_build qmake_build \ core dbus gui network sql sql-sqlite3 svg webkit widgets .include diff --git a/net-im/chatterino2/Makefile b/net-im/chatterino2/Makefile index 145e698ce8ed..2f1f70d6b48b 100644 --- a/net-im/chatterino2/Makefile +++ b/net-im/chatterino2/Makefile @@ -1,42 +1,42 @@ PORTNAME= chatterino2 PORTVERSION= 2.3.4 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= net-im MAINTAINER= swills@FreeBSD.org COMMENT= Twitch chat client LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rapidjson>0:devel/rapidjson \ websocketpp>=0:devel/websocketpp LIB_DEPENDS= libboost_system.so:devel/boost-libs \ - libqt5keychain.so:security/qtkeychain + libqt5keychain.so:security/qtkeychain@qt5 USES= compiler:c++17-lang gl pkgconfig qmake qt:5 ssl USE_QT= concurrent core gui multimedia network svg widgets \ buildtools_build qmake_build USE_GL= gl PLIST_FILES= bin/chatterino \ share/appdata/com.chatterino.chatterino.appdata.xml \ share/applications/com.chatterino.chatterino.desktop \ share/icons/hicolor/256x256/apps/chatterino.png USE_GITHUB= yes GH_ACCOUNT= chatterino GH_TUPLE= Chatterino:libcommuni:c613600e:communi/lib/libcommuni \ pajlada:serialize:7d37cbf:serialize/lib/serialize \ pajlada:settings:7cf8431d:settings/lib/settings \ pajlada:signals:baf5bb0:signals/lib/signals QMAKE_ENV= GIT_COMMIT=${COMMIT_ID} \ GIT_RELEASE=${DISTVERSIONPREFIX}${PORTVERSION} QMAKE_ARGS= INCLUDEPATH+=${LOCALBASE}/include/qt5keychain \ LIBS+=-lqt5keychain \ WEBSOCKETPP_SYSTEM=1 \ RAPIDJSON_SYSTEM=1 .include diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile index 7f290791fd0a..66c49194c18b 100644 --- a/net-im/neochat/Makefile +++ b/net-im/neochat/Makefile @@ -1,30 +1,31 @@ PORTNAME= neochat DISTVERSION= 22.04 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= KDE/stable/plasma-mobile/${DISTVERSION} MAINTAINER= adridg@FreeBSD.org COMMENT= Glossy Matrix IM client based on KDE technologies LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-3.0-only.txt LIB_DEPENDS= libcmark.so:textproc/cmark \ - libqt5keychain.so:security/qtkeychain + libqt5keychain.so:security/qtkeychain@qt5 BUILD_DEPENDS= libquotient>=0.6.11:net-im/libquotient \ kquickimageeditor>=0.2.0:graphics/kquickimageeditor \ ${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro # Quotient is a static lib, doesn't need to be in RUN_DEPENDS RUN_DEPENDS= kquickimageeditor>=0.2.0:graphics/kquickimageeditor USES= cmake compiler:c++17-lang gl kde:5 pkgconfig qt:5 tar:xz USE_GL= gl USE_QT= core dbus declarative graphicaleffects gui imageformats \ multimedia network quickcontrols quickcontrols2 \ svg widgets xml \ buildtools_build linguist_build qmake_build USE_KDE= config coreaddons dbusaddons i18n itemmodels kirigami2 notifications \ qqc2-desktop-style \ ecm_build .include diff --git a/net-im/nheko/Makefile b/net-im/nheko/Makefile index 4b76d9a1e9ce..6c93522abf98 100644 --- a/net-im/nheko/Makefile +++ b/net-im/nheko/Makefile @@ -1,46 +1,46 @@ PORTNAME= nheko DISTVERSIONPREFIX=v DISTVERSION= 0.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org COMMENT= Matrix IM client based on Qt technologies LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= nlohmann-json>=3:devel/nlohmann-json \ asciidoc>=10:textproc/asciidoc # All those boost-libs are pulled in through mtxclient, which # links to them but stage-qa still complains. LIB_DEPENDS= \ libcmark.so:textproc/cmark \ libcoeurl.so:ftp/coeurl \ libfmt.so:devel/libfmt \ liblmdb.so:databases/lmdb \ libmatrix_client.so:net-im/mtxclient \ libolm.so:security/olm \ - libqt5keychain.so:security/qtkeychain \ + libqt5keychain.so:security/qtkeychain@qt5 \ libspdlog.so:devel/spdlog USES= cmake compiler:c++17-lang desktop-file-utils \ localbase:ldflags pkgconfig qt:5 ssl tar:xz USE_QT= concurrent core dbus declarative gui multimedia network \ quickcontrols2 svg widgets \ graphicaleffects_run \ buildtools_build linguist_build qmake_build # There is one external dependency: lmdb++ # - lmdb++ is a single header file, it just needs to be included CMAKE_ARGS= -DLMDBXX_INCLUDE_DIR=${WRKSRC}/deps/lmdb \ -DVOIP=OFF \ -DCMAKE_INSTALL_MANDIR=share/man CFLAGS+= -DSPDLOG_FMT_EXTERNAL=1 LDFLAGS+= -L${LOCALBASE}/lib -lfmt USE_GITHUB= yes GH_ACCOUNT= Nheko-Reborn GH_TUPLE= hoytech:lmdbxx:029fb681213af3020f5e3a86045445552bd024c5:lmdb/deps/lmdb .include diff --git a/net-im/quaternion/Makefile b/net-im/quaternion/Makefile index 9615bd1d89b7..1ea703bb31c8 100644 --- a/net-im/quaternion/Makefile +++ b/net-im/quaternion/Makefile @@ -1,27 +1,27 @@ PORTNAME= Quaternion DISTVERSION= 0.0.95-beta3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org COMMENT= Matrix IM client based on Qt technologies LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \ +LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \ libsecret-1.so:security/libsecret BUILD_DEPENDS= libquotient>=0.6.11:net-im/libquotient # Quotient is a static lib, doesn't need to be in RUN_DEPENDS USES= cmake compiler:c++17-lang gettext-runtime gnome \ localbase:ldflags qt:5 tar:xz USE_GNOME= glib20 USE_QT= core dbus declarative gui multimedia network widgets \ quickcontrols quickcontrols2 \ buildtools_build linguist_build qmake_build USE_GITHUB= yes GH_ACCOUNT= quotient-im .include diff --git a/net-im/ruqola/Makefile b/net-im/ruqola/Makefile index 5e9306e80c35..2244b9cc5627 100644 --- a/net-im/ruqola/Makefile +++ b/net-im/ruqola/Makefile @@ -1,28 +1,29 @@ PORTNAME= ruqola MASTER_SITES= KDE/stable/${PORTNAME}/ DISTVERSION= 1.7.4 +PORTREVISION= 1 CATEGORIES= net-im kde MAINTAINER= kde@FreeBSD.org COMMENT= Rocket.Chat client LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \ +LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \ libsecret-1.so:security/libsecret USES= cmake compiler:c++11-lang gnome kde:5 localbase:ldflags qt:5 tar:xz USE_GNOME= glib20 USE_KDE= auth codecs completion config configwidgets coreaddons crash \ dbusaddons i18n iconthemes idletime itemviews jobwidgets kio kirigami2 \ notifications notifyconfig prison service solid sonnet syntaxhighlighting \ textwidgets widgetsaddons windowsystem xmlgui \ doctools_build ecm_build USE_QT= concurrent core dbus declarative declarative gui multimedia \ network networkauth speech xml websockets widgets \ buildtools_build qmake_build testlib_build PLIST_SUB= SO_VER=${DISTVERSION} .include diff --git a/net-im/spectral/Makefile b/net-im/spectral/Makefile index fcfb6d146307..216b70d5f404 100644 --- a/net-im/spectral/Makefile +++ b/net-im/spectral/Makefile @@ -1,39 +1,39 @@ PORTNAME= spectral PORTVERSION= 817 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org COMMENT= Glossy Matrix IM client based on Qt technologies LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \ +LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \ libcmark.so:textproc/cmark USES= cmake compiler:c++17-lang gl pkgconfig qt:5 tar:bz2 USE_GL= gl USE_QT= core dbus declarative graphicaleffects gui imageformats \ multimedia network quickcontrols quickcontrols2 svg widgets \ buildtools_build linguist_build qmake_build testlib_build CMAKE_ON= USE_INTREE_LIBQMC SFPMNAME= SortFilterProxyModel SFPMVERSION= 36befddf5d57faad990e72c88c5844794f274145 QUOTNAME= libQuotient QUOTVERSION= 58dfe74390ebdd8ec6611d3b8fecfe7d051ff955 DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:spectral \ ${SFPMVERSION}.zip:sfpm \ ${QUOTVERSION}.zip:quot MASTER_SITES= https://gitlab.com/spectral-im/spectral/-/archive/${PORTVERSION}/:spectral \ https://github.com/oKcerG/${SFPMNAME}/archive/:sfpm \ https://github.com/quotient-im/${QUOTNAME}/archive/:quot post-extract: ${RMDIR} ${WRKSRC}/include/${SFPMNAME} ${WRKSRC}/include/${QUOTNAME} ${LN} -s ${WRKDIR}/${SFPMNAME}-${SFPMVERSION} ${WRKSRC}/include/${SFPMNAME} ${LN} -s ${WRKDIR}/${QUOTNAME}-${QUOTVERSION} ${WRKSRC}/include/${QUOTNAME} .include diff --git a/net/kio-gdrive/Makefile b/net/kio-gdrive/Makefile index 365be67ad68e..3690e8c6a8c4 100644 --- a/net/kio-gdrive/Makefile +++ b/net/kio-gdrive/Makefile @@ -1,27 +1,28 @@ PORTNAME= kio-gdrive DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE IOSlave for accessing gdrive LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \ +LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \ libaccounts-qt5.so:net-im/libaccounts-qt5 \ libkaccounts.so:net-im/kaccounts-integration RUN_DEPENDS= kaccounts-providers>=0:net-im/kaccounts-providers USES= cmake gettext gnome kde:5 pkgconfig qt:5 tar:xz USE_GNOME= intltool USE_KDE= completion config coreaddons i18n jobwidgets kio \ notifications service solid widgetsaddons windowsystem \ gapi \ ecm_build USE_QT= concurrent core dbus gui network widgets xml \ buildtools_build qmake_build OPTIONS_DEFINE= DOCS .include diff --git a/net/kldap/Makefile b/net/kldap/Makefile index 4bbd45d60e18..07f9be6ce654 100644 --- a/net/kldap/Makefile +++ b/net/kldap/Makefile @@ -1,27 +1,28 @@ PORTNAME= kldap DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= LDAP access API for KDE LICENSE= LGPL21 LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ - libqt5keychain.so:security/qtkeychain + libqt5keychain.so:security/qtkeychain@qt5 USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= completion config coreaddons i18n kio widgetsaddons service \ ecm_build # pim components USE_KDE+= mbox USE_QT= concurrent core dbus gui network widgets \ buildtools_build qmake_build USE_OPENLDAP= yes USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr OPTIONS_DEFINE= DOCS .include diff --git a/net/kmailtransport/Makefile b/net/kmailtransport/Makefile index 11b10809d24b..4b2e4cd21b6b 100644 --- a/net/kmailtransport/Makefile +++ b/net/kmailtransport/Makefile @@ -1,27 +1,28 @@ PORTNAME= kmailtransport DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE library to managing mail transport LICENSE= LGPL21 LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ - libqt5keychain.so:security/qtkeychain + libqt5keychain.so:security/qtkeychain@qt5 USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons i18n \ itemmodels jobwidgets kcmutils kio service solid wallet \ widgetsaddons windowsystem # pim components USE_KDE+= akonadi akonadimime gapi ksmtp mime pimcommon USE_QT= concurrent core dbus gui network widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr OPTIONS_DEFINE= DOCS .include diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile index 036e9bb8f271..a862aa980934 100644 --- a/security/qtkeychain/Makefile +++ b/security/qtkeychain/Makefile @@ -1,30 +1,45 @@ PORTNAME= qtkeychain DISTVERSIONPREFIX= v DISTVERSION= 0.13.2 +PORTREVISION= 1 CATEGORIES= security +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= arrowd@FreeBSD.org COMMENT= Platform independent Qt API for storing passwords LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig qt:5 +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig qt:${FLAVOR:S/qt//} +_WITH_QT6_qt5= OFF +_WITH_QT6_qt6= ON +CMAKE_ARGS= -DBUILD_WITH_QT6=${_WITH_QT6_${FLAVOR}} \ + -DQT_MKSPECDIR_REL=${QT_MKSPECDIR_REL} USE_GITHUB= yes -USE_QT= core dbus buildtools_build qmake_build +_USE_QT_qt5= core dbus buildtools_build qmake_build +_USE_QT_qt6= base +USE_QT= ${_USE_QT_${FLAVOR}} GH_ACCOUNT= frankosterfeld USE_LDCONFIG= yes OPTIONS_SUB= yes -PLIST_SUB= VERSION=${PORTVERSION} +PLIST_SUB= VERSION=${PORTVERSION} \ + QT_VER=${FLAVOR:S/qt//} + OPTIONS_DEFINE= LIBSECRET NLS OPTIONS_DEFAULT= LIBSECRET NLS LIBSECRET_DESC= Enable libsecret backend LIBSECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret LIBSECRET_CMAKE_BOOL= LIBSECRET_SUPPORT -NLS_USE= qt=linguisttools_build +_QT_LINGUIST_qt5= linguisttools_build +_QT_LINGUIST_qt6= tools_build +NLS_USE= qt=${_QT_LINGUIST_${FLAVOR}} NLS_CMAKE_BOOL= BUILD_TRANSLATIONS .include diff --git a/security/qtkeychain/files/patch-cmake_Modules_ECMGeneratePriFile.cmake b/security/qtkeychain/files/patch-cmake_Modules_ECMGeneratePriFile.cmake new file mode 100644 index 000000000000..2ea456dc68d9 --- /dev/null +++ b/security/qtkeychain/files/patch-cmake_Modules_ECMGeneratePriFile.cmake @@ -0,0 +1,11 @@ +--- cmake/Modules/ECMGeneratePriFile.cmake.orig 2022-08-27 09:22:23 UTC ++++ cmake/Modules/ECMGeneratePriFile.cmake +@@ -92,7 +92,7 @@ else() + query_qmake(qt_host_data_dir QT_HOST_DATA) + set(ECM_MKSPECS_INSTALL_DIR ${qt_host_data_dir}/mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.") + else() +- set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.") ++ set(ECM_MKSPECS_INSTALL_DIR ${QT_MKSPECDIR_REL}/modules CACHE PATH "The directory where mkspecs will be installed to.") + endif() + + function(ECM_GENERATE_PRI_FILE) diff --git a/security/qtkeychain/pkg-plist b/security/qtkeychain/pkg-plist index ec2191b384d7..84ebad9bbca1 100644 --- a/security/qtkeychain/pkg-plist +++ b/security/qtkeychain/pkg-plist @@ -1,15 +1,15 @@ -include/qt5keychain/keychain.h -include/qt5keychain/qkeychain_export.h -lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake -lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake -lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends.cmake -lib/libqt5keychain.so -lib/libqt5keychain.so.%%VERSION%% -lib/libqt5keychain.so.1 -%%QT_MKSPECDIR%%/modules/qt_Qt5Keychain.pri +include/qt%%QT_VER%%keychain/keychain.h +include/qt%%QT_VER%%keychain/qkeychain_export.h +lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainConfig.cmake +lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainConfigVersion.cmake +lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt%%QT_VER%%Keychain/Qt%%QT_VER%%KeychainLibraryDepends.cmake +lib/libqt%%QT_VER%%keychain.so +lib/libqt%%QT_VER%%keychain.so.%%VERSION%% +lib/libqt%%QT_VER%%keychain.so.1 +%%QT_MKSPECDIR%%/modules/qt_Qt%%QT_VER%%Keychain.pri %%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_de.qm %%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_fr.qm %%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_ro.qm %%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_ru.qm %%NLS%%%%QT_DATADIR%%keychain/translations/qtkeychain_zh.qm