Attachment #184734 for bug #218772

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1469621401	1	TIMESTAMP = 1492678876
2	SHA256 (frankosterfeld-qtkeychain-v0.7.0_GH0.tar.gz) = 9f9afaae8e909391d7fc932bac95e38befaac5b2eb49f6623a8efec60a2e6a3a	2	SHA256 (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = b492f603197538bc04b2714105b1ab2b327a9a98d400d53d9a7cb70edd2db12f
3	SIZE (frankosterfeld-qtkeychain-v0.7.0_GH0.tar.gz) = 18913	3	SIZE (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = 34686




--- CMakeLists.txt.orig	2017-04-19 13:09:34 UTC
+++ CMakeLists.txt
@@ -38,7 +38,7 @@ if( NOT BUILD_WITH_QT4 )
     find_package(Qt5Core QUIET)
 endif()
 
-if (Qt5Core_FOUND)
+if (NOT BUILD_WITH_QT4)
   set(QTKEYCHAIN_VERSION_INFIX 5)
 
   if(UNIX AND NOT APPLE AND NOT ANDROID)
@@ -249,8 +249,9 @@ ecm_generate_pri_file(BASE_NAME Qt${QTKE
   INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}
   FILENAME_VAR pri_filename)
 
-install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-
+if( NOT BUILD_WITH_QT4 )
+  install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+endif()
 
 install(EXPORT Qt${QTKEYCHAIN_VERSION_INFIX}KeychainLibraryDepends
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Qt${QTKEYCHAIN_VERSION_INFIX}Keychain"




# $FreeBSD: head/security/qtkeychain-qt5/Makefile 419227 2016-07-28 22:27:20Z pawel $

PORTNAME=	qtkeychain
PORTVERSION=	0.8.0
DISTVERSIONPREFIX=	v
CATEGORIES=	security
PKGNAMESUFFIX?=	-qt5


USES=		cmake
USE_LDCONFIG=	yes
USE_KDE=	ecm
PLIST_SUB+=	VERSION=${PORTVERSION}

.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
CONFLICTS_INSTALL=	qtkeychain-qt5-[0-9]*
CMAKE_ARGS+=	-DBUILD_WITH_QT4=YES
USE_QT4=	corelib dbus linguisttools_build moc_build rcc_build qmake_build
PLIST=		${PKGDIR}/pkg-plist.qt4
PLIST_SUB+=	PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt
.else
CONFLICTS_INSTALL=	qtkeychain-qt4-[0-9]*
USE_QT5=	core dbus linguisttools_build buildtools_build qmake_build
PLIST=		${PKGDIR}/pkg-plist.qt5
PLIST_SUB+=	PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5

Lines 1-5 Link Here

(-)./pkg-plist.qt5 (+1 lines)
1	include/qt5keychain/keychain.h	1	include/qt5keychain/keychain.h
2	include/qt5keychain/qkeychain_export.h	2	include/qt5keychain/qkeychain_export.h
		3	%%QT_MKSPECDIR%%/modules/qt_Qt5Keychain.pri
3	lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake	4	lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake
4	lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake	5	lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake
5	lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake	6	lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake

Return to bug 218772

Line 0 Link Here

(-)./files/patch-CMakeLists.txt (+23 lines)
	1	--- CMakeLists.txt.orig 2017-04-19 13:09:34 UTC
	2	+++ CMakeLists.txt
	3	@@ -38,7 +38,7 @@ if( NOT BUILD_WITH_QT4 )
	4	find_package(Qt5Core QUIET)
	5	endif()
	6
	7	-if (Qt5Core_FOUND)
	8	+if (NOT BUILD_WITH_QT4)
	9	set(QTKEYCHAIN_VERSION_INFIX 5)
	10
	11	if(UNIX AND NOT APPLE AND NOT ANDROID)
	12	@@ -249,8 +249,9 @@ ecm_generate_pri_file(BASE_NAME Qt${QTKE
	13	INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}
	14	FILENAME_VAR pri_filename)
	15
	16	-install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
	17	-
	18	+if( NOT BUILD_WITH_QT4 )
	19	+ install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
	20	+endif()
	21
	22	install(EXPORT Qt${QTKEYCHAIN_VERSION_INFIX}KeychainLibraryDepends
	23	DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Qt${QTKEYCHAIN_VERSION_INFIX}Keychain"

Lines 1-7 Link Here

(-)./Makefile (-3 / +2 lines)
1	# $FreeBSD: head/security/qtkeychain-qt5/Makefile 419227 2016-07-28 22:27:20Z pawel $	1	# $FreeBSD: head/security/qtkeychain-qt5/Makefile 419227 2016-07-28 22:27:20Z pawel $
2		2
3	PORTNAME= qtkeychain	3	PORTNAME= qtkeychain
4	PORTVERSION= 0.7.0	4	PORTVERSION= 0.8.0
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	CATEGORIES= security	6	CATEGORIES= security
7	PKGNAMESUFFIX?= -qt5	7	PKGNAMESUFFIX?= -qt5
Lines 17-32 Link Here
17		17
18	USES= cmake	18	USES= cmake
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
		20	USE_KDE= ecm
20	PLIST_SUB+= VERSION=${PORTVERSION}	21	PLIST_SUB+= VERSION=${PORTVERSION}
21		22
22	.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"	23	.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
23	CONFLICTS_INSTALL= qtkeychain-qt5-[0-9]*
24	CMAKE_ARGS+= -DBUILD_WITH_QT4=YES	24	CMAKE_ARGS+= -DBUILD_WITH_QT4=YES
25	USE_QT4= corelib dbus linguisttools_build moc_build rcc_build qmake_build	25	USE_QT4= corelib dbus linguisttools_build moc_build rcc_build qmake_build
26	PLIST= ${PKGDIR}/pkg-plist.qt4	26	PLIST= ${PKGDIR}/pkg-plist.qt4
27	PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt	27	PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt
28	.else	28	.else
29	CONFLICTS_INSTALL= qtkeychain-qt4-[0-9]*
30	USE_QT5= core dbus linguisttools_build buildtools_build qmake_build	29	USE_QT5= core dbus linguisttools_build buildtools_build qmake_build
31	PLIST= ${PKGDIR}/pkg-plist.qt5	30	PLIST= ${PKGDIR}/pkg-plist.qt5
32	PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5	31	PLIST_SUB+= PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5