I was not able to make qtkeychain package for this new version. It builds, but fails on `make package`. My ports tree is up to date, did I miss some patch?
`/usr/ports/pobj/qtkeychain-0.10.0/fake-amd64/.fake_done' is up to date. ===> Building package for qtkeychain-0.10.0 Create /usr/ports/packages/amd64/all/qtkeychain-0.10.0.tgz Error: Libraries in packing-lists in the ports tree and libraries from installed packages don't match --- /tmp/dep_cache.utCcSsGaM/portstree-qtkeychain-0.10.0 Thu Jan 30 21:45:36 2020 +++ /tmp/dep_cache.utCcSsGaM/inst-qtkeychain-0.10.0 Thu Jan 30 21:45:36 2020 @@ -8,4 +8,4 @@ -W gobject-2.0.4200.10 -W intl.6.0 -W m.10.1 --W secret-1.2.1 +-W secret-1.2.0 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3366 'wantlib-args': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$( mktemp -d ...) *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2099 '/usr/ports/packages/amd64/all/qtkeychain-0.10.0.tgz': @trap "cd /usr/ports/...) *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2578 '_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$( mktem...) *** Error 2 in /usr/ports/security/qtkeychain (/usr/ports/infrastructure/mk/bsd.port.mk:2557 'package': @lock=qtkeychain-0.10.0; export _LO...) Em qui., 30 de jan. de 2020 às 03:03, Rafael Sadowski <raf...@sizeofvoid.org> escreveu: > > Hi All > > All our consumers only use the qt5 FLAVOR so here is an update diff > which removes the the qt4 pieces and bump to the latest stable version > on github. I did the same like the quazip update from Brian Callahan a > couple days before. Added @pkgpath and bump all consumers. > > Comments, OK? > > Rafael > > Index: astro/kstars/Makefile > =================================================================== > RCS file: /cvs/ports/astro/kstars/Makefile,v > retrieving revision 1.24 > diff -u -p -r1.24 Makefile > --- astro/kstars/Makefile 9 Jan 2020 04:39:34 -0000 1.24 > +++ astro/kstars/Makefile 30 Jan 2020 05:50:45 -0000 > @@ -4,6 +4,7 @@ COMMENT = planetarium simulator for KDE > > DISTNAME = kstars-3.3.9 > EPOCH = 0 > +REVISION = 0 > > CATEGORIES = astro education > > @@ -56,7 +57,7 @@ LIB_DEPENDS += astro/wcslib \ > devel/kf5/kxmlgui \ > graphics/libraw \ > math/cfitsio>=3.450 \ > - security/qtkeychain,qt5 \ > + security/qtkeychain \ > x11/qt5/qtdatavis3d \ > x11/qt5/qtdeclarative \ > x11/qt5/qtsvg \ > Index: geo/qgis/Makefile > =================================================================== > RCS file: /cvs/ports/geo/qgis/Makefile,v > retrieving revision 1.118 > diff -u -p -r1.118 Makefile > --- geo/qgis/Makefile 21 Jan 2020 12:50:46 -0000 1.118 > +++ geo/qgis/Makefile 30 Jan 2020 05:51:02 -0000 > @@ -10,6 +10,7 @@ DISTNAME = qgis-3.10.2 > EXTRACT_SUFX = .tar.bz2 > CATEGORIES = geo x11 > DEBUG_PACKAGES =${BUILD_PACKAGES} > +REVISION = 0 > > SHARED_LIBS = qgis_core 39.0 \ > qgis_app 22.0 \ > @@ -63,7 +64,7 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \ > databases/sqlite3 \ > devel/proj \ > editors/qscintilla,qt5 \ > - security/qtkeychain,qt5 \ > + security/qtkeychain \ > security/qca-qt5 \ > www/fcgi \ > x11/qt5/qtwebkit \ > Index: mail/trojita/Makefile > =================================================================== > RCS file: /cvs/ports/mail/trojita/Makefile,v > retrieving revision 1.30 > diff -u -p -r1.30 Makefile > --- mail/trojita/Makefile 12 Jul 2019 20:47:39 -0000 1.30 > +++ mail/trojita/Makefile 30 Jan 2020 05:51:07 -0000 > @@ -3,7 +3,7 @@ > COMMENT = fast Qt IMAP e-mail client > > DISTNAME = trojita-0.7 > -REVISION = 8 > +REVISION = 9 > > SHARED_LIBS = trojita_plugins 2.0 # 2.0 > > @@ -30,7 +30,7 @@ RUN_DEPENDS = devel/desktop-file-utils > x11/qt5/qtsvg > > LIB_DEPENDS = mail/mimetic \ > - security/qtkeychain,qt5 \ > + security/qtkeychain \ > security/gpgme,,-qt \ > x11/qt5/qtwebkit > > Index: net/nextcloudclient/Makefile > =================================================================== > RCS file: /cvs/ports/net/nextcloudclient/Makefile,v > retrieving revision 1.3 > diff -u -p -r1.3 Makefile > --- net/nextcloudclient/Makefile 28 Dec 2019 13:48:04 -0000 1.3 > +++ net/nextcloudclient/Makefile 30 Jan 2020 05:51:10 -0000 > @@ -4,6 +4,7 @@ COMMENT = desktop sync client for Nextcl > > V = 2.6.2 > DISTNAME = nextcloudclient-${V} > +REVISION = 0 > > GH_ACCOUNT = nextcloud > GH_PROJECT = desktop > @@ -38,7 +39,7 @@ RUN_DEPENDS = devel/desktop-file-utils > > LIB_DEPENDS = databases/sqlite3 \ > devel/libinotify \ > - security/qtkeychain,qt5 > + security/qtkeychain > > CONFIGURE_ARGS = -DBUILD_SHELL_INTEGRATION_NAUTILUS=OFF \ > -DBUILD_SHELL_INTEGRATION_DOLPHIN=OFF \ > Index: net/owncloudclient/Makefile > =================================================================== > RCS file: /cvs/ports/net/owncloudclient/Makefile,v > retrieving revision 1.43 > diff -u -p -r1.43 Makefile > --- net/owncloudclient/Makefile 29 Nov 2019 09:44:44 -0000 1.43 > +++ net/owncloudclient/Makefile 30 Jan 2020 05:51:11 -0000 > @@ -3,6 +3,7 @@ > COMMENT = owncloud sync client > > DISTNAME = owncloudclient-2.6.0.13018 > +REVISION = 0 > > SHARED_LIBS += owncloudsync 5.0 > SHARED_LIBS += owncloud_csync 0.0 > @@ -30,7 +31,7 @@ RUN_DEPENDS = devel/desktop-file-utils > x11/gtk+3,-guic > LIB_DEPENDS = databases/sqlite3 \ > devel/libinotify \ > - security/qtkeychain,qt5 \ > + security/qtkeychain \ > x11/qt5/qtwebkit > > CONFIGURE_ARGS += -Wno-dev \ > Index: security/qtkeychain/Makefile > =================================================================== > RCS file: /cvs/ports/security/qtkeychain/Makefile,v > retrieving revision 1.13 > diff -u -p -r1.13 Makefile > --- security/qtkeychain/Makefile 12 Jul 2019 20:49:35 -0000 1.13 > +++ security/qtkeychain/Makefile 30 Jan 2020 05:51:16 -0000 > @@ -4,11 +4,9 @@ COMMENT = Qt API to store passwords and > > GH_ACCOUNT = frankosterfeld > GH_PROJECT = qtkeychain > -GH_TAGNAME = v0.7.0 > -REVISION = 3 > +GH_TAGNAME = v0.10.0 > > -SHARED_LIBS += qtkeychain 1.0 # 0.4 > -SHARED_LIBS += qt5keychain 1.0 # 0.4 > +SHARED_LIBS += qt5keychain 2.0 # 0.4 > > CATEGORIES = security > > @@ -17,34 +15,25 @@ MAINTAINER = Kirill Bychkov <kirby@open > # BSD-like > PERMIT_PACKAGE = Yes > > -WANTLIB = m ${COMPILER_LIBCXX} > +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus gio-2.0 glib-2.0 > +WANTLIB += gobject-2.0 intl m secret-1 > > -COMPILER = base-clang ports-gcc base-gcc > +MODULES = devel/cmake \ > + x11/qt5 > > -MODULES = devel/cmake > +LIB_DEPENDS = x11/gnome/libsecret \ > + devel/glib2 > > -FLAVORS = qt5 > -FLAVOR ?= > - > -.if ${FLAVOR:Mqt5} > -FULLPKGNAME = qtkeychain-qt5-${GH_TAGNAME:S/v//} > -MODULES += x11/qt5 > -WANTLIB += Qt5Core Qt5DBus > LIBNAME = Qt5Keychain > LIBNAME_L = qt5keychain > QT = qt5 > -CONFIGURE_ARGS += -DBUILD_WITH_QT4=OFF > -.else > -MODULES += x11/qt4 > -WANTLIB += QtDBus > -CONFIGURE_ARGS += -DBUILD_WITH_QT4=ON > -LIBNAME = QtKeychain > -LIBNAME_L = qtkeychain > -QT = qt4 > -.endif > > SUBST_VARS += LIBNAME LIBNAME_L QT > > NO_TEST = Yes > + > +CONFIGURE_ARGS += -DCMAKE_SHARED_LINKER_FLAGS="-L${PREFIX}/lib" \ > + -DCMAKE_MODULE_LINKER_FLAGS="-L${PREFIX}/lib" \ > + -DCMAKE_EXE_LINKER_FLAGS="-L${PREFIX}/lib" > > .include <bsd.port.mk> > Index: security/qtkeychain/distinfo > =================================================================== > RCS file: /cvs/ports/security/qtkeychain/distinfo,v > retrieving revision 1.3 > diff -u -p -r1.3 distinfo > --- security/qtkeychain/distinfo 8 Mar 2017 09:39:40 -0000 1.3 > +++ security/qtkeychain/distinfo 30 Jan 2020 05:51:16 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (qtkeychain-0.7.0.tar.gz) = > n5r6ro6Qk5HX/JMrrJXji++qxbLrSfZiOo7+xgouajo= > -SIZE (qtkeychain-0.7.0.tar.gz) = 18913 > +SHA256 (qtkeychain-0.10.0.tar.gz) = > X5Fs2XhD3lUEZ9sy0uEPIYuQSvWyHP38x8ZCXX38PsI= > +SIZE (qtkeychain-0.10.0.tar.gz) = 38488 > Index: security/qtkeychain/pkg/PLIST > =================================================================== > RCS file: /cvs/ports/security/qtkeychain/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -r1.3 PLIST > --- security/qtkeychain/pkg/PLIST 6 May 2016 06:45:43 -0000 1.3 > +++ security/qtkeychain/pkg/PLIST 30 Jan 2020 05:51:16 -0000 > @@ -1,7 +1,9 @@ > @comment $OpenBSD: PLIST,v 1.3 2016/05/06 06:45:43 kirby Exp $ > +@pkgpath security/qtkeychain,qt5 > include/${LIBNAME_L}/ > include/${LIBNAME_L}/keychain.h > include/${LIBNAME_L}/qkeychain_export.h > +lib/cmake/ > lib/cmake/${LIBNAME}/ > lib/cmake/${LIBNAME}/${LIBNAME}Config.cmake > lib/cmake/${LIBNAME}/${LIBNAME}ConfigVersion.cmake > @@ -12,3 +14,6 @@ lib/${QT}/ > lib/${QT}/translations/ > lib/${QT}/translations/qtkeychain_de.qm > lib/${QT}/translations/qtkeychain_ro.qm > +mkspecs/ > +mkspecs/modules/ > +mkspecs/modules/qt_${LIBNAME}.pri -- Adriano Barbosa