From 7c6c0a1515afb41952f2425d554d126eaaaddc38 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 22 Jun 2010 00:35:42 +0000
Subject: [PATCH] update to 2.0.2, make it build concurrently with qca1

---
 security/qca2/Makefile                     | 23 ++++++++++------------
 security/qca2/distinfo                     | 10 +++++-----
 security/qca2/patches/patch-CMakeLists_txt | 12 -----------
 security/qca2/patches/patch-crypto_prf_in  | 12 +++++++++++
 security/qca2/pkg/PLIST                    | 18 ++++++++++-------
 5 files changed, 38 insertions(+), 37 deletions(-)
 delete mode 100644 security/qca2/patches/patch-CMakeLists_txt
 create mode 100644 security/qca2/patches/patch-crypto_prf_in

diff --git a/security/qca2/Makefile b/security/qca2/Makefile
index 3c54ef5bd22..0cd5d920fe7 100644
--- a/security/qca2/Makefile
+++ b/security/qca2/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2010/04/15 20:44:19 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.4 2010/06/22 00:35:42 espie Exp $
 
 COMMENT =	Qt Cryptographic Architecture
 SHARED_ONLY =	Yes
 
-DISTNAME =	qca-2.0.0
-PKGNAME =	qca2-2.0.0p1
+DISTNAME =	qca-2.0.2
+PKGNAME =	qca2-2.0.2
 CATEGORIES =	security
 SHARED_LIBS +=	qca	3.0
 
@@ -19,18 +19,15 @@ PERMIT_DISTFILES_FTP =	Yes
 MASTER_SITES =		http://delta.affinix.com/download/qca/2.0/
 EXTRACT_SUFX =		.tar.bz2
 
-MODULES =		x11/qt4 devel/cmake
+MODULES =		x11/qt4
 
-post-extract:
-	cd ${WRKDIST}/cmake/modules && rm FindQt4.cmake
+CONFIGURE_STYLE =	simple
+CONFIGURE_ENV +=	QTDIR=${MODQT_LIBDIR} HOME=${WRKDIR} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
-CONFIGURE_STYLE =	cmake
-SEPARATE_BUILD =	simple
-CONFIGURE_ENV +=	QTDIR=${MODQT_LIBDIR} HOME=${WRKDIR}
+MAKE_FLAGS =	LIBqca_VERSION=${LIBqca_VERSION}
+FAKE_FLAGS =	INSTALL_ROOT=${WRKINST}
 
-WANTLIB += QtGui
-WANTLIB += ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender
-WANTLIB += c fontconfig freetype glib-2.0 gthread-2.0 iconv m
-WANTLIB += png pthread pthread-stubs stdc++ xcb z
+WANTLIB += c m
+WANTLIB += pthread stdc++
 			
 .include <bsd.port.mk>
diff --git a/security/qca2/distinfo b/security/qca2/distinfo
index 79bf3a01c90..7ccb59fc179 100644
--- a/security/qca2/distinfo
+++ b/security/qca2/distinfo
@@ -1,5 +1,5 @@
-MD5 (qca-2.0.0.tar.bz2) = B9VDWO9IgNBbPG9WtimqVQ==
-RMD160 (qca-2.0.0.tar.bz2) = JWylGP6lB9A7Z8D10muirHs9tRc=
-SHA1 (qca-2.0.0.tar.bz2) = W4lmR0JmN+GXRwPylQeGdGQIxws=
-SHA256 (qca-2.0.0.tar.bz2) = LtDUkwBFmuHy0Tj8Lmjtf5KFAGWYEDLJbyU44YePwtM=
-SIZE (qca-2.0.0.tar.bz2) = 5106520
+MD5 (qca-2.0.2.tar.bz2) = J+vfvZhp2Q2uB4pt7NAp9A==
+RMD160 (qca-2.0.2.tar.bz2) = GLD0l3CflwAidkSXeUZzXS7DxiM=
+SHA1 (qca-2.0.2.tar.bz2) = WkFMMpbNN9HsNBgr4NCJxQc/Vag=
+SHA256 (qca-2.0.2.tar.bz2) = SbVHRFAQSiKYdHwkPeFFGremru1L999D/6S3EoooN7g=
+SIZE (qca-2.0.2.tar.bz2) = 1937201
diff --git a/security/qca2/patches/patch-CMakeLists_txt b/security/qca2/patches/patch-CMakeLists_txt
deleted file mode 100644
index dfe55f6bc85..00000000000
--- a/security/qca2/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2008/02/09 10:45:36 espie Exp $
---- CMakeLists.txt.orig	Mon Feb  4 17:54:11 2008
-+++ CMakeLists.txt	Mon Feb  4 17:54:15 2008
-@@ -131,7 +131,7 @@ INSTALL(FILES "${CMAKE_BINARY_DIR}/crypto.prf" DESTINA
- 
- add_subdirectory(src)
- add_subdirectory(tools)
--add_subdirectory(plugins)
-+#add_subdirectory(plugins)
- if(BUILD_TESTS)
- 	ENABLE_TESTING()
-         add_subdirectory(unittest)
diff --git a/security/qca2/patches/patch-crypto_prf_in b/security/qca2/patches/patch-crypto_prf_in
new file mode 100644
index 00000000000..f0ef5e0a16f
--- /dev/null
+++ b/security/qca2/patches/patch-crypto_prf_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-crypto_prf_in,v 1.1 2010/06/22 00:35:42 espie Exp $
+--- crypto.prf.in.orig	Tue Jun 22 02:20:10 2010
++++ crypto.prf.in	Tue Jun 22 02:21:19 2010
+@@ -28,7 +28,7 @@ mac: {
+ # else, link normally
+ isEmpty(LINKAGE) {
+ 	INCLUDEPATH += $$QCA_INCDIR/QtCrypto
+-	LIBS += -L$$QCA_LIBDIR
++	QMAKE_LFLAGS += -L$$QCA_LIBDIR
+ 	LINKAGE = -lqca
+ 	CONFIG(debug, debug|release) {
+ 		windows:LINKAGE = -lqcad
diff --git a/security/qca2/pkg/PLIST b/security/qca2/pkg/PLIST
index a1f20cb2a81..925072c3eff 100644
--- a/security/qca2/pkg/PLIST
+++ b/security/qca2/pkg/PLIST
@@ -1,7 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/04/15 20:44:20 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/06/22 00:35:42 espie Exp $
 @bin bin/qcatool2
-certs/
-certs/rootcerts.pem
 include/QtCrypto/
 include/QtCrypto/QtCrypto
 include/QtCrypto/qca.h
@@ -18,8 +16,14 @@ include/QtCrypto/qca_textfilter.h
 include/QtCrypto/qca_tools.h
 include/QtCrypto/qcaprovider.h
 include/QtCrypto/qpipe.h
+lib/libqca.prl
 @lib lib/libqca.so.${LIBqca_VERSION}
-lib/pkgconfig/qca.pc
-mkspecs/
-mkspecs/features/
-mkspecs/features/crypto.prf
+lib/pkgconfig/qca2.pc
+lib/qt4/mkspecs/features/crypto.prf
+share/man/
+share/man/man1/
+@man share/man/man1/qcatool2.1
+share/qca/
+share/qca/certs/
+share/qca/certs/README
+share/qca/certs/rootcerts.pem