On Sat Jul 08, 2017 at 07:34:03AM +0200, Landry Breuil wrote: > On Fri, Jul 07, 2017 at 10:54:46PM +0200, Rafael Sadowski wrote: > > On Fri Jul 07, 2017 at 10:03:56PM +0200, Landry Breuil wrote: > > > On Fri, Jul 07, 2017 at 09:14:01PM +0200, Rafael Sadowski wrote: > > > > 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) > > > > > > That's a lot of churn - does it all come from upstream or that's a local > > > customisation ? Ie will the diffs be commited upstream once someone > > > tells them they dont build against newer qca2 ? > > > > > > > What do you mean with churn? I think, only one port in place of tree is > > a good idea. I renamed share lib and pkgname to avoid conflicts with > > security/qca (qca1) and upcoming qca2-qt5. The QcaConfig extension was > > necessary to patch and modify less the consumers. > > > > But after your e-mail I grep for security/qca and there are no consumers. > > New idea because we can get rid of qca1: > > > > - remove the old security/qca. > > - update qca from 2.0.3 to 2.1.3. (with MULTI_PACKAGES to remove > > security/{qca-ossl,qca-gnupg} > > You mean update *security/qca2* right ?
right, sorry for the QCA name kung-fu! Our qca situation is terrible in the ports tree: security/qca: extreme outdated, no consumers security/qca-tls: extreme outdated, no consumers security/qca-ossl: qca-ossl-2.0.0-beta3 security/qca-:gnupg qca-gnupg-2.0.0-beta3 New and simple solution: - remove security/{qca,qca-gnupg,qca-ossl,qca-tls} - update security/qca2 from 2.0.3 to 2.1.3. -- start SHARED_LIB with 3.0 because old security/qca is 2.0 -- Transform security/{qca-ossl,qca-gnupg} in one security/qca2 port with MULTI_PACKAGES -ossl and -gnupg. Background information: The QCA project merge all plugins into the main project > 2.0.0. - Don't rename sharedlib name from security/qca2. No longer necessary forever! > > > - don't remove pkgname. qca2 is okay > > - don't prefix qca with "-qt4" and don't rename qca to qca2 as it is > > currently. All consumers expect libqca and for Qt5 libqca-qt5. FreeBSD > > makes it so and I think, that's the bast way. > > So if i get it right, that'll be less churn around in the consumers ? I > think that'll be preffered then.... New diff below with less churn. Build fine on amd64. Only one runtime test with net/konversation but I do not expect any impact. Have a beautiful Sunday, 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 9 Jul 2017 08:16:36 -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 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 9 Jul 2017 08:16:45 -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 \ QtTest spatialindex spatialite sqlite3 qscintilla2 qjson WANTLIB += ${MODPY_WANTLIB} jpeg tiff 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 9 Jul 2017 08:16:45 -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} 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 9 Jul 2017 08:16:50 -0000 @@ -6,7 +6,7 @@ V = 1.5 DISTNAME = konversation-$V MAINTAINER = KDE porting team <openbsd-...@googlegroups.com> 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/} 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 9 Jul 2017 08:16:50 -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/}/ 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 9 Jul 2017 08:16:50 -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 ${LIBCXX} z MODULES= x11/qt4 \ devel/gettext @@ -26,15 +26,14 @@ 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 \ --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/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 9 Jul 2017 08:16:54 -0000 @@ -1,30 +1,61 @@ # $OpenBSD: Makefile,v 1.13 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 + +VERSION = 2.1.3 +DISTNAME = qca-${VERSION} + +PKGNAME-main = qca2-${VERSION} +PKGNAME-ossl = qca2-ossl-${VERSION} +PKGNAME-gnupg = qca2-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 3.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 +WANTLIB += c m ${LIBCXX} +WANTLIB-gnupg += m qca ${LIBCXX} +WANTLIBi-ossl += crypto m qca ssl ${LIBCXX} + +MASTER_SITES = ${MASTER_SITE_KDE:=stable/qca/${VERSION}/src/} +EXTRACT_SUFX = .tar.xz + +# Plugins: qca-botan qca-cyrus-sasl qca-gcrypt qca-gnupg qca-logger +# qca-nss qca-ossl qca-pkcs11 qca-softstore +PSEUDO_FLAVORS = no_ossl no_gnupg +FLAVOR ?= no_ossl no_gnupg + +MULTI_PACKAGES = -main -ossl -gnupg + +CFLAGS += -DOPENSSL_NO_SSL2 \ + -DOPENSSL_NO_SSL3_METHOD + +CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=${LOCALBASE} \ + -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 = x11/qt4 +MODULES = devel/cmake -CONFIGURE_STYLE = simple -CONFIGURE_ENV += QTDIR=${MODQT_LIBDIR} HOME=${WRKDIR} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} +BUILD_DEPENDS = x11/qt4 -MAKE_FLAGS = LIBqca2_VERSION=${LIBqca2_VERSION} -FAKE_FLAGS = INSTALL_ROOT=${WRKINST} -NO_TEST = Yes +.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg} +CONFIGURE_ARGS += -DBUILD_PLUGINS="ossl;gnupg" +RUN_DEPENDS += ${BUILD_PKGPATH},-main +.endif -WANTLIB += c m pthread ${LIBCXX} +.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 9 Jul 2017 08:16:54 -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-CMakeLists_txt =================================================================== RCS file: security/qca2/patches/patch-CMakeLists_txt diff -N security/qca2/patches/patch-CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/qca2/patches/patch-CMakeLists_txt 9 Jul 2017 08:16:54 -0000 @@ -0,0 +1,26 @@ +$OpenBSD$ + +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -197,7 +197,7 @@ else( QCA_INSTALL_IN_QT_PREFIX ) + set(QCA_PRIVATE_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${QCA_CONFIG_NAME_BASE}" CACHE PATH "Directory where qca headers will install") + endif() + 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") ++ set(QCA_MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man" CACHE PATH "Directory where qca man pages will install") + endif( QCA_INSTALL_IN_QT_PREFIX ) + + set(PKGCONFIG_INSTALL_PREFIX "${QCA_LIBRARY_INSTALL_DIR}/pkgconfig" CACHE PATH "Base directory for pkgconfig files") +@@ -357,9 +357,9 @@ if(NOT DEVELOPER_MODE) + install(FILES "${CMAKE_BINARY_DIR}/mkspecs/features/crypto.prf" DESTINATION "${QCA_FEATURE_INSTALL_DIR}") + endif() + +-configure_file(man/qcatool.1 "${CMAKE_BINARY_DIR}/share/man/man1/${QCA_TOOL_NAME}.1" COPYONLY) ++configure_file(man/qcatool.1 "${CMAKE_BINARY_DIR}/man/man1/${QCA_TOOL_NAME}.1" COPYONLY) + if(NOT DEVELOPER_MODE) +- install(FILES "${CMAKE_BINARY_DIR}/share/man/man1/${QCA_TOOL_NAME}.1" DESTINATION "${QCA_MAN_INSTALL_DIR}/man1") ++ install(FILES "${CMAKE_BINARY_DIR}/man/man1/${QCA_TOOL_NAME}.1" DESTINATION "${QCA_MAN_INSTALL_DIR}/man1") + endif() + + set(QCA_CRYPTO_INSTALL_DIR "${QCA_PLUGINS_INSTALL_DIR}/crypto") 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 9 Jul 2017 08:16:54 -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 9 Jul 2017 08:16:54 -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 9 Jul 2017 08:16:54 -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 9 Jul 2017 08:16:54 -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 9 Jul 2017 08:16:54 -0000 @@ -0,0 +1,6 @@ +@comment $OpenBSD$ +@conflict qca-gnupg-* +@pkgpath security/qca-gnupg +lib/qca/ +lib/qca/crypto/ +lib/qca/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 9 Jul 2017 08:16:54 -0000 @@ -0,0 +1,36 @@ +@comment $OpenBSD$ +@conflict qca-1* +@pkgpath security/qca +@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 lib/libqca.so.${LIBqca_VERSION} +lib/pkgconfig/qca2.pc +@man man/man1/qcatool.1 +mkspecs/ +mkspecs/features/ +mkspecs/features/crypto.prf 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 9 Jul 2017 08:16:54 -0000 @@ -0,0 +1,6 @@ +@comment $OpenBSD$ +@conflict qca-ossl-* +@pkgpath security/qca-ossl +lib/qca/ +lib/qca/crypto/ +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 9 Jul 2017 08:16:54 -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 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 9 Jul 2017 08:16:54 -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 9 Jul 2017 08:16:54 -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 9 Jul 2017 08:16:54 -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 9 Jul 2017 08:17:00 -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 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 9 Jul 2017 08:17:00 -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 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 9 Jul 2017 08:17:00 -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 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 9 Jul 2017 08:17:00 -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 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 9 Jul 2017 08:17:00 -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 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 9 Jul 2017 08:17:00 -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 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 9 Jul 2017 08:17:00 -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/qca2,,-ossl LIB_DEPENDS-locale = LIB_DEPENDS-main = ${LIB_DEPENDS} \