Update qca to version 2.0.0 (needed for update of chat/psi). Change list

is not available, but the project now depends on QT 4.2 and was incorporated
into KDE4 too

4 files changed, 39 insertions, 18 deletions

diff --git a/security/qca/Makefile b/security/qca/Makefile
index 881579aa691..270bda765fe 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/05/11 11:19:44 smb Exp $
+# $NetBSD: Makefile,v 1.14 2007/12/19 13:01:36 jdolecek Exp $
 
-DISTNAME=	qca-1.0
-PKGREVISION=	3
+DISTNAME=	qca-2.0.0
 CATEGORIES=	security
-MASTER_SITES=	http://delta.affinix.com/qca/
+MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jdolecek@NetBSD.org
@@ -17,7 +16,6 @@ USE_LANGUAGES=	c++
 
 INSTALLATION_DIRS=	include lib
 
-.include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
-.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/qca/PLIST b/security/qca/PLIST
index 468acfa82e2..d7b2c0442ca 100644
--- a/security/qca/PLIST
+++ b/security/qca/PLIST
@@ -1,3 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/02 11:23:30 jdolecek Exp $
-include/qca.h
+@comment $NetBSD: PLIST,v 1.2 2007/12/19 13:01:36 jdolecek Exp $
+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/libqca.la
+lib/libqca.prl
+lib/pkgconfig/qca2.pc
+qt4/mkspecs/features/crypto.prf
+share/man/man1/qcatool2.1
+share/qca/certs/README
+share/qca/certs/rootcerts.pem
+@dirrm share/qca/certs
+@dirrm share/qca
+@dirrm include/QtCrypto
diff --git a/security/qca/buildlink3.mk b/security/qca/buildlink3.mk
index 64ea422b254..8d8fab05379 100644
--- a/security/qca/buildlink3.mk
+++ b/security/qca/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/10/09 19:19:15 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2007/12/19 13:01:36 jdolecek Exp $
 #
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 QCA_BUILDLINK3_MK:=	${QCA_BUILDLINK3_MK}+
@@ -12,12 +12,12 @@ BUILDLINK_PACKAGES+=	qca
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qca
 
 .if !empty(QCA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.qca+=	qca>=1.0
-BUILDLINK_ABI_DEPENDS.qca?=	qca>=1.0nb3
+BUILDLINK_API_DEPENDS.qca+=	qca>=2.0.0
+BUILDLINK_ABI_DEPENDS.qca?=	qca>=2.0.0
 BUILDLINK_PKGSRCDIR.qca?=	../../security/qca
 .endif	# QCA_BUILDLINK3_MK
 
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/qca/distinfo b/security/qca/distinfo
index ceb9007f764..df6598e2e97 100644
--- a/security/qca/distinfo
+++ b/security/qca/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/05/25 13:11:41 wiz Exp $
+$NetBSD: distinfo,v 1.3 2007/12/19 13:01:36 jdolecek Exp $
 
-SHA1 (qca-1.0.tar.bz2) = b4b166f9dbbe222ebaf5287582a0ba29ddbc1391
-RMD160 (qca-1.0.tar.bz2) = 129d8eeed68fb98e9cba94040b8f75b9f94c8a60
-Size (qca-1.0.tar.bz2) = 30677 bytes
+SHA1 (qca-2.0.0.tar.bz2) = 5b896647426637e1974703f2950786746408c70b
+RMD160 (qca-2.0.0.tar.bz2) = 256ca518fea507d03b67c0f5d26ba2ac7b3db517
+Size (qca-2.0.0.tar.bz2) = 5106520 bytes