cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/qtkeychain: remove flavors (Qt4 deprecation)

Browse Source 
Approved by:	portmgr (implicit)
This commit is contained in:
Tobias C. Berner 2019-03-16 18:46:13 +00:00
parent 8f06b655c4
commit f7209ce4da
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=495941
14 changed files with 25 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MOVED
View File

@ -10018,8 +10018,6 @@ databases/php-memcached|databases/pecl-memcached|2018-03-10|Remove duplicate por
emulators/i386-wine-staging|emulators/i386-wine-devel|2018-03-10|Broken for months, abandoned upstream
archivers/quazip-qt5|archivers/quazip@qt5|2018-03-11|Moved to a flavoured version
devel/go-json-rest||2018-03-11|Go libraries aren't allowed (GH/ant0ine/go-json-rest)
security/qtkeychain-qt4|security/qtkeychain@qt4|2018-03-12|Moved to a flavoured version
security/qtkeychain-qt5|security/qtkeychain@qt5|2018-03-12|Moved to a flavoured version
devel/libdbusmenu-qt5|devel/libdbusmenu-qt@qt5|2018-03-12|Moved to a flavoured version
finance/electrum2|finance/electrum|2018-03-13|Has expired: Vulnerable legacy port, please use finance/electrum instead
math/py-gsl|math/py-pygsl|2018-03-13|Rename to match PyPI naming
@ -11672,3 +11670,5 @@ x11-fonts/mkfontdir|x11-fonts/mkfontscale|2019-03-11|Merged into one package
emulators/ppsspp-devel|emulators/ppsspp|2019-03-14|Out of date: use emulators/ppsspp for now
sysutils/polkit-qt@qt4||2019-03-16|Qt4 deprecation
sysutils/polkit-qt@qt5|sysutils/polkit-qt|2019-03-16|Flavor has been removed
security/qtkeychain@qt4||2019-03-16|Qt4 deprecation
security/qtkeychain@qt5|security/qtkeychain|2019-03-16|Flavor has been removed

1
astro/kstars/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= kstars
DISTVERSION= 3.1.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= astro kde
MASTER_SITES= KDE/stable/${PORTNAME}

4
deskutils/charmtimetracker/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= charmtimetracker
DISTVERSION= 1.12.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= deskutils
# PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@ -16,7 +16,7 @@ COMMENT= Time tracker
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
USES= cmake compiler:c++11-lib pkgconfig qt:5
CMAKE_ARGS= -DCharm_VERSION:STRING=${PORTVERSION}

4
deskutils/nextcloudclient/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= nextcloudclient
PORTVERSION= 0.0.0.20190207
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= deskutils
MAINTAINER= mr@FreeBSD.org
@ -12,7 +12,7 @@ COMMENT= NextCloud Desktop Syncing Client
LICENSE= GPLv2
LIB_DEPENDS= libinotify.so:devel/libinotify \
libqt5keychain.so:security/qtkeychain@qt5
libqt5keychain.so:security/qtkeychain
USES= cmake:noninja compiler:c++11-lib gmake iconv \
localbase:ldflags pkgconfig qt:5 sqlite ssl

4
deskutils/owncloudclient/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= owncloudclient
DISTVERSIONPREFIX= v
DISTVERSION= 2.4.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= deskutils
MAINTAINER= yonas@fizk.net
@ -14,7 +14,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libinotify.so:devel/libinotify \
libqt5keychain.so:security/qtkeychain@qt5
libqt5keychain.so:security/qtkeychain
USES= cmake:noninja compiler:c++11-lib gmake iconv kde:5 \
localbase:ldflags pkgconfig qt:5 sqlite

3
graphics/qgis-ltr/Makefile
View File

@ -4,6 +4,7 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
DISTVERSION= 3_4_5
PORTREVISION= 1
CATEGORIES= graphics geography
PKGNAMESUFFIX= -ltr
@ -68,7 +69,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libqca-qt5.so:devel/qca@qt5 \
libqjson-qt5.so:devel/qjson@qt5 \
libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
libqt5keychain.so:security/qtkeychain@qt5 \
libqt5keychain.so:security/qtkeychain \
libqwt6.so:x11-toolkits/qwt6@qt5 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \

4
graphics/qgis/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
DISTVERSION= 3_6_0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics geography
MAINTAINER= rhurlin@gwdg.de
@ -68,7 +68,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libqca-qt5.so:devel/qca@qt5 \
libqjson-qt5.so:devel/qjson@qt5 \
libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
libqt5keychain.so:security/qtkeychain@qt5 \
libqt5keychain.so:security/qtkeychain \
libqwt6.so:x11-toolkits/qwt6@qt5 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \

