svn commit: r392754 - in head/devel: . qca-qt5 qca-qt5/files
Pawel Pekala
pawel at FreeBSD.org
Thu Jul 23 21:58:43 UTC 2015
Author: pawel
Date: Thu Jul 23 21:58:40 2015
New Revision: 392754
URL: https://svnweb.freebsd.org/changeset/ports/392754
Log:
Add Qt5 version of devel/qca
Added:
head/devel/qca-qt5/
- copied from r392158, head/devel/qca/
Deleted:
head/devel/qca-qt5/files/patch-git_593de685
Modified:
head/devel/Makefile
head/devel/qca-qt5/Makefile
head/devel/qca-qt5/files/patch-CMakeLists.txt
head/devel/qca-qt5/pkg-plist
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Thu Jul 23 20:35:59 2015 (r392753)
+++ head/devel/Makefile Thu Jul 23 21:58:40 2015 (r392754)
@@ -4381,6 +4381,7 @@
SUBDIR += pythontidy
SUBDIR += qbzr
SUBDIR += qca
+ SUBDIR += qca-qt5
SUBDIR += qconf
SUBDIR += qct
SUBDIR += qdevelop
Modified: head/devel/qca-qt5/Makefile
==============================================================================
--- head/devel/qca/Makefile Wed Jul 15 15:38:18 2015 (r392158)
+++ head/devel/qca-qt5/Makefile Thu Jul 23 21:58:40 2015 (r392754)
@@ -3,24 +3,25 @@
PORTNAME= qca
PORTVERSION= 2.1.0
-PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://delta.affinix.com/download/qca/2.0/
+PKGNAMESUFFIX= -qt5
-MAINTAINER= kde at FreeBSD.org
-COMMENT= Cross-platform crypto API for Qt
+MAINTAINER= pawel at FreeBSD.org
+COMMENT= Cross-platform crypto API for Qt5
BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
USES= cmake:outsource
-CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT4_BUILD=yes \
+CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT5_BUILD=yes \
-DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
-DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \
- -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man
+ -DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man \
+ -DQCA_SUFFIX=qt5
CMAKE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
USE_LDCONFIG= yes
-USE_QT4= corelib moc_build qmake_build rcc_build
+USE_QT5= buildtools_build core network qmake_build
OPTIONS_DEFINE= GNUPG OPENSSL SASL
OPTIONS_DEFAULT=GNUPG OPENSSL
Modified: head/devel/qca-qt5/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/qca/files/patch-CMakeLists.txt Wed Jul 15 15:38:18 2015 (r392158)
+++ head/devel/qca-qt5/files/patch-CMakeLists.txt Thu Jul 23 21:58:40 2015 (r392754)
@@ -1,8 +1,16 @@
-Fix a few syntax errors such that the QC_CERTSTORE_PATH environment
-variable is used correctly.
-
--- CMakeLists.txt.orig 2014-11-06 08:15:45 UTC
+++ CMakeLists.txt
+@@ -170,8 +170,8 @@ else( QCA_INSTALL_IN_QT_PREFIX )
+ set(QCA_BINARY_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Directory where qca plugins will install")
+ set(QCA_LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" CACHE PATH "Directory where qca library will install")
+ set(QCA_FEATURE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/mkspecs/features" CACHE PATH "Directory where qca feature file will install")
+- set(QCA_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca public headers will install")
+- set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Directory where qca headers will install")
++ set(QCA_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/qca-${QCA_SUFFIX}" CACHE PATH "Directory where qca public headers will install")
++ set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/qca-${QCA_SUFFIX}" CACHE PATH "Directory where qca headers will install")
+ set(QCA_DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${QCA_LIB_NAME}/html" CACHE PATH "Directory where qca documentation will install")
+ set(QCA_MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Directory where qca man pages will install")
+ endif( QCA_INSTALL_IN_QT_PREFIX )
@@ -262,13 +262,13 @@ message(STATUS "Checking for certstore..
if( WIN32 )
# USE BUILTIN
@@ -31,3 +39,25 @@ variable is used correctly.
endif(WIN32)
if (qca_CERTSTORE)
+@@ -374,7 +374,7 @@ include(CMakePackageConfigHelpers)
+ configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfig.cmake"
+- INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca
++ INSTALL_DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca-${QCA_SUFFIX}
+ )
+ write_basic_config_version_file("${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfigVersion.cmake" VERSION ${QCA_LIB_VERSION_STRING} COMPATIBILITY AnyNewerVersion)
+
+@@ -434,10 +434,10 @@ if(NOT DEVELOPER_MODE)
+ endif()
+ message("")
+
+- install(EXPORT QCATargets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca FILE QcaTargets.cmake)
++ install(EXPORT QCATargets DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca-${QCA_SUFFIX} FILE QcaTargets.cmake)
+ install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/Qca/QcaConfigVersion.cmake"
+- DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca
++ DESTINATION ${QCA_LIBRARY_INSTALL_DIR}/cmake/Qca-${QCA_SUFFIX}
+ )
+ endif()
Modified: head/devel/qca-qt5/pkg-plist
==============================================================================
--- head/devel/qca/pkg-plist Wed Jul 15 15:38:18 2015 (r392158)
+++ head/devel/qca-qt5/pkg-plist Thu Jul 23 21:58:40 2015 (r392754)
@@ -1,32 +1,32 @@
-bin/mozcerts
-bin/qcatool
-include/QtCrypto/QtCrypto
-include/QtCrypto/qca.h
-include/QtCrypto/qca_basic.h
-include/QtCrypto/qca_cert.h
-include/QtCrypto/qca_core.h
-include/QtCrypto/qca_export.h
-include/QtCrypto/qca_keystore.h
-include/QtCrypto/qca_publickey.h
-include/QtCrypto/qca_safetimer.h
-include/QtCrypto/qca_securelayer.h
-include/QtCrypto/qca_securemessage.h
-include/QtCrypto/qca_support.h
-include/QtCrypto/qca_textfilter.h
-include/QtCrypto/qca_tools.h
-include/QtCrypto/qca_version.h
-include/QtCrypto/qcaprovider.h
-include/QtCrypto/qpipe.h
-lib/cmake/Qca/QcaConfig.cmake
-lib/cmake/Qca/QcaConfigVersion.cmake
-lib/cmake/Qca/QcaTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Qca/QcaTargets.cmake
-lib/libqca.so
-lib/libqca.so.2
-lib/libqca.so.2.1.0
-%%SASL%%lib/qca/crypto/libqca-cyrus-sasl.so
-%%GNUPG%%lib/qca/crypto/libqca-gnupg.so
-%%OPENSSL%%lib/qca/crypto/libqca-ossl.so
-libdata/pkgconfig/qca2.pc
-man/man1/qcatool.1.gz
+bin/mozcerts-qt5
+bin/qcatool-qt5
+include/qca-qt5/QtCrypto/QtCrypto
+include/qca-qt5/QtCrypto/qca.h
+include/qca-qt5/QtCrypto/qca_basic.h
+include/qca-qt5/QtCrypto/qca_cert.h
+include/qca-qt5/QtCrypto/qca_core.h
+include/qca-qt5/QtCrypto/qca_export.h
+include/qca-qt5/QtCrypto/qca_keystore.h
+include/qca-qt5/QtCrypto/qca_publickey.h
+include/qca-qt5/QtCrypto/qca_safetimer.h
+include/qca-qt5/QtCrypto/qca_securelayer.h
+include/qca-qt5/QtCrypto/qca_securemessage.h
+include/qca-qt5/QtCrypto/qca_support.h
+include/qca-qt5/QtCrypto/qca_textfilter.h
+include/qca-qt5/QtCrypto/qca_tools.h
+include/qca-qt5/QtCrypto/qca_version.h
+include/qca-qt5/QtCrypto/qcaprovider.h
+include/qca-qt5/QtCrypto/qpipe.h
+lib/cmake/Qca-qt5/QcaConfig.cmake
+lib/cmake/Qca-qt5/QcaConfigVersion.cmake
+lib/cmake/Qca-qt5/QcaTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qca-qt5/QcaTargets.cmake
+lib/libqca-qt5.so
+lib/libqca-qt5.so.2
+lib/libqca-qt5.so.2.1.0
+%%SASL%%lib/qca-qt5/crypto/libqca-cyrus-sasl.so
+%%GNUPG%%lib/qca-qt5/crypto/libqca-gnupg.so
+%%OPENSSL%%lib/qca-qt5/crypto/libqca-ossl.so
%%QT_MKSPECDIR%%/features/crypto.prf
+libdata/pkgconfig/qca2-qt5.pc
+man/man1/qcatool-qt5.1.gz
More information about the svn-ports-all
mailing list