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

Set -qt5 flavor as default. All qt4 consumers are gone.

Browse Source 
Tweak and OK kirby@
This commit is contained in:
rsadowski 2020-02-07 07:13:40 +00:00
parent 093a82315d
commit 68beee330c
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
security/qtkeychain/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.13 2019/07/12 20:49:35 sthen Exp $ # $OpenBSD: Makefile,v 1.14 2020/02/07 07:13:40 rsadowski Exp $
COMMENT = Qt API to store passwords and other secret data COMMENT = Qt API to store passwords and other secret data
GH_ACCOUNT = frankosterfeld GH_ACCOUNT = frankosterfeld
GH_PROJECT = qtkeychain GH_PROJECT = qtkeychain
GH_TAGNAME = v0.7.0 GH_TAGNAME = v0.7.0
REVISION = 3 REVISION = 4
SHARED_LIBS += qtkeychain 1.0 # 0.4
SHARED_LIBS += qt5keychain 1.0 # 0.4 SHARED_LIBS += qt5keychain 1.0 # 0.4
CATEGORIES = security CATEGORIES = security
@ -17,31 +16,16 @@ MAINTAINER = Kirill Bychkov <kirby@openbsd.org>
# BSD-like # BSD-like
PERMIT_PACKAGE = Yes 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 = Qt5Keychain
LIBNAME_L = qt5keychain LIBNAME_L = qt5keychain
QT = qt5 QT = qt5
CONFIGURE_ARGS += -DBUILD_WITH_QT4=OFF 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 SUBST_VARS += LIBNAME LIBNAME_L QT

4
security/qtkeychain/pkg/PLIST
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2016/05/06 06:45:43 kirby Exp $ @comment $OpenBSD: PLIST,v 1.4 2020/02/07 07:13:40 rsadowski Exp $
@pkgpath security/qtkeychain,qt5
@conflict qtkeychain-qt5-*
include/${LIBNAME_L}/ include/${LIBNAME_L}/
include/${LIBNAME_L}/keychain.h include/${LIBNAME_L}/keychain.h
include/${LIBNAME_L}/qkeychain_export.h include/${LIBNAME_L}/qkeychain_export.h