4
mail/trojita/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= trojita
PORTVERSION= 0.7
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/src/
@ -13,7 +13,7 @@ COMMENT= Fast cross-platform IMAP e-mail client using Qt 5 toolkit
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
CONFLICTS_INSTALL= trojita-qt4-[0-9]*
INSTALLS_ICONS= yes

3
net-im/quaternion/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= Quaternion
DISTVERSION= 0.0.9.4
DISTVERSIONSUFFIX= -beta1
PORTREVISION= 1
CATEGORIES= net-im
MAINTAINER= adridg@FreeBSD.org
@ -11,7 +12,7 @@ COMMENT= Matrix IM client based on Qt technologies
LICENSE= GPLv3
LICENSE_FILES= ${WRKSRC}/COPYING
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
libsecret-1.so:security/libsecret
BUILD_DEPENDS= libqmatrixclient>=0.5:net-im/libqmatrixclient

4
net/kio-gdrive/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= kio-gdrive
DISTVERSION= 1.2.5
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTNAME}
@ -13,7 +13,7 @@ COMMENT= KDE IOSlave for accessing gdrive
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain \
libaccounts-qt5.so:net-im/libaccounts-qt5 \
libkaccounts.so:net-im/kaccounts-integration
RUN_DEPENDS= kaccounts-providers>=0:net-im/kaccounts-providers

1
security/Makefile
View File

@ -1,4 +1,5 @@
# $FreeBSD$
PORTREVISION= 1
#
COMMENT = Security tools

26
security/qtkeychain/Makefile
View File

@ -3,9 +3,8 @@
PORTNAME= qtkeychain
DISTVERSIONPREFIX= v
DISTVERSION= 0.9.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security
PKGNAMESUFFIX= -${FLAVOR}
MAINTAINER= arrowd@FreeBSD.org
COMMENT= Platform independent Qt API for storing passwords
@ -13,29 +12,12 @@ COMMENT= Platform independent Qt API for storing passwords
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
FLAVORS= qt5 qt4
FLAVOR?= ${FLAVORS:[1]}
USES= cmake localbase:ldflags pkgconfig
USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig qt:5
USE_GITHUB= yes
USE_QT= core dbus linguisttools_build buildtools_build qmake_build
GH_ACCOUNT= frankosterfeld
USE_LDCONFIG= yes
PLIST_SUB+= VERSION=${PORTVERSION}
. if ${FLAVOR} == qt4
DEPRECATED= Qt4 has been EOL since december 2015
EXPIRATION_DATE=2019-03-15
USES+= qt:4
CMAKE_ON= BUILD_WITH_QT4
USE_QT= corelib dbus linguisttools_build moc_build rcc_build qmake_build
PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt
PLIST= ${PKGDIR}/pkg-plist.${FLAVOR}
. else
USES+= compiler:c++11-lang qt:5
USE_QT= core dbus linguisttools_build buildtools_build qmake_build
PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5
PLIST= ${PKGDIR}/pkg-plist.${FLAVOR}
. endif
PLIST_SUB= VERSION=${PORTVERSION}
OPTIONS_DEFINE= LIBSECRET
OPTIONS_DEFAULT= LIBSECRET

2
security/qtkeychain/pkg-plist.qt5 → security/qtkeychain/pkg-plist
View File

@ -1,6 +1,5 @@
include/qt5keychain/keychain.h
include/qt5keychain/qkeychain_export.h
%%QT_MKSPECDIR%%/modules/qt_Qt5Keychain.pri
lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake
lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake
lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
@ -8,5 +7,6 @@ lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends.cmake
lib/libqt5keychain.so
lib/libqt5keychain.so.%%VERSION%%
lib/libqt5keychain.so.1
%%QT_MKSPECDIR%%/modules/qt_Qt5Keychain.pri
%%QT_L10NDIR%%/qtkeychain_de.qm
%%QT_L10NDIR%%/qtkeychain_ro.qm

11
security/qtkeychain/pkg-plist.qt4
View File

@ -1,11 +0,0 @@
include/qtkeychain/keychain.h
include/qtkeychain/qkeychain_export.h
lib/cmake/QtKeychain/QtKeychainConfig.cmake
lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
lib/cmake/QtKeychain/QtKeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/QtKeychain/QtKeychainLibraryDepends.cmake
lib/libqtkeychain.so
lib/libqtkeychain.so.%%VERSION%%
lib/libqtkeychain.so.1
%%QT_L10NDIR%%/qtkeychain_de.qm
%%QT_L10NDIR%%/qtkeychain_ro.qm