Hello!
This patch splits qtkeychain into Qt4 and Qt5 flavors.
With some input from zhuk@, thanks!
Any objections? Okays?
ndex: Makefile
===================================================================
RCS file: /cvs/ports/security/qtkeychain/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 6 Jan 2016 20:02:19 -0000 1.2
+++ Makefile 1 Mar 2016 19:53:24 -0000
@@ -6,7 +6,8 @@ GH_ACCOUNT = frankosterfeld
GH_PROJECT = qtkeychain
GH_TAGNAME = v0.4.0
-SHARED_LIBS = qtkeychain 0.0 # 0.4
+SHARED_LIBS += qtkeychain 0.0 # 0.4
+SHARED_LIBS += qt5keychain 0.0 # 0.4
CATEGORIES = security
@@ -15,9 +16,31 @@ MAINTAINER = Kirill Bychkov <kirby@open
# BSD-like
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = QtDBus m stdc++
+WANTLIB = m
-MODULES = devel/cmake x11/qt4
+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
+CONFIFURE_ARGS += -DBUILD_WITH_QT4=OFF
+.else
+MODULES += x11/qt4
+WANTLIB += QtDBus stdc++
+CONFIFURE_ARGS += -DBUILD_WITH_QT4=ON
+LIBNAME = QtKeychain
+LIBNAME_L = qtkeychain
+QT = qt4
+.endif
+
+SUBST_VARS += LIBNAME LIBNAME_L QT
NO_TEST = Yes
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/qtkeychain/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 30 Jul 2015 06:07:09 -0000 1.1.1.1
+++ pkg/PLIST 1 Mar 2016 19:53:24 -0000
@@ -1,15 +1,15 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/07/30 06:07:09 kirby Exp $
-include/qtkeychain/
-include/qtkeychain/keychain.h
-include/qtkeychain/qkeychain_export.h
+include/${LIBNAME_L}/
+include/${LIBNAME_L}/keychain.h
+include/${LIBNAME_L}/qkeychain_export.h
lib/cmake/
-lib/cmake/QtKeychain/
-lib/cmake/QtKeychain/QtKeychainConfig.cmake
-lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
-lib/cmake/QtKeychain/QtKeychainLibraryDepends${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/QtKeychain/QtKeychainLibraryDepends.cmake
-@lib lib/libqtkeychain.so.${LIBqtkeychain_VERSION}
-lib/qt4/
-lib/qt4/translations/
-lib/qt4/translations/qtkeychain_de.qm
-lib/qt4/translations/qtkeychain_ro.qm
+lib/cmake/${LIBNAME}/
+lib/cmake/${LIBNAME}/${LIBNAME}Config.cmake
+lib/cmake/${LIBNAME}/${LIBNAME}ConfigVersion.cmake
+lib/cmake/${LIBNAME}/${LIBNAME}LibraryDepends${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/${LIBNAME}/${LIBNAME}LibraryDepends.cmake
+@lib lib/lib${LIBNAME_L}.so.${LIB${LIBNAME_L}_VERSION}
+lib/${QT}/
+lib/${QT}/translations/
+lib/${QT}/translations/qtkeychain_de.qm
+lib/${QT}/translations/qtkeychain_ro.qm
