Hi All,
after a long journey with all qca2 consumers, I'm happy to publish this
diff. First of all the security/qca2 changelog part:
- Update from 2.0.3 to 2.1.3.
- Transform security/{qca-ossl,qca-gnupg} in one security/qca2 port with
MULTI_PACKAGES -ossl and -gnupg.
- rRename PKGNAME from qca2 to qca2-qt4 (qca2-qt5 is in the pipeline)
- Disable SSL2 and SSL3 by default!
- "qt42 suffix and no more qca2
- Improve QcaConfig and remove alle unnecessary patches.
- Add @conflict and @pkgpath into the FLAVORS. Ok? (final pkg_add -u
test will follow)
This is a list of all conventions:
audio/clementine
geo/qgis
graphics/digikam-kde4
net/konversation
net/libktorrent
net/psi
security/qoauth
x11/kde4/kget
x11/kde4/runtime
x11/kde4/kopete
x11/kde4/ksirk
x11/kde4/libs
x11/kde4/okteta
x11/kde4/okular
x11/kde4/plasma-addons
I have all tested and patch. The result can be found in the diff below.
I hope to have noticed everything.
All comments are really welcome and okay anyway.
Okay to remove security/qca-gnupg and security/qca-ossl after
update?
Best regards,
Rafael Sadowski
Index: audio/clementine/Makefile
===================================================================
RCS file: /cvs/ports/audio/clementine/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- audio/clementine/Makefile 19 Jun 2017 19:57:07 -0000 1.24
+++ audio/clementine/Makefile 7 Jul 2017 12:35:34 -0000
@@ -5,7 +5,7 @@ COMMENT = Qt4-based featureful music pla
V = 1.2.3
DISTNAME = clementine-${V}
CATEGORIES = audio x11
-REVISION = 6
+REVISION = 7
HOMEPAGE = http://clementine-player.org/
@@ -26,7 +26,7 @@ WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2
WANTLIB += gstapp-0.10 gstbase-0.10 gstcdda-0.10 gstreamer-0.10
WANTLIB += gsttag-0.10
WANTLIB += cdio chromaprint gpod execinfo fftw3 lastfm mtp mygpo-qt
-WANTLIB += protobuf qca2 qjson tag>=5.0 usb-1.0 xml2 ${LIBECXX}
+WANTLIB += protobuf qca-qt4 qjson tag>=5.0 usb-1.0 xml2 ${LIBECXX}
# those are dlopen'ed
WANTLIB += plist
Index: audio/clementine/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/clementine/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- audio/clementine/patches/patch-CMakeLists_txt 1 Oct 2014 20:52:48
-0000 1.3
+++ audio/clementine/patches/patch-CMakeLists_txt 7 Jul 2017 12:35:34
-0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2014/10/01 20:52:48 dcoppa Exp $
1. Force using bundled GTest and GMock, as it's better this way.
2. Make Clementine use system SHA-2 implementation.
---- CMakeLists.txt.orig Wed Apr 23 12:16:44 2014
-+++ CMakeLists.txt Wed Oct 1 16:34:54 2014
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6)
cmake_policy(SET CMP0011 OLD)
@@ -11,6 +12,35 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
include(FindPkgConfig)
include(cmake/Summary.cmake)
include(cmake/Version.cmake)
+@@ -46,6 +47,7 @@ find_package(Gettext REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ find_package(Protobuf REQUIRED)
+ find_package(FFTW3)
++find_package(Qca-qt4 REQUIRED)
+
+ pkg_check_modules(CDIO libcdio)
+ pkg_check_modules(CHROMAPRINT libchromaprint)
+@@ -62,7 +64,6 @@ pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
+ pkg_check_modules(LIBMTP libmtp>=1.0)
+ pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.7)
+ pkg_check_modules(LIBXML libxml-2.0)
+-pkg_check_modules(QCA qca2)
+ pkg_check_modules(QJSON REQUIRED QJson)
+ pkg_check_modules(SPOTIFY libspotify>=12.1.45)
+ pkg_check_modules(TAGLIB REQUIRED taglib>=1.6)
+@@ -256,10 +257,10 @@ optional_component(SPARKLE ON "Sparkle integration"
+
+ optional_component(VISUALISATIONS ON "Visualisations")
+
+-if(NOT HAVE_SPOTIFY_BLOB AND NOT QCA_FOUND)
++if(NOT HAVE_SPOTIFY_BLOB AND NOT Qca-qt4_FOUND)
+ message(FATAL_ERROR "Either QCA must be available or the non-GPL Spotify "
+ "code must be compiled in")
+-elseif(QCA_FOUND)
++elseif(Qca-qt4_FOUND)
+ set(HAVE_SPOTIFY_DOWNLOADER ON)
+ endif()
+
@@ -366,27 +367,45 @@ if(NOT ECHONEST_INCLUDE_DIRS OR NOT ECHONEST_LIBRARIES
set(ECHONEST_LIBRARIES echonest)
endif(NOT ECHONEST_INCLUDE_DIRS OR NOT ECHONEST_LIBRARIES)
Index: audio/clementine/patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/clementine/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_CMakeLists_txt
--- audio/clementine/patches/patch-src_CMakeLists_txt 1 Oct 2014 20:52:48
-0000 1.3
+++ audio/clementine/patches/patch-src_CMakeLists_txt 7 Jul 2017 12:35:34
-0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.3 2014/10/01 20:52:48 dcoppa Exp $
1. -Wno-unused-private-field -Wno-unknown-warning-option dont exist on gcc 4.8
2. FIX BUG 4401: No namespaces for DBus interfaces, from upstream.
---- src/CMakeLists.txt.orig Wed Apr 23 12:16:44 2014
-+++ src/CMakeLists.txt Wed Oct 1 16:35:16 2014
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
@@ -1,6 +1,6 @@
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
@@ -11,7 +12,27 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.3
option(BUILD_WERROR "Build with -Werror" ON)
-@@ -885,11 +885,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
+@@ -52,6 +52,10 @@ if(HAVE_LIBLASTFM)
+ include_directories(${LASTFM_INCLUDE_DIRS})
+ endif(HAVE_LIBLASTFM)
+
++if(HAVE_SPOTIFY_DOWNLOADER)
++ include_directories(${Qca_INCLUDE_DIRS})
++endif(HAVE_SPOTIFY_DOWNLOADER)
++
+ if(HAVE_BREAKPAD)
+ include_directories(../3rdparty/google-breakpad)
+ endif(HAVE_BREAKPAD)
+@@ -843,7 +847,7 @@ optional_source(HAVE_SPOTIFY_DOWNLOADER
+ HEADERS
+ internet/spotifyblobdownloader.h
+ INCLUDE_DIRECTORIES
+- ${QCA_INCLUDE_DIRS}
++ ${Qca_INCLUDE_DIRS}
+ )
+
+ # Platform specific - OS X
+@@ -885,11 +889,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
if(HAVE_DBUS)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
@@ -23,7 +44,7 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.3
# MPRIS DBUS interfaces
qt4_add_dbus_adaptor(SOURCES
dbus/org.freedesktop.MediaPlayer.player.xml
-@@ -957,6 +952,10 @@ if(HAVE_DBUS)
+@@ -957,6 +956,10 @@ if(HAVE_DBUS)
# DeviceKit DBUS interfaces
if(HAVE_DEVICEKIT)
@@ -34,13 +55,25 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.3
qt4_add_dbus_interface(SOURCES
dbus/org.freedesktop.UDisks.xml
dbus/udisks)
-@@ -1167,9 +1166,6 @@ add_library(clementine_lib STATIC
- ${PO}
+@@ -1168,9 +1171,6 @@ add_library(clementine_lib STATIC
${OTHER_UIC_SOURCES}
)
--
+
-add_dependencies(clementine_lib pot)
-
-
+-
target_link_libraries(clementine_lib
clementine-spotifyblob-messages
+ libclementine-common
+@@ -1243,9 +1243,9 @@ endif(HAVE_BREAKPAD)
+
+ if(HAVE_SPOTIFY_DOWNLOADER)
+ target_link_libraries(clementine_lib
+- ${QCA_LIBRARIES}
++ ${Qca_LIBRARY}
+ )
+- link_directories(${QCA_LIBRARY_DIRS})
++ link_directories(${Qca_LIBRARY_DIR})
+ endif(HAVE_SPOTIFY_DOWNLOADER)
+
+ if (APPLE)
Index: geo/qgis/Makefile
===================================================================
RCS file: /cvs/ports/geo/qgis/Makefile,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 Makefile
--- geo/qgis/Makefile 25 Jun 2017 13:35:42 -0000 1.69
+++ geo/qgis/Makefile 7 Jul 2017 12:35:42 -0000
@@ -5,6 +5,7 @@ COMMENT = desktop geographical informati
DISTNAME = qgis-2.18.10
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
+REVISION = 0
SHARED_LIBS = qgis_core 17.1 \
qgis_app 5.0 \
@@ -31,7 +32,7 @@ MODULES = devel/cmake \
COMPILER = gcc
BUILD_DEPENDS = x11/py-qt4>=4.8.4 \
- security/qca-ossl \
+ security/qca2,-ossl \
editors/py-qscintilla \
devel/bison>=2.4 \
geo/gdal,-python
@@ -39,7 +40,7 @@ BUILD_DEPENDS = x11/py-qt4>=4.8.4 \
RUN_DEPENDS = x11/py-qt4>=4.8.4 \
www/py-requests \
- security/qca-ossl \
+ security/qca2,-ossl \
geo/gdal,-python \
databases/py-psycopg2 \
editors/py-qscintilla \
@@ -65,7 +66,7 @@ WANTLIB += ICE SM X11 Xext Xi Xinerama
fontconfig freetype glib-2.0 gobject-2.0 gthread-2.0 lcms m \
mng png pthread util z proj \
QtGui QtNetwork QtXml QtSql QtCore QtScript QtSvg \
- QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi qca2 \
+ QtWebKit gdal geos c gsl gslcblas pq qwt fcgi qca-qt4 \
QtTest spatialindex spatialite sqlite3 qscintilla2 qjson
WANTLIB += ${MODPY_WANTLIB} jpeg tiff
Index: geo/qgis/patches/patch-cmake_FindQCA_cmake
===================================================================
RCS file: geo/qgis/patches/patch-cmake_FindQCA_cmake
diff -N geo/qgis/patches/patch-cmake_FindQCA_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ geo/qgis/patches/patch-cmake_FindQCA_cmake 7 Jul 2017 12:35:42 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: cmake/FindQCA.cmake
+--- cmake/FindQCA.cmake.orig
++++ cmake/FindQCA.cmake
+@@ -23,7 +23,7 @@ else(QCA_INCLUDE_DIR AND QCA_LIBRARY)
+ if(ENABLE_QT5)
+ set(QCA_LIBRARY_NAMES qca-qt5 qca2-qt5)
+ else(ENABLE_QT5)
+- set(QCA_LIBRARY_NAMES qca qca2)
++ set(QCA_LIBRARY_NAMES qca qca-qt4)
+ endif(ENABLE_QT5)
+
+ find_library(QCA_LIBRARY
+@@ -49,7 +49,7 @@ else(QCA_INCLUDE_DIR AND QCA_LIBRARY)
+ "$ENV{LIB_DIR}/include"
+ $ENV{INCLUDE}
+ /usr/local/include
+- PATH_SUFFIXES QtCrypto qt4/QtCrypto Qca-qt5/QtCrypto
++ PATH_SUFFIXES QtCrypto qt4/QtCrypto Qca-qt5/QtCrypto Qca-qt4/QtCrypto
+ )
+
+ if(QCA_LIBRARY AND QCA_INCLUDE_DIR)
Index: graphics/digikam-kde4/Makefile
===================================================================
RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- graphics/digikam-kde4/Makefile 28 May 2017 15:54:08 -0000 1.25
+++ graphics/digikam-kde4/Makefile 7 Jul 2017 12:35:43 -0000
@@ -16,8 +16,8 @@ PKGNAME-kipi = kipi-plugins-${VERSION}
PKGNAME-main = ${PKGNAME}
PKGNAME-mediawiki = libmediawiki-1.0.0
-REVISION-main = 0
-REVISION-kipi = 1
+REVISION-main = 1
+REVISION-kipi = 2
REVISION-mediawiki = 4
EXTRACT_SUFX = .tar.bz2
@@ -58,7 +58,7 @@ WANTLIB-kipi += ${KDE4LIB}/threadweaver
WANTLIB-kipi += opencv_core opencv_highgui opencv_imgproc opencv_objdetect
WANTLIB-kipi += exslt gdk_pixbuf-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpod
WANTLIB-kipi += gthread-2.0 jpeg
-WANTLIB-kipi += qjson kgeomap kqoauth kvkontakte mediawiki png qca2 soprano
+WANTLIB-kipi += qjson kgeomap kqoauth kvkontakte mediawiki png qca-qt4 soprano
WANTLIB-kipi += tiff xml2 xslt MagickCore-6.Q16
WANTLIB-kipi += QtGLib-2.0 QtGStreamer-1.0 QtGStreamerUtils-1.0
@@ -82,7 +82,7 @@ WANTLIB-main += opencv_legacy opencv_ml
WANTLIB-main += opencv_ocl opencv_photo opencv_video
WANTLIB-main += akonadi-contact akonadi-kde baloocore baloofiles baloopim
WANTLIB-main += balooqueryparser exif gphoto2 gphoto2_port jasper jpeg
-WANTLIB-main += kface kgeomap lcms2 lensfun lqr-1 pgf png soprano
+WANTLIB-main += kface kgeomap lcms2 lensfun lqr-1 pgf png qca-qt4 soprano
WANTLIB-main += sqlite tiff usb
WANTLIB-mediawiki = ${WANTLIB-common}
Index: net/konversation/Makefile
===================================================================
RCS file: /cvs/ports/net/konversation/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- net/konversation/Makefile 12 Aug 2015 12:33:02 -0000 1.6
+++ net/konversation/Makefile 7 Jul 2017 12:35:47 -0000
@@ -6,7 +6,7 @@ V = 1.5
DISTNAME = konversation-$V
MAINTAINER = KDE porting team <[email protected]>
HOMEPAGE = http://konversation.kde.org/
-REVISION = 2
+REVISION = 3
WANTLIB = c m pthread
WANTLIB += lib/qt4/Qt3Support lib/qt4/QtDBus lib/qt4/QtGui
@@ -16,7 +16,7 @@ WANTLIB += ${KDE4LIB}/kemoticons ${KDE4L
WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/knotifyconfig ${KDE4LIB}/kparts
WANTLIB += ${KDE4LIB}/kresources ${KDE4LIB}/nepomuk
WANTLIB += ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid
-WANTLIB += qca2 soprano
+WANTLIB += qca2-qt4 soprano
MASTER_SITES = ${MASTER_SITE_KDE:=stable/konversation/$V/src/}
Index: net/libktorrent/Makefile
===================================================================
RCS file: /cvs/ports/net/libktorrent/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- net/libktorrent/Makefile 25 Apr 2017 19:05:53 -0000 1.12
+++ net/libktorrent/Makefile 7 Jul 2017 12:35:47 -0000
@@ -5,7 +5,7 @@ COMMENT = KTorrent engine
V = 1.3.1
DISTNAME = libktorrent-$V
HOMEPAGE = http://ktorrent.pwsp.net/
-REVISION = 8
+REVISION = 9
EXTRACT_SUFX = .tar.bz2
@@ -18,7 +18,7 @@ WANTLIB = m pthread
WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtSvg lib/qt4/QtXml
WANTLIB += lib/qt4/QtNetwork
WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio ${KDE4LIB}/solid
-WANTLIB += gcrypt gmp qca2
+WANTLIB += gcrypt gmp qca-qt4
MASTER_SITES = ${HOMEPAGE}downloads/${V:C/^./4/}/
Index: net/psi/Makefile
===================================================================
RCS file: /cvs/ports/net/psi/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- net/psi/Makefile 10 Apr 2017 11:46:32 -0000 1.23
+++ net/psi/Makefile 7 Jul 2017 12:35:47 -0000
@@ -3,7 +3,7 @@
COMMENT= multiplatform Jabber client
DISTNAME= psi-0.15
-REVISION= 3
+REVISION= 4
CATEGORIES= net
HOMEPAGE= http://psi-im.org/
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += ICE QtDBus QtGui QtNetwork QtXml SM X11 Xext Xi Xinerama
WANTLIB += Xrender Xss c enchant fontconfig freetype glib-2.0
-WANTLIB += gmodule-2.0 m pthread qca2 ${LIBCXX} z
+WANTLIB += gmodule-2.0 m pthread qca-qt4 ${LIBCXX} z
MODULES= x11/qt4 \
devel/gettext
@@ -26,15 +26,16 @@ USE_GMAKE= Yes
LIB_DEPENDS= security/qca2 \
textproc/enchant
RUN_DEPENDS= devel/desktop-file-utils \
- security/qca-gnupg \
- security/qca-ossl \
+ security/qca2,-gnupg \
+ security/qca2,-ossl \
x11/gtk+3,-guic
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= --prefix=${LOCALBASE} \
--qtdir=${MODQT4_QTDIR} \
- --with-qca-inc=${LOCALBASE}/include/QtCrypto \
+ --with-qca-inc=${LOCALBASE}/include/Qca-qt4/ \
+ --with-qca-lib=${LOCALBASE}/lib/ \
--disable-growl
# For QSettings to write its setup
Index: net/psi/patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/psi/patches/patch-configure,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-configure
--- net/psi/patches/patch-configure 21 Apr 2013 13:56:27 -0000 1.6
+++ net/psi/patches/patch-configure 7 Jul 2017 12:35:47 -0000
@@ -6,7 +6,7 @@ $OpenBSD: patch-configure,v 1.6 2013/04/
" !isEmpty(QCA_INCDIR):INCLUDEPATH += \$\$QCA_INCDIR/QtCrypto\n"
" !isEmpty(QCA_LIBDIR):LIBS += -L\$\$QCA_LIBDIR\n"
-" LINKAGE = -lqca\n"
-+" LINKAGE = -lqca2\n"
++" LINKAGE = -lqca-qt4\n"
" CONFIG(debug, debug|release) {\n"
" windows:LINKAGE = -lqcad\n"
" mac:LINKAGE = -lqca_debug\n"
Index: security/qca2/Makefile
===================================================================
RCS file: /cvs/ports/security/qca2/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- security/qca2/Makefile 10 Apr 2017 11:46:33 -0000 1.13
+++ security/qca2/Makefile 7 Jul 2017 12:35:50 -0000
@@ -1,30 +1,55 @@
# $OpenBSD: Makefile,v 1.13 2017/04/10 11:46:33 sthen Exp $
-COMMENT = Qt Cryptographic Architecture
+COMMENT-main = Qt Cryptographic Architecture
+COMMENT-ossl = SSL/TLS plugin
+COMMENT-gnupg = GnuPG plugin
+
+VERSION = 2.1.3
+DISTNAME = qca-${VERSION}
+
+PKGNAME-main = qca2-qt4-${VERSION}
+PKGNAME-ossl = qca2-qt4-ossl-${VERSION}
+PKGNAME-gnupg = qca2-qt4-gnupg-${VERSION}
-DISTNAME = qca-2.0.3
-PKGNAME = qca2-2.0.3
CATEGORIES = security
-SHARED_LIBS += qca2 0.0
-REVISION = 2
-HOMEPAGE = http://delta.affinix.com/qca/
+SHARED_LIBS += qca-qt4 0.0 # 2.1
+
+HOMEPAGE = https://userbase.kde.org/QCA
# LGPLv2.1
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://delta.affinix.com/download/qca/2.0/
-EXTRACT_SUFX = .tar.bz2
-
-MODULES = x11/qt4
-
-CONFIGURE_STYLE = simple
-CONFIGURE_ENV += QTDIR=${MODQT_LIBDIR} HOME=${WRKDIR}
LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
-
-MAKE_FLAGS = LIBqca2_VERSION=${LIBqca2_VERSION}
-FAKE_FLAGS = INSTALL_ROOT=${WRKINST}
-NO_TEST = Yes
+MASTER_SITES = ${MASTER_SITE_KDE:=stable/qca/${VERSION}/src/}
+EXTRACT_SUFX = .tar.xz
-WANTLIB += c m pthread ${LIBCXX}
+# Plugins: qca-ossl qca-cyrus-sasl qca-gnupg qca-pkcs11 qca-wingss qca-logger
+MULTI_PACKAGES = -main -ossl -gnupg
+PSEUDO_FLAVORS = no_ossl no_gnupg
+FLAVOR ?= no_ossl no_gnupg
+
+CFLAGS += -DOPENSSL_NO_SSL2 \
+ -DOPENSSL_NO_SSL3_METHOD
+
+CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=${LOCALBASE} \
+ -DQCA_BINARY_INSTALL_DIR=${PREFIX}/bin \
+ -DBUILD_PLUGINS:Bool=ON \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=ON \
+ -DQT4_BUILD:Bool=OFF \
+ -DQCA_SUFFIX=qt4
+
+.include <bsd.port.arch.mk>
+
+MODULES = devel/cmake \
+ x11/qt4
+
+.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
+CONFIGURE_ARGS += -DBUILD_PLUGINS="ossl;gnupg"
+RUN_DEPENDS += ${BUILD_PKGPATH},-main
+.endif
+
+.if ${BUILD_PACKAGES:M-gnupg}
+RUN_DEPENDS += security/gnupg
+.endif
.include <bsd.port.mk>
Index: security/qca2/distinfo
===================================================================
RCS file: /cvs/ports/security/qca2/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- security/qca2/distinfo 18 Jan 2015 03:15:07 -0000 1.4
+++ security/qca2/distinfo 7 Jul 2017 12:35:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (qca-2.0.3.tar.bz2) = jaIMifOQlU/c/NPE3u83khPdta6da14MkX0j9eR0iV8=
-SIZE (qca-2.0.3.tar.bz2) = 4530731
+SHA256 (qca-2.1.3.tar.xz) = AD/YajJCEFegOxioFo21LilAl4+dteu7agiIL4qx41M=
+SIZE (qca-2.1.3.tar.xz) = 686340
Index: security/qca2/patches/patch-QcaConfig_cmake_in
===================================================================
RCS file: security/qca2/patches/patch-QcaConfig_cmake_in
diff -N security/qca2/patches/patch-QcaConfig_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca2/patches/patch-QcaConfig_cmake_in 7 Jul 2017 12:35:50
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: QcaConfig.cmake.in
+--- QcaConfig.cmake.in.orig
++++ QcaConfig.cmake.in
+@@ -5,3 +5,6 @@ if(NOT TARGET @QCA_LIB_NAME@)
+ endif()
+
+ set(Qca_LIBRARY @QCA_LIB_NAME@)
++set(Qca_INCLUDE_DIRS "@QCA_FULL_INCLUDE_INSTALL_DIR@")
++set(Qca_INCLUDE_DIR "@QCA_FULL_INCLUDE_INSTALL_DIR@")
++set(Qca_LIBRARY_DIR "@QCA_LIBRARY_INSTALL_DIR@")
Index: security/qca2/patches/patch-configure
===================================================================
RCS file: security/qca2/patches/patch-configure
diff -N security/qca2/patches/patch-configure
--- security/qca2/patches/patch-configure 26 Jan 2012 09:25:46 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2012/01/26 09:25:46 sebastia Exp $
-
-rename library to qca2
-
---- configure.orig Tue Jan 24 12:31:29 2012
-+++ configure Tue Jan 24 12:32:49 2012
-@@ -913,7 +913,7 @@ class qc_extra : public ConfObj (public)
- str = pkg_template1.arg(prefix, libdir, incdir);
- str += pkg_template2.arg("QCA");
- str += pkg_template3.arg("QtCore");
-- str += pkg_template4.arg("qca");
-+ str += pkg_template4.arg("qca2");
- f.setFileName("lib/pkgconfig/qca2.pc");
- if(f.open(QFile::WriteOnly | QFile::Truncate))
- f.write(str.toLatin1());
Index: security/qca2/patches/patch-crypto_prf_in
===================================================================
RCS file: security/qca2/patches/patch-crypto_prf_in
diff -N security/qca2/patches/patch-crypto_prf_in
--- security/qca2/patches/patch-crypto_prf_in 26 Jan 2012 09:25:46 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-crypto_prf_in,v 1.2 2012/01/26 09:25:46 sebastia Exp $
---- crypto.prf.in.orig Wed Jun 4 02:48:48 2008
-+++ crypto.prf.in Tue Jan 24 13:02:00 2012
-@@ -28,8 +28,8 @@ mac: {
- # else, link normally
- isEmpty(LINKAGE) {
- INCLUDEPATH += $$QCA_INCDIR/QtCrypto
-- LIBS += -L$$QCA_LIBDIR
-- LINKAGE = -lqca
-+ QMAKE_LFLAGS += -L$$QCA_LIBDIR
-+ LINKAGE = -lqca2
- CONFIG(debug, debug|release) {
- windows:LINKAGE = -lqcad
- mac:LINKAGE = -lqca_debug
Index: security/qca2/patches/patch-qcm_qca_qcm
===================================================================
RCS file: security/qca2/patches/patch-qcm_qca_qcm
diff -N security/qca2/patches/patch-qcm_qca_qcm
--- security/qca2/patches/patch-qcm_qca_qcm 26 Jan 2012 09:25:46 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-qcm_qca_qcm,v 1.1 2012/01/26 09:25:46 sebastia Exp $
-
-rename library to qca2
-
---- qcm/qca.qcm.orig Tue Jan 24 09:52:18 2012
-+++ qcm/qca.qcm Tue Jan 24 09:54:57 2012
-@@ -31,7 +31,7 @@ static QString internal_crypto_prf(const QString &incd
- "isEmpty(LINKAGE) {\n"
- " INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n"
- " LIBS += -L$$QCA_LIBDIR\n"
--" LINKAGE = -lqca\n"
-+" LINKAGE = -lqca2\n"
- " CONFIG(debug, debug|release) {\n"
- " windows:LINKAGE = -lqcad\n"
- " mac:LINKAGE = -lqca_debug\n"
-@@ -51,7 +51,7 @@ class qc_qca : public ConfObj
- public:
- qc_qca(Conf *c) : ConfObj(c) {}
- QString name() const { return "QCA >= 2.0"; }
-- QString shortname() const { return "qca"; }
-+ QString shortname() const { return "qca2"; }
- bool exec()
- {
- // get the build mode
Index: security/qca2/patches/patch-src_botantools_botan_botan_secmem_h
===================================================================
RCS file: security/qca2/patches/patch-src_botantools_botan_botan_secmem_h
diff -N security/qca2/patches/patch-src_botantools_botan_botan_secmem_h
--- security/qca2/patches/patch-src_botantools_botan_botan_secmem_h 2 May
2017 17:59:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_botantools_botan_botan_secmem_h,v 1.1 2017/05/02 17:59:46
espie Exp $
-two phase name lookup
-Index: src/botantools/botan/botan/secmem.h
---- src/botantools/botan/botan/secmem.h.orig
-+++ src/botantools/botan/botan/secmem.h
-@@ -214,11 +214,11 @@ class SecureVector : public MemoryRegion<T>
-
- SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
- SecureVector(const T in[], u32bit n)
-- { MemoryRegion<T>::init(true); set(in, n); }
-+ { MemoryRegion<T>::init(true); this->set(in, n); }
- SecureVector(const MemoryRegion<T>& in)
-- { MemoryRegion<T>::init(true); set(in); }
-+ { MemoryRegion<T>::init(true); this->set(in); }
- SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
-- { MemoryRegion<T>::init(true); set(in1); append(in2); }
-+ { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
- };
-
- /*************************************************
Index: security/qca2/patches/patch-src_src_pro
===================================================================
RCS file: security/qca2/patches/patch-src_src_pro
diff -N security/qca2/patches/patch-src_src_pro
--- security/qca2/patches/patch-src_src_pro 4 Sep 2012 16:05:38 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_src_pro,v 1.2 2012/09/04 16:05:38 ajacoutot Exp $
-
-rename library to qca2
-
---- src/src.pro.orig Sat Nov 27 22:14:12 2010
-+++ src/src.pro Tue Sep 4 17:52:57 2012
-@@ -6,7 +6,7 @@ QCA_SRCBASE = .
-
- TEMPLATE = lib
- QT -= gui
--TARGET = qca
-+TARGET = qca2
- DESTDIR = $$QCA_BASE/lib
- windows:DLLDESTDIR = $$QCA_BASE/bin
-
-@@ -109,7 +109,7 @@ unix: {
- incfiles.files += $$QCA_INC/qca.h $$QCA_INC/QtCrypto
- !lib_bundle:INSTALLS += incfiles
-
-- manfiles.path = $$DATADIR/man/man1
-+ manfiles.path = $$PREFIX/man/man1
- manfiles.files = $$QCA_BASE/man/qcatool2.1
- INSTALLS += manfiles
- }
Index: security/qca2/pkg/DESCR
===================================================================
RCS file: security/qca2/pkg/DESCR
diff -N security/qca2/pkg/DESCR
--- security/qca2/pkg/DESCR 9 Feb 2008 10:45:36 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-QCA aims to provide a straightforward and cross-platform crypto API, using Qt
-datatypes and conventions. QCA separates the API from the implementation,
-using plugins known as Providers.
Index: security/qca2/pkg/DESCR-gnupg
===================================================================
RCS file: security/qca2/pkg/DESCR-gnupg
diff -N security/qca2/pkg/DESCR-gnupg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca2/pkg/DESCR-gnupg 7 Jul 2017 12:35:50 -0000
@@ -0,0 +1,2 @@
+Provider plugin for QCA (Qt crypto helper library). This plugin provides
+features based on GnuPG.
Index: security/qca2/pkg/DESCR-main
===================================================================
RCS file: security/qca2/pkg/DESCR-main
diff -N security/qca2/pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca2/pkg/DESCR-main 7 Jul 2017 12:35:50 -0000
@@ -0,0 +1,3 @@
+QCA aims to provide a straightforward and cross-platform crypto API, using Qt
+datatypes and conventions. QCA separates the API from the implementation, using
+plugins known as Providers.
Index: security/qca2/pkg/DESCR-ossl
===================================================================
RCS file: security/qca2/pkg/DESCR-ossl
diff -N security/qca2/pkg/DESCR-ossl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca2/pkg/DESCR-ossl 7 Jul 2017 12:35:50 -0000
@@ -0,0 +1,6 @@
+Provider plugin for QCA (Qt crypto helper library). Capabilities:
+
+TLS, CMS, X.509, RSA, DSA, Diffie-Hellman, PKCS#7, PKCS#12, SHA0, SHA1, SHA224,
+SHA256, SHA384, SHA512, MD2, MD4, MD5, RIPEMD160, Blowfish, DES, 3DES, AES128,
+AES192, AES256, CAST5, HMAC(SHA1, MD5, RIPEMD160), PBKDF1(MD2, SHA1),
+PBKDF2(SHA1)
Index: security/qca2/pkg/PLIST
===================================================================
RCS file: security/qca2/pkg/PLIST
diff -N security/qca2/pkg/PLIST
--- security/qca2/pkg/PLIST 4 Sep 2012 16:05:38 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.6 2012/09/04 16:05:38 ajacoutot Exp $
-@bin bin/qcatool2
-include/QtCrypto/
-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_securelayer.h
-include/QtCrypto/qca_securemessage.h
-include/QtCrypto/qca_support.h
-include/QtCrypto/qca_textfilter.h
-include/QtCrypto/qca_tools.h
-include/QtCrypto/qcaprovider.h
-include/QtCrypto/qpipe.h
-lib/libqca2.prl
-@lib lib/libqca2.so.${LIBqca2_VERSION}
-lib/pkgconfig/qca2.pc
-lib/qt4/mkspecs/features/crypto.prf
-@man man/man1/qcatool2.1
-share/qca/
-share/qca/certs/
-share/qca/certs/README
-share/qca/certs/rootcerts.pem
Index: security/qca2/pkg/PLIST-gnupg
===================================================================
RCS file: security/qca2/pkg/PLIST-gnupg
diff -N security/qca2/pkg/PLIST-gnupg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca2/pkg/PLIST-gnupg 7 Jul 2017 12:35:50 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@conflict qca-gnupg-*
+@pkgpath security/qca-gnupg
+lib/qca-qt4/
+lib/qca-qt4/crypto/
+lib/qca-qt4/crypto/libqca-gnupg.so
Index: security/qca2/pkg/PLIST-main
===================================================================
RCS file: security/qca2/pkg/PLIST-main
diff -N security/qca2/pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca2/pkg/PLIST-main 7 Jul 2017 12:35:50 -0000
@@ -0,0 +1,40 @@
+@comment $OpenBSD$
+@conflict qca2-2*
+@pkgpath security/qca2
+@bin bin/mozcerts-qt4
+@bin bin/qcatool-qt4
+certs/
+certs/rootcerts.pem
+include/Qca-qt4/
+include/Qca-qt4/QtCrypto/
+include/Qca-qt4/QtCrypto/QtCrypto
+include/Qca-qt4/QtCrypto/qca.h
+include/Qca-qt4/QtCrypto/qca_basic.h
+include/Qca-qt4/QtCrypto/qca_cert.h
+include/Qca-qt4/QtCrypto/qca_core.h
+include/Qca-qt4/QtCrypto/qca_export.h
+include/Qca-qt4/QtCrypto/qca_keystore.h
+include/Qca-qt4/QtCrypto/qca_publickey.h
+include/Qca-qt4/QtCrypto/qca_safetimer.h
+include/Qca-qt4/QtCrypto/qca_securelayer.h
+include/Qca-qt4/QtCrypto/qca_securemessage.h
+include/Qca-qt4/QtCrypto/qca_support.h
+include/Qca-qt4/QtCrypto/qca_textfilter.h
+include/Qca-qt4/QtCrypto/qca_tools.h
+include/Qca-qt4/QtCrypto/qca_version.h
+include/Qca-qt4/QtCrypto/qcaprovider.h
+include/Qca-qt4/QtCrypto/qpipe.h
+lib/cmake/
+lib/cmake/Qca-qt4/
+lib/cmake/Qca-qt4/Qca-qt4Config.cmake
+lib/cmake/Qca-qt4/Qca-qt4ConfigVersion.cmake
+lib/cmake/Qca-qt4/Qca-qt4Targets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/Qca-qt4/Qca-qt4Targets.cmake
+@lib lib/libqca-qt4.so.${LIBqca-qt4_VERSION}
+lib/pkgconfig/qca2-qt4.pc
+mkspecs/
+mkspecs/features/
+mkspecs/features/crypto.prf
+share/man/
+share/man/man1/
+@man share/man/man1/qcatool-qt4.1
Index: security/qca2/pkg/PLIST-ossl
===================================================================
RCS file: security/qca2/pkg/PLIST-ossl
diff -N security/qca2/pkg/PLIST-ossl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca2/pkg/PLIST-ossl 7 Jul 2017 12:35:50 -0000
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@conflict qca-ossl-*
+@pkgpath security/qca-ossl
+lib/qca-qt4/
+lib/qca-qt4/crypto/
+lib/qca-qt4/crypto/libqca-ossl.so
Index: security/qoauth/Makefile
===================================================================
RCS file: /cvs/ports/security/qoauth/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- security/qoauth/Makefile 10 Apr 2017 11:46:33 -0000 1.5
+++ security/qoauth/Makefile 7 Jul 2017 12:35:50 -0000
@@ -6,13 +6,14 @@ DISTNAME = qoauth-${V}-src
PKGNAME = ${DISTNAME:C/-src//}
CATEGORIES = security devel
HOMEPAGE = https://github.com/ayoy/qoauth
+REVISION = 0
SHARED_LIBS = qoauth 0.0
# LGPLv2.1+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = lib/qt4/QtNetwork m pthread qca2 ${LIBCXX}
+WANTLIB = lib/qt4/QtNetwork m pthread qca-qt4 ${LIBCXX}
MASTER_SITES = http://files.ayoy.net/qoauth/$V/
EXTRACT_SUFX = .tar.bz2
Index: security/qoauth/patches/patch-src_src_pro
===================================================================
RCS file: security/qoauth/patches/patch-src_src_pro
diff -N security/qoauth/patches/patch-src_src_pro
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qoauth/patches/patch-src_src_pro 7 Jul 2017 12:35:50 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/src.pro
+--- src/src.pro.orig
++++ src/src.pro
+@@ -57,6 +57,9 @@ else:unix {
+ isEmpty( PREFIX ):INSTALL_PREFIX = /usr
+ else:INSTALL_PREFIX = $${PREFIX}
+
++ INCLUDEPATH += $${PREFIX}/include/Qca-qt4/QtCrypto
++ LIBS += -lqca-qt4
++
+ # this creates a pkgconfig file
+ system( ./pcfile.sh $${INSTALL_PREFIX} $${VERSION} )
+ pkgconfig.files = qoauth.pc
Index: security/qoauth/patches/patch-tests_ft_interface_ft_interface_pro
===================================================================
RCS file: security/qoauth/patches/patch-tests_ft_interface_ft_interface_pro
diff -N security/qoauth/patches/patch-tests_ft_interface_ft_interface_pro
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qoauth/patches/patch-tests_ft_interface_ft_interface_pro 7 Jul
2017 12:35:50 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: tests/ft_interface/ft_interface.pro
+--- tests/ft_interface/ft_interface.pro.orig
++++ tests/ft_interface/ft_interface.pro
+@@ -17,6 +17,8 @@ else:unix {
+ # the second argument (after colon) is for
+ # being able to run make check from the root source directory
+ LIBS += -Wl,-rpath,../../lib:lib
++ LIBS += -lqca-qt4
++ INCLUDEPATH += $${PREFIX}/include/Qca-qt4/QtCrypto
+ }
+
+ INCLUDEPATH += . ../../src
Index: security/qoauth/patches/patch-tests_ut_interface_ut_interface_pro
===================================================================
RCS file: security/qoauth/patches/patch-tests_ut_interface_ut_interface_pro
diff -N security/qoauth/patches/patch-tests_ut_interface_ut_interface_pro
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qoauth/patches/patch-tests_ut_interface_ut_interface_pro 7 Jul
2017 12:35:50 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: tests/ut_interface/ut_interface.pro
+--- tests/ut_interface/ut_interface.pro.orig
++++ tests/ut_interface/ut_interface.pro
+@@ -17,6 +17,8 @@ else:unix {
+ # the second argument (after colon) is for
+ # being able to run make check from the root source directory
+ LIBS += -Wl,-rpath,../../lib:lib
++ LIBS += -lqca-qt4
++ INCLUDEPATH += $${PREFIX}/include/Qca-qt4/QtCrypto
+ }
+
+ INCLUDEPATH += . ../../src
Index: x11/kde4/kget/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/kget/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- x11/kde4/kget/Makefile 26 Jun 2015 09:18:40 -0000 1.9
+++ x11/kde4/kget/Makefile 7 Jul 2017 12:35:56 -0000
@@ -2,7 +2,7 @@
COMMENT = download manager for KDE
DISTNAME = kget-${MODKDE4_VERSION}
-REVISION = 2
+REVISION = 3
CATEGORIES = net
HOMEPAGE = http://projects.kde.org/projects/kde/kdenetwork/kget
@@ -19,7 +19,7 @@ WANTLIB += ${KDE4LIB}/kworkspace ${KDE4L
WANTLIB += ${KDE4LIB}/nepomukcore ${KDE4LIB}/nepomukutils
WANTLIB += ${KDE4LIB}/nepomukwidgets ${KDE4LIB}/plasma ${KDE4LIB}/solid
WANTLIB += assuan gpg-error gpgme++-pthread gpgme-pthread mms
-WANTLIB += qca2 qgpgme soprano
+WANTLIB += qgpgme soprano qca-qt4
MODULES = devel/gettext multimedia/phonon
MODKDE4_USE = pim workspace
Index: x11/kde4/kopete/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/kopete/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- x11/kde4/kopete/Makefile 30 Aug 2016 09:54:14 -0000 1.17
+++ x11/kde4/kopete/Makefile 7 Jul 2017 12:35:56 -0000
@@ -6,7 +6,7 @@ DISTNAME = kopete-${MODKDE4_VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-sounds = kde4-kopete-sounds-${MODKDE4_VERSION}
PKG_ARCH-sounds = *
-REVISION-main = 4
+REVISION-main = 5
REVISION-sounds = 3
CATEGORIES = net
@@ -42,7 +42,7 @@ WANTLIB-main += ${KDE4LIB}/kpimidentitie
WANTLIB-main += ${KDE4LIB}/kresources ${KDE4LIB}/ktexteditor
WANTLIB-main += ${KDE4LIB}/kutils ${KDE4LIB}/nepomuk
WANTLIB-main += ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid
-WANTLIB-main += gadu glib-2.0 idn jasper jpeg meanwhile otr qca2
+WANTLIB-main += gadu glib-2.0 idn jasper jpeg meanwhile otr qca-qt4
WANTLIB-main += qimageblitz soprano xml2 xslt
MODULES = multimedia/phonon
Index:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_protocol_cpp
===================================================================
RCS file:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_protocol_cpp
diff -N
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_protocol_cpp
---
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_protocol_cpp
8 Dec 2013 18:39:44 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_protocol_cpp,v
1.1.1.1 2013/12/08 18:39:44 zhuk Exp $
---- protocols/jabber/libiris/src/xmpp/xmpp-core/protocol.cpp.orig Wed Jun
23 13:40:33 2010
-+++ protocols/jabber/libiris/src/xmpp/xmpp-core/protocol.cpp Wed Jun 23
13:40:43 2010
-@@ -25,7 +25,7 @@
-
- #include "protocol.h"
-
--#include <qca.h>
-+#include <QtCrypto/qca.h>
- #include <QList>
- #include <QByteArray>
- #include <QtCrypto>
Index:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_securestream_h
===================================================================
RCS file:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_securestream_h
diff -N
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_securestream_h
---
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_securestream_h
8 Dec 2013 18:39:44 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_securestream_h,v
1.1.1.1 2013/12/08 18:39:44 zhuk Exp $
---- protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h.orig Wed Jun
23 13:39:50 2010
-+++ protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h Wed Jun 23
13:39:56 2010
-@@ -21,7 +21,7 @@
- #ifndef SECURESTREAM_H
- #define SECURESTREAM_H
-
--#include <qca.h>
-+#include <QtCrypto/qca.h>
- #include "bytestream.h"
-
- #define USE_TLSHANDLER
Index:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_simplesasl_cpp
===================================================================
RCS file:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_simplesasl_cpp
diff -N
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_simplesasl_cpp
---
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_simplesasl_cpp
8 Dec 2013 18:39:44 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_simplesasl_cpp,v
1.1.1.1 2013/12/08 18:39:44 zhuk Exp $
---- protocols/jabber/libiris/src/xmpp/xmpp-core/simplesasl.cpp.orig Wed Aug
28 21:16:17 2013
-+++ protocols/jabber/libiris/src/xmpp/xmpp-core/simplesasl.cpp Fri Nov 8
01:48:17 2013
-@@ -24,7 +24,7 @@
- #include <qhostaddress.h>
- #include <qstringlist.h>
- #include <QList>
--#include <qca.h>
-+#include <QtCrypto/qca.h>
- #include <QByteArray>
- #include <stdlib.h>
- #include <QtCrypto>
Index:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_tlshandler_cpp
===================================================================
RCS file:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_tlshandler_cpp
diff -N
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_tlshandler_cpp
---
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_tlshandler_cpp
8 Dec 2013 18:39:44 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-protocols_jabber_libiris_iris_xmpp_xmpp-core_tlshandler_cpp,v
1.1.1.1 2013/12/08 18:39:44 zhuk Exp $
---- protocols/jabber/libiris/src/xmpp/xmpp-core/tlshandler.cpp.orig Wed Jun
23 13:40:33 2010
-+++ protocols/jabber/libiris/src/xmpp/xmpp-core/tlshandler.cpp Wed Jun 23
13:40:48 2010
-@@ -21,7 +21,7 @@
- #include "xmpp.h"
-
- #include <qtimer.h>
--#include "qca.h"
-+#include <QtCrypto/qca.h>
-
- using namespace XMPP;
-
Index:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-im_s5b_cpp
===================================================================
RCS file:
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-im_s5b_cpp
diff -N
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-im_s5b_cpp
---
x11/kde4/kopete/patches/patch-protocols_jabber_libiris_iris_xmpp_xmpp-im_s5b_cpp
8 Dec 2013 18:39:44 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-protocols_jabber_libiris_iris_xmpp_xmpp-im_s5b_cpp,v 1.1.1.1
2013/12/08 18:39:44 zhuk Exp $
---- protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.cpp.orig Wed Aug 28
21:16:17 2013
-+++ protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.cpp Fri Nov 8 01:48:17 2013
-@@ -24,7 +24,7 @@
- #include <QPointer>
- #include <QByteArray>
- #include <stdlib.h>
--#include <qca.h>
-+#include <QtCrypto/qca.h>
- #include "xmpp_xmlcommon.h"
- #include "im.h"
- #include "socks.h"
Index: x11/kde4/ksirk/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/ksirk/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- x11/kde4/ksirk/Makefile 26 Jun 2015 09:18:40 -0000 1.11
+++ x11/kde4/ksirk/Makefile 7 Jul 2017 12:35:56 -0000
@@ -2,7 +2,7 @@
COMMENT = strategy game for KDE
DISTNAME = ksirk-${MODKDE4_VERSION}
-REVISION = 2
+REVISION = 3
SHARED_LIBS = iris_ksirk 51.0 # 4.10
@@ -11,7 +11,7 @@ WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui
WANTLIB += lib/qt4/QtNetwork lib/qt4/QtSvg lib/qt4/QtXml
WANTLIB += ${KDE4LIB}/kdegamesprivate ${KDE4LIB}/kdeui ${KDE4LIB}/kio
WANTLIB += ${KDE4LIB}/knewstuff3
-WANTLIB += qca2
+WANTLIB += qca-qt4
MODULES = multimedia/phonon
MODKDE4_USE = games
Index: x11/kde4/libs/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/libs/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- x11/kde4/libs/Makefile 17 Jun 2017 21:58:59 -0000 1.79
+++ x11/kde4/libs/Makefile 7 Jul 2017 12:35:56 -0000
@@ -5,7 +5,7 @@ COMMENT-en_US = KDE en_US locale data
COMMENT-langlist = list of languages supported by KDE
CATEGORIES = devel
V = 4.14.10
-REVISION-main = 8
+REVISION-main = 9
DISTNAME = kdelibs-$V
PKGNAME-main = ${DISTNAME}
PKGNAME-en_US = kde4-locale-en_US-$V
@@ -79,7 +79,7 @@ WANTLIB-main += lib/qt4/QtScript lib/qt4
WANTLIB-main += lib/qt4/QtWebKit lib/qt4/QtXml
WANTLIB-main += aspell attica bz2 dbusmenu-qt enchant exslt fam
WANTLIB-main += gif lib/inotify/inotify jasper jpeg lzma
-WANTLIB-main += png polkit-qt-core-1 qca2 soprano sopranoclient
+WANTLIB-main += png polkit-qt-core-1 qca-qt4 soprano sopranoclient
WANTLIB-main += streamanalyzer streams xml2 xslt
MULTI_PACKAGES = -main -langlist -en_US
Index: x11/kde4/libs/patches/patch-cmake_modules_FindQCA2_cmake
===================================================================
RCS file: /cvs/ports/x11/kde4/libs/patches/patch-cmake_modules_FindQCA2_cmake,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-cmake_modules_FindQCA2_cmake
--- x11/kde4/libs/patches/patch-cmake_modules_FindQCA2_cmake 24 Apr 2013
19:45:29 -0000 1.1
+++ x11/kde4/libs/patches/patch-cmake_modules_FindQCA2_cmake 7 Jul 2017
12:35:56 -0000
@@ -1,12 +1,20 @@
$OpenBSD: patch-cmake_modules_FindQCA2_cmake,v 1.1 2013/04/24 19:45:29 zhuk
Exp $
---- cmake/modules/FindQCA2.cmake.orig Wed Jul 27 22:34:31 2011
-+++ cmake/modules/FindQCA2.cmake Mon Feb 6 02:11:03 2012
-@@ -32,7 +32,7 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
+Index: cmake/modules/FindQCA2.cmake
+--- cmake/modules/FindQCA2.cmake.orig
++++ cmake/modules/FindQCA2.cmake
+@@ -26,13 +26,13 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
+
+ if (NOT WIN32)
+ find_package(PkgConfig)
+- pkg_check_modules(PC_QCA2 QUIET qca2)
++ pkg_check_modules(PC_QCA2 QUIET qca2-qt4)
+ set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER})
+ endif (NOT WIN32)
find_library_with_debug(QCA2_LIBRARIES
WIN32_DEBUG_POSTFIX d
- NAMES qca
-+ NAMES qca2 qca
++ NAMES qca-qt4
HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS}
)
Index: x11/kde4/okteta/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/okteta/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- x11/kde4/okteta/Makefile 28 May 2015 10:17:30 -0000 1.4
+++ x11/kde4/okteta/Makefile 7 Jul 2017 12:35:56 -0000
@@ -2,7 +2,7 @@
COMMENT = hex file editor for KDE
DISTNAME = okteta-${MODKDE4_VERSION}
-REVISION = 1
+REVISION = 2
CATEGORIES = devel sysutils
HOMEPAGE = http://projects.kde.org/projects/kde/kdesdk/okteta
@@ -23,7 +23,7 @@ WANTLIB += lib/qt4/QtXml
WANTLIB += ${KDE4LIB}/kcmutils ${KDE4LIB}/kdeui ${KDE4LIB}/kfile
WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/knewstuff3 ${KDE4LIB}/kparts
WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid
-WANTLIB += qca2 soprano
+WANTLIB += qca-qt4 soprano
BUILD_DEPENDS = misc/shared-mime-info
Index: x11/kde4/okular/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/okular/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- x11/kde4/okular/Makefile 6 Jan 2016 11:05:34 -0000 1.19
+++ x11/kde4/okular/Makefile 7 Jul 2017 12:35:56 -0000
@@ -2,7 +2,7 @@
COMMENT = KDE document viewer
DISTNAME = okular-${MODKDE4_VERSION}
-REVISION = 3
+REVISION = 4
SHARED_LIBS = okularcore 51.0 # 1.7
@@ -15,8 +15,8 @@ WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs
WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kprintutils ${KDE4LIB}/kpty
WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
WANTLIB += ${KDE4LIB}/qmobipocket
-WANTLIB += chm djvulibre epub freetype jpeg kscreen poppler-qt4 qca2
qimageblitz
-WANTLIB += qjson soprano solid spectre threadweaver tiff
+WANTLIB += chm djvulibre epub freetype jpeg kscreen poppler-qt4 qimageblitz
+WANTLIB += qjson soprano solid spectre threadweaver tiff qca-qt4
MODULES = multimedia/phonon
Index: x11/kde4/plasma-addons/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/plasma-addons/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- x11/kde4/plasma-addons/Makefile 26 Jun 2015 09:18:40 -0000 1.13
+++ x11/kde4/plasma-addons/Makefile 7 Jul 2017 12:35:56 -0000
@@ -2,7 +2,7 @@
COMMENT = extra KDE plasmoids
DISTNAME = kdeplasma-addons-${MODKDE4_VERSION}
-REVISION = 2
+REVISION = 3
SHARED_LIBS = lancelot-datamodels 51.1 # 1.7
SHARED_LIBS += lancelot 51.1 # 1.9
@@ -33,7 +33,7 @@ WANTLIB += ${KDE4LIB}/taskmanager
WANTLIB += ${KDE4LIB}/threadweaver ${KDE4LIB}/weather_ion
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 ibus-1.0
WANTLIB += scim-1.0
-WANTLIB += attica cln dbusmenu-qt qalculate qca2 qimageblitz qjson qoauth
+WANTLIB += attica cln dbusmenu-qt qalculate qca-qt4 qimageblitz qjson qoauth
WANTLIB += qwt soprano xml2
MODULES = devel/gettext multimedia/phonon
Index: x11/kde4/runtime/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/runtime/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- x11/kde4/runtime/Makefile 3 May 2017 16:21:09 -0000 1.32
+++ x11/kde4/runtime/Makefile 7 Jul 2017 12:35:56 -0000
@@ -6,7 +6,7 @@ DISTNAME = kde-runtime-${MODKDE4_VERSIO
PKGNAME-main = ${DISTNAME}
PKGNAME-locale = kde4-locale-${MODKDE4_VERSION}
PKG_ARCH-locale = *
-REVISION-main = 9
+REVISION-main = 10
REVISION-locale = 1
DPB_PROPERTIES = parallel
@@ -64,7 +64,7 @@ RUN_DEPENDS-main = ${RUN_DEPENDS} \
RUN_DEPENDS-main += x11/dbus,-suid
# QCA2 is useless without this
-RUN_DEPENDS-main += security/qca-ossl
+RUN_DEPENDS-main += security/qca2,-ossl
LIB_DEPENDS-locale =
LIB_DEPENDS-main = ${LIB_DEPENDS} \
