On Mon Jul 10, 2017 at 09:04:56AM +0100, Stuart Henderson wrote:
> On 2017/07/09 23:24, Rafael Sadowski wrote:
> > On Sun Jul 09, 2017 at 10:40:14PM +0200, Landry Breuil wrote:
> > > On Sun, Jul 09, 2017 at 10:22:51PM +0200, Rafael Sadowski wrote:
> > >
> > > > > > +@conflict qca-1*
> > > > > > +@pkgpath security/qca
> > > > >
> > > > > I suppose you've tested the upgrade path :)
> > > >
> > > > This was the last task after final diff and it works with the main port:
> > > >
> > > > "qca2-2.0.3p2->2.1.3: ok"
> > > >
> > > > but not with the new flavors. I'm going crazy, I've tried so much but
> > > > nothing works :( Any advice?
> > > >
> > > > Final diff below expect for the last old qca-{ossl,gnupg} ->
> > > > qca2,{ossl,gnupg} update bits.
> > >
> > > You dont need this .if/.endif, as since we removed the pseudo flavors
> > > we're
> > > always building those pkgs - just merge the CONFIGURE_ARGS (ie remove
> > > -DBUILD_PLUGINS:Bool=OFF from above) and specify the DEPENDS for
> > > subpackages. Those WANTLIB below are duplicate too.
> > >
> > > > +.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
> > > > +CONFIGURE_ARGS += -DBUILD_PLUGINS="ossl;gnupg"
> > > > +LIB_DEPENDS-ossl += ${BUILD_PKGPATH},-main
> > > > +LIB_DEPENDS-gnupg += ${BUILD_PKGPATH},-main
> > > >
> > > > -WANTLIB += c m pthread ${LIBCXX}
> > > > +RUN_DEPENDS-gnupg += security/gnupg
> > > > +.endif
> > >
> > > Looking at other plugins, shouldnt you also merge qca-tls plugin ? Or
> > > remove it as it's unused ? If it's not in qca2 it might be replaced by
> > > ossl..
> >
> > There is no qca-tls plugin, I'll remove it because no port use it.
> >
> > >
> > > Now, for the upgrade paths:
> > >
> > > > +++ security/qca2/pkg/PLIST-gnupg 9 Jul 2017 20:11:09 -0000
> > > > +@conflict qca-gnupg-*
> > > > +@pkgpath security/qca-gnupg
> > >
> > > > +++ security/qca2/pkg/PLIST-main 9 Jul 2017 20:11:09 -0000
> > > > +@conflict qca-<=1.0
> > > > +@pkgpath security/qca2
> > >
> > > here i think you also need @pkgpath security/qca if you want to upgrade
> > > it to qca2. The first @pkgpath here is (i think) to update qca2 to
> > > qca2,-main (ie the multipackage split)
> >
> > I'll not update security/qca to security/qca2 because I think qca is
> > dead. No port uses it.
> >
> > >
> > > And then if you remove qca, qca-ossl and qca-gnupg you *might* need a
> > > quirks entry for their removal (unsure, as they should be updated.. to
> > > test)
> > >
> > > > +++ security/qca2/pkg/PLIST-ossl 9 Jul 2017 20:11:09 -0000
> > > > +@conflict qca-ossl-*
> > > > +@pkgpath security/qca-ossl
> > >
> > > As for ossl and gnupg, the conflict/pkgpath look fine to me, did you try
> > > upgrading all of them in a single updateset ?
> >
> > Yes exactly.
> >
> > > ie pkg_add qca qca-ossl
> > > qca-gnupg && PKG_PATH=/wher/you/have/newpkg pkg_add -u qca qca-ossl
> > > qca-gnupg ?
> > >
> >
> > both, `pkg_add` -u and `pkg_add -u qca qca-ossl qca-gnupg` only work
> > with the quirks diff below (more precisely with the qca-{ossl,gnupg}
> > entries in $stem_extensions):
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/quirks/Makefile,v
> > retrieving revision 1.492
> > diff -u -p -u -p -r1.492 Makefile
> > --- Makefile 9 Jul 2017 11:01:56 -0000 1.492
> > +++ Makefile 9 Jul 2017 21:18:59 -0000
> > @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> > DISTFILES =
> >
> > # API.rev
> > -PKGNAME = quirks-2.337
> > +PKGNAME = quirks-2.338
> > PKG_ARCH = *
> > MAINTAINER = Marc Espie <[email protected]>
> >
> > Index: files/Quirks.pm
> > ===================================================================
> > RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> > retrieving revision 1.504
> > diff -u -p -u -p -r1.504 Quirks.pm
> > --- files/Quirks.pm 9 Jul 2017 11:01:57 -0000 1.504
> > +++ files/Quirks.pm 9 Jul 2017 21:18:59 -0000
> > @@ -412,8 +412,11 @@ my $stem_extensions = {
> > 'markdown' => 'py-markdown',
> > 'netperf-wrapper' => 'flent',
> > 'kamailio-xmlrpc' => 'kamailio-xml',
> > + 'qca-gnupg' => 'qca2-gnupg',
> > + 'qca-ossl' => 'qca2-ossl',
> > };
> >
> > +
> > my $obsolete_reason = {
> > 'BitTorrent' => 0,
> > 'BitTorrent-gui' => 0,
> > @@ -987,6 +990,8 @@ my $obsolete_reason = {
> > 'mrxvt' => 2,
> > 'net/cutegram' => 3,
> > 'devel/libqtelegram-aseman-edition' => 5,
> > + 'qca' => 3,
> > + 'qca-tls' => 3,
> > };
> >
> > # reasons for obsolete packages
> >
> >
> >
>
> Do you actually need to change the names for qca-gnupg / qca-ossl,
> can't they just stay with the same names? Then you can drop the
> renaming in quirks and the @conflict, then you just need @pkgpath
> and the obsolete entries in quirks ..
>
> Personally I'd probably merge it all into security/qca and name
> it as qca-2.x.x, just get rid of qca2, then the only quirks entry
> would be one obsolete entry for qca-tls ...
The idea is good and works for me:
# -> pkg_info | grep qca
qca-1.0p8 Qt Cryptographic Architecture
qca-gnupg-2.0.0beta3 GnuPG plugin for QCA2
qca-ossl-2.0.0beta3p5 SSL/TLS plugin for QCA2
qca2-2.0.3p2 Qt Cryptographic Architecture
# env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u
qca-1.0p8+qca2-2.0.3p2->qca-2.1.3 forward dependencies:
| Dependency of qca-ossl-2.0.0beta3p5 on qca2-* doesn't match
| Dependency of qca-gnupg-2.0.0beta3 on qca2-* doesn't match
Merging qca-ossl-2.0.0beta3p5->2.1.3 (ok)
Merging qca-gnupg-2.0.0beta3->2.1.3 (ok)
qca-1.0p8+qca-gnupg-2.0.0beta3+qca-ossl-2.0.0beta3p5+qca2-2.0.3p2->qca-2.1.3+qca-gnupg-2.1.3+qca-ossl-2.1.3:
ok
Read shared items: ok
# pkg_info | grep qca
qca-2.1.3 Qt Cryptographic Architecture for Qt4
qca-gnupg-2.1.3 GnuPG plugin
qca-ossl-2.1.3 SSL/TLS plugin
I don't know if "Dependency of qca-ossl-2.0.0beta3p5 on qca2-* doesn't
match" noise is okay but it works with the (final) diff below.
When I get an OK I'll build all consumers again and commit.
Best regards,
Rafael
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 10 Jul 2017 15:44:55 -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 qjson tag>=5.0 usb-1.0 xml2 ${LIBECXX}
# those are dlopen'ed
WANTLIB += plist
@@ -58,7 +58,7 @@ LIB_DEPENDS = audio/chromaprint \
multimedia/gstreamer-0.10/core \
multimedia/gstreamer-0.10/plugins-base \
net/libmygpo-qt \
- security/qca2
+ security/qca
TEST_DEPENDS = ${MODPY_BUILD_DEPENDS}
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.492
diff -u -p -u -p -r1.492 Makefile
--- devel/quirks/Makefile 9 Jul 2017 11:01:56 -0000 1.492
+++ devel/quirks/Makefile 10 Jul 2017 15:45:01 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.337
+PKGNAME = quirks-2.338
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.504
diff -u -p -u -p -r1.504 Quirks.pm
--- devel/quirks/files/Quirks.pm 9 Jul 2017 11:01:57 -0000 1.504
+++ devel/quirks/files/Quirks.pm 10 Jul 2017 15:45:02 -0000
@@ -987,6 +987,7 @@ my $obsolete_reason = {
'mrxvt' => 2,
'net/cutegram' => 3,
'devel/libqtelegram-aseman-edition' => 5,
+ 'security/qca-tls' => 3,
};
# reasons for obsolete packages
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 10 Jul 2017 15:45:04 -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 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 soprano
WANTLIB-main += sqlite tiff usb
WANTLIB-mediawiki = ${WANTLIB-common}
@@ -128,7 +128,7 @@ LIB_DEPENDS-kipi = ${LIB_DEPENDS-common}
graphics/tiff \
multimedia/qt-gstreamer \
net/libkvkontakte \
- security/qca2 \
+ security/qca \
security/kqoauth \
x11/kde-applications/libkgeomap>=15.04.3 \
${MODKDE4_DEP_DIR}/libkdcraw \
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 10 Jul 2017 15:45:08 -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 += qca soprano
MASTER_SITES = ${MASTER_SITE_KDE:=stable/konversation/$V/src/}
@@ -29,7 +29,7 @@ MODKDE4_USE = pim
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS = security/qca2
+LIB_DEPENDS = security/qca
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
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 10 Jul 2017 15:45:08 -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
MASTER_SITES = ${HOMEPAGE}downloads/${V:C/^./4/}/
@@ -31,7 +31,7 @@ BUILD_DEPENDS = devel/boost \
LIB_DEPENDS = devel/gmp \
security/libgcrypt \
- security/qca2
+ security/qca
CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes
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 10 Jul 2017 15:45:10 -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,25 +16,24 @@ 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 ${LIBCXX} z
MODULES= x11/qt4 \
devel/gettext
USE_GMAKE= Yes
-LIB_DEPENDS= security/qca2 \
+LIB_DEPENDS= security/qca \
textproc/enchant
RUN_DEPENDS= devel/desktop-file-utils \
- security/qca-gnupg \
- security/qca-ossl \
+ security/qca,-gnupg \
+ security/qca,-ossl \
x11/gtk+3,-guic
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= --prefix=${LOCALBASE} \
--qtdir=${MODQT4_QTDIR} \
- --with-qca-inc=${LOCALBASE}/include/QtCrypto \
--disable-growl
# For QSettings to write its setup
Index: net/psi/patches/patch-configure
===================================================================
RCS file: net/psi/patches/patch-configure
diff -N net/psi/patches/patch-configure
--- net/psi/patches/patch-configure 21 Apr 2013 13:56:27 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.6 2013/04/21 13:56:27 shadchin Exp $
---- configure.orig Fri Aug 17 08:52:47 2012
-+++ configure Fri Aug 24 00:43:38 2012
-@@ -622,7 +622,7 @@ static QString internal_crypto_prf(const QString &incd
- "isEmpty(LINKAGE) {\n"
- " !isEmpty(QCA_INCDIR):INCLUDEPATH += \$\$QCA_INCDIR/QtCrypto\n"
- " !isEmpty(QCA_LIBDIR):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"
Index: security/qca/Makefile
===================================================================
RCS file: /cvs/ports/security/qca/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- security/qca/Makefile 10 Apr 2017 11:46:33 -0000 1.18
+++ security/qca/Makefile 10 Jul 2017 15:45:11 -0000
@@ -1,32 +1,58 @@
# $OpenBSD: Makefile,v 1.18 2017/04/10 11:46:33 sthen Exp $
-COMMENT= Qt Cryptographic Architecture
+COMMENT-main = Qt Cryptographic Architecture for Qt4
+COMMENT-ossl = SSL/TLS plugin
+COMMENT-gnupg = GnuPG plugin
-DISTNAME= qca-1.0
-REVISION= 8
-CATEGORIES= security
-SHARED_LIBS= qca 2.0
+VERSION = 2.1.3
+DISTNAME = qca-${VERSION}
-HOMEPAGE= http://delta.affinix.com/qca/
+PKGNAME-main = qca-${VERSION}
+PKGNAME-ossl = qca-ossl-${VERSION}
+PKGNAME-gnupg = qca-gnupg-${VERSION}
-MAINTAINER= Gerardo Santana Gomez Garrido <[email protected]>
+CATEGORIES = security
-# LGPL
-PERMIT_PACKAGE_CDROM= Yes
+SHARED_LIBS += qca 3.0 # 2.1
-WANTLIB += m pthread ${LIBCXX}
+HOMEPAGE = https://userbase.kde.org/QCA
-MASTER_SITES= http://delta.affinix.com/download/qca/
-EXTRACT_SUFX= .tar.bz2
+# LGPLv2.1
+PERMIT_PACKAGE_CDROM = Yes
-MODULES= x11/qt3 devel/qmake
+WANTLIB += QtCore c m ${LIBCXX}
+WANTLIB-ossl += QtCore crypto m qca ssl ${LIBCXX}
+WANTLIB-gnupg += QtCore m qca ${LIBCXX}
-NO_TEST= Yes
+MASTER_SITES = ${MASTER_SITE_KDE:=stable/qca/${VERSION}/src/}
+EXTRACT_SUFX = .tar.xz
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/qt3
- ${INSTALL_DATA} ${WRKBUILD}/libqca.so.${LIBqca_VERSION}
${PREFIX}/lib/qt3
- cd ${PREFIX}/lib && ln -s qt3/libqca.so.${LIBqca_VERSION}
- ${INSTALL_DATA} ${WRKSRC}/src/qca.h ${PREFIX}/include
+# Plugins: qca-botan qca-cyrus-sasl qca-gcrypt qca-gnupg qca-logger
+# qca-nss qca-ossl qca-pkcs11 qca-softstore
+MULTI_PACKAGES = -main -ossl -gnupg
+
+CFLAGS += -DOPENSSL_NO_SSL2 \
+ -DOPENSSL_NO_SSL3_METHOD
+
+CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=${LOCALBASE} \
+ -DQCA_MAN_INSTALL_DIR=${LOCALBASE}/man \
+ -DQCA_BINARY_INSTALL_DIR=${PREFIX}/bin \
+ -DBUILD_PLUGINS:Bool=OFF \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=ON \
+ -DQT4_BUILD:Bool=ON
+
+.include <bsd.port.arch.mk>
+
+MODULES = devel/cmake
+
+LIB_DEPENDS = x11/qt4
+
+.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
+CONFIGURE_ARGS += -DBUILD_PLUGINS="ossl;gnupg"
+LIB_DEPENDS-ossl += ${BUILD_PKGPATH},-main
+LIB_DEPENDS-gnupg += ${BUILD_PKGPATH},-main
+
+RUN_DEPENDS-gnupg += security/gnupg
+.endif
.include <bsd.port.mk>
Index: security/qca/distinfo
===================================================================
RCS file: /cvs/ports/security/qca/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- security/qca/distinfo 18 Jan 2015 03:15:07 -0000 1.3
+++ security/qca/distinfo 10 Jul 2017 15:45:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (qca-1.0.tar.bz2) = YUuMngPYeWyQ9/MW8qzmalNWJwp1kh6nLOvxKd5JHFs=
-SIZE (qca-1.0.tar.bz2) = 30677
+SHA256 (qca-2.1.3.tar.xz) = AD/YajJCEFegOxioFo21LilAl4+dteu7agiIL4qx41M=
+SIZE (qca-2.1.3.tar.xz) = 686340
Index: security/qca/patches/patch-QcaConfig_cmake_in
===================================================================
RCS file: security/qca/patches/patch-QcaConfig_cmake_in
diff -N security/qca/patches/patch-QcaConfig_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca/patches/patch-QcaConfig_cmake_in 10 Jul 2017 15:45:11
-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/qca/pkg/DESCR
===================================================================
RCS file: security/qca/pkg/DESCR
diff -N security/qca/pkg/DESCR
--- security/qca/pkg/DESCR 19 May 2005 20:26:59 -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/qca/pkg/DESCR-gnupg
===================================================================
RCS file: security/qca/pkg/DESCR-gnupg
diff -N security/qca/pkg/DESCR-gnupg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca/pkg/DESCR-gnupg 10 Jul 2017 15:45:11 -0000
@@ -0,0 +1,2 @@
+Provider plugin for QCA (Qt crypto helper library). This plugin provides
+features based on GnuPG.
Index: security/qca/pkg/DESCR-main
===================================================================
RCS file: security/qca/pkg/DESCR-main
diff -N security/qca/pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca/pkg/DESCR-main 10 Jul 2017 15:45:11 -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/qca/pkg/DESCR-ossl
===================================================================
RCS file: security/qca/pkg/DESCR-ossl
diff -N security/qca/pkg/DESCR-ossl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca/pkg/DESCR-ossl 10 Jul 2017 15:45:11 -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/qca/pkg/PLIST
===================================================================
RCS file: security/qca/pkg/PLIST
diff -N security/qca/pkg/PLIST
--- security/qca/pkg/PLIST 16 Mar 2015 18:07:55 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.5 2015/03/16 18:07:55 naddy Exp $
-@conflict qca2-<=2.0.3p0
-include/qca.h
-@lib lib/libqca.so.${LIBqca_VERSION}
-lib/qt3/
-@lib lib/qt3/libqca.so.${LIBqca_VERSION}
Index: security/qca/pkg/PLIST-gnupg
===================================================================
RCS file: security/qca/pkg/PLIST-gnupg
diff -N security/qca/pkg/PLIST-gnupg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca/pkg/PLIST-gnupg 10 Jul 2017 15:45:11 -0000
@@ -0,0 +1,3 @@
+@comment $OpenBSD$
+@pkgpath security/qca-gnupg
+lib/qca/crypto/libqca-gnupg.so
Index: security/qca/pkg/PLIST-main
===================================================================
RCS file: security/qca/pkg/PLIST-main
diff -N security/qca/pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca/pkg/PLIST-main 10 Jul 2017 15:45:11 -0000
@@ -0,0 +1,40 @@
+@comment $OpenBSD$
+@conflict qca-<=1.0
+@conflict qca2-<=2.0.3
+@pkgpath security/qca
+@pkgpath security/qca2
+@bin bin/mozcerts
+@bin bin/qcatool
+certs/
+certs/rootcerts.pem
+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_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/
+lib/cmake/Qca/QcaConfig.cmake
+lib/cmake/Qca/QcaConfigVersion.cmake
+lib/cmake/Qca/QcaTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/Qca/QcaTargets.cmake
+lib/qca/
+lib/qca/crypto/
+@lib lib/libqca.so.${LIBqca_VERSION}
+lib/pkgconfig/qca2.pc
+@man man/man1/qcatool.1
+mkspecs/
+mkspecs/features/
+mkspecs/features/crypto.prf
Index: security/qca/pkg/PLIST-ossl
===================================================================
RCS file: security/qca/pkg/PLIST-ossl
diff -N security/qca/pkg/PLIST-ossl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/qca/pkg/PLIST-ossl 10 Jul 2017 15:45:11 -0000
@@ -0,0 +1,3 @@
+@comment $OpenBSD$
+@pkgpath security/qca-ossl
+lib/qca/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 10 Jul 2017 15:45:11 -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 ${LIBCXX}
MASTER_SITES = http://files.ayoy.net/qoauth/$V/
EXTRACT_SUFX = .tar.bz2
@@ -21,7 +22,7 @@ MODULES = devel/qmake x11/qt4
SEPARATE_BUILD = No
MODQMAKE_ARGS = PREFIX=${PREFIX}
-LIB_DEPENDS = security/qca2
+LIB_DEPENDS = security/qca
MAKE_FLAGS = LIBqoauth_VERSION=${LIBqoauth_VERSION}
DESTDIRNAME = INSTALL_ROOT
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 10 Jul 2017 15:45:11 -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/QtCrypto
++ LIBS += -lqca
++
+ # 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 10 Jul
2017 15:45:11 -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
++ INCLUDEPATH += $${PREFIX}/include/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 10 Jul
2017 15:45:11 -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
++ INCLUDEPATH += $${PREFIX}/include/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 10 Jul 2017 15:45:17 -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 += qca qgpgme soprano
MODULES = devel/gettext multimedia/phonon
MODKDE4_USE = pim workspace
@@ -30,7 +30,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = multimedia/libmms \
net/libktorrent,${MODKDE4_FLAVOR} \
- security/qca2 \
+ security/qca \
${MODKDE4_DEP_DIR}/nepomuk-core>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/nepomuk-widgets>=${MODKDE4_DEP_VERSION}
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 10 Jul 2017 15:45:17 -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
WANTLIB-main += qimageblitz soprano xml2 xslt
MODULES = multimedia/phonon
@@ -61,7 +61,7 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
net/libgadu \
net/meanwhile \
security/libotr>=4 \
- security/qca2
+ security/qca
# disabled until all GoogleTalk issues are resolved
#WANTLIB-main += crypto expat mediastreamer_base mediastreamer_voip
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 10 Jul 2017 15:45:17 -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
MODULES = multimedia/phonon
MODKDE4_USE = games
@@ -19,6 +19,6 @@ MODKDE4_USE = games
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS = security/qca2
+LIB_DEPENDS = security/qca
.include <bsd.port.mk>
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 10 Jul 2017 15:45:17 -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 soprano sopranoclient
WANTLIB-main += streamanalyzer streams xml2 xslt
MULTI_PACKAGES = -main -langlist -en_US
@@ -120,7 +120,7 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
graphics/giflib \
graphics/jasper \
graphics/openexr \
- security/qca2 \
+ security/qca \
sysutils/gamin \
textproc/aspell/core \
textproc/enchant \
Index: x11/kde4/libs/patches/patch-cmake_modules_FindQCA2_cmake
===================================================================
RCS file: x11/kde4/libs/patches/patch-cmake_modules_FindQCA2_cmake
diff -N x11/kde4/libs/patches/patch-cmake_modules_FindQCA2_cmake
--- x11/kde4/libs/patches/patch-cmake_modules_FindQCA2_cmake 24 Apr 2013
19:45:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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)
-
- find_library_with_debug(QCA2_LIBRARIES
- WIN32_DEBUG_POSTFIX d
-- NAMES qca
-+ NAMES qca2 qca
- 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 10 Jul 2017 15:45:17 -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 soprano
BUILD_DEPENDS = misc/shared-mime-info
@@ -31,6 +31,6 @@ RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = security/qca2
+LIB_DEPENDS = security/qca
.include <bsd.port.mk>
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 10 Jul 2017 15:45:17 -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,7 +15,7 @@ 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 += chm djvulibre epub freetype jpeg kscreen poppler-qt4 qca qimageblitz
WANTLIB += qjson soprano solid spectre threadweaver tiff
MODULES = multimedia/phonon
@@ -30,7 +30,7 @@ LIB_DEPENDS = devel/chmlib \
graphics/tiff \
print/libspectre \
print/poppler,,-qt4 \
- security/qca2 \
+ security/qca \
textproc/ebook-tools \
x11/libkscreen<5 \
${MODKDE4_DEP_DIR}/graphics-mobipocket>=${MODKDE4_DEP_VERSION} \
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 10 Jul 2017 15:45:17 -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 qimageblitz qjson qoauth
WANTLIB += qwt soprano xml2
MODULES = devel/gettext multimedia/phonon
@@ -51,7 +51,7 @@ LIB_DEPENDS = devel/qjson \
inputmethods/scim \
math/libqalculate \
productivity/attica \
- security/qca2 \
+ security/qca \
security/qoauth \
x11/dbusmenu-qt \
x11/qwt \
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 10 Jul 2017 15:45:17 -0000
@@ -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/qca,-ossl
LIB_DEPENDS-locale =
LIB_DEPENDS-main = ${LIB_DEPENDS} \
