On Tue, February 4, 2020 09:17, Rafael Sadowski wrote:
> On Sun Feb 02, 2020 at 02:03:03PM +0300, Kirill Bychkov wrote:
>> On Thu, January 30, 2020 09:03, Rafael Sadowski wrote:
>> > 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?
>>
>> Hi,
>> Makes sense to me but I prefer to split update and flavor removal.
>> Also it needs some tweaks to move 'mkspecs' from /usr/local to
>> /usr/local/lib/qt5/
>> Not tested yet.
>>
>
> You're right, ok for the diff below? It just remove the qt4 bits.
>
> RS
It is missing @conflict qtkeychain-qt5-*
With this change OK kirby@
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/qtkeychain/Makefile,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 Makefile
> --- Makefile 12 Jul 2019 20:49:35 -0000 1.13
> +++ Makefile 4 Feb 2020 06:14:29 -0000
> @@ -5,9 +5,8 @@ COMMENT = Qt API to store passwords and
> GH_ACCOUNT = frankosterfeld
> GH_PROJECT = qtkeychain
> GH_TAGNAME = v0.7.0
> -REVISION = 3
> +REVISION = 4
>
> -SHARED_LIBS += qtkeychain 1.0 # 0.4
> SHARED_LIBS += qt5keychain 1.0 # 0.4
>
> CATEGORIES = security
> @@ -17,31 +16,16 @@ MAINTAINER = Kirill Bychkov <kirby@open
> # BSD-like
> PERMIT_PACKAGE = Yes
>
> -WANTLIB = m ${COMPILER_LIBCXX}
> +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus m
>
> -COMPILER = base-clang ports-gcc base-gcc
> +MODULES = devel/cmake \
> + x11/qt5
>
> -MODULES = devel/cmake
> -
> -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
>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/qtkeychain/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- pkg/PLIST 6 May 2016 06:45:43 -0000 1.3
> +++ pkg/PLIST 4 Feb 2020 06:14:29 -0000
> @@ -1,4 +1,5 @@
> @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
>
>
