- Update to 2.0.0

- Switch to USE_CMAKE

PR:		based on 120323
Submitted by:	Dmitry Sivachenko <demon@freebsd.org>
Approved by:	shaun (maintainer)

6 files changed, 67 insertions, 68 deletions

diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index d410dff0446e..4363ad1e24aa 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -6,33 +6,29 @@
 #
 
 PORTNAME=	qca
-PORTVERSION=	1.0
-PORTREVISION=	2
-CATEGORIES=	devel security
-MASTER_SITES=	http://delta.affinix.com/download/qca/ \
-		http://mirror.inerd.com/FreeBSD/distfiles/qca/
+PORTVERSION=	2.0.0
+CATEGORIES=	devel
+MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
+DISTNAME=	qca-${PORTVERSION}
 
 MAINTAINER=	shaun@FreeBSD.org
-COMMENT=	Straightforward and cross-platform crypto API
+COMMENT=	Cross-platform crypto API for QT
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-
-QT_NONSTANDARD=	yes
-HAS_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
-USE_QT_VER=	3
+USE_CMAKE=	yes
+CMAKE_USE_PTHREAD=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	qmake gui moc uic rcc qtestlib network
+USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-CONFIGURE_ARGS=	--qtdir=${QT_PREFIX}
-MAKE_ARGS+=	QTDIR=${QT_PREFIX} \
-		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CMAKE_ARGS+=	-DQT_QMAKE_EXECUTABLE=${QMAKE}
 
-do-install:
-	${TEST} -d ${PREFIX}/include/plugins/qca || ${MKDIR} ${PREFIX}/include/plugins/qca
-	${INSTALL_SCRIPT} ${WRKSRC}/src/qca.h ${WRKSRC}/src/qcaprovider.h ${PREFIX}/include/plugins/qca
-	${INSTALL_SCRIPT} -m 755 ${WRKSRC}/libqca.so.1.0.0 ${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libqca.so.1.0.0 ${PREFIX}/lib/libqca.so.1
-	${LN} -sf ${PREFIX}/lib/libqca.so.1.0.0 ${PREFIX}/lib/libqca.so
+post-patch:
+	${MKDIR} ${WRKSRC}/plugins
+	${REINPLACE_CMD} -e \
+	's,$${LIB_SUFFIX}/pkgconfig/,data/pkgconfig,' \
+	${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/devel/qca/distinfo b/devel/qca/distinfo
index ab8e8355208f..a330c20232f0 100644
--- a/devel/qca/distinfo
+++ b/devel/qca/distinfo
@@ -1,3 +1,3 @@
-MD5 (qca-1.0.tar.bz2) = ee44022eb0e5b8b5df64c62630f6e6b6
-SHA256 (qca-1.0.tar.bz2) = 614b8c9e03d8796c90f7f316f2ace66a5356270a75921ea72cebf129de491c5b
-SIZE (qca-1.0.tar.bz2) = 30677
+MD5 (qca-2.0.0.tar.bz2) = 07d54358ef4880d05b3c6f56b629aa55
+SHA256 (qca-2.0.0.tar.bz2) = 2ed0d49300459ae1f2d138fc2e68ed7f92850065981032c96f2538e1878fc2d3
+SIZE (qca-2.0.0.tar.bz2) = 5106520
diff --git a/devel/qca/files/patch-cmake-modules_FindQt4.cmake b/devel/qca/files/patch-cmake-modules_FindQt4.cmake
new file mode 100644
index 000000000000..23475b408e1a
--- /dev/null
+++ b/devel/qca/files/patch-cmake-modules_FindQt4.cmake
@@ -0,0 +1,11 @@
+--- cmake/modules/FindQt4.cmake.orgi	2008-01-20 20:23:37.000000000 +0100
++++ cmake/modules/FindQt4.cmake	2008-01-20 20:24:42.000000000 +0100
+@@ -482,7 +482,7 @@
+   MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR)
+ 
+   # Set QT_INCLUDES
+-  SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
++  SET( QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR})
+ 
+ 
+     
diff --git a/devel/qca/files/patch-configure b/devel/qca/files/patch-configure
deleted file mode 100644
index 7db6c9ac3987..000000000000
--- a/devel/qca/files/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig	Wed Dec 10 03:06:43 2003
-+++ configure	Sun Mar 27 23:43:58 2005
-@@ -17,12 +17,10 @@
- while [ $# -gt 0 ]; do
- 	case "$1" in
- 		--prefix=*)
--			PREFIX=`expr "${1}" : "--prefix=\(.*\)"`
- 			shift
- 			;;
- 
- 		--qtdir=*)
--			QTDIR=`expr "${1}" : "--qtdir=\(.*\)"`
- 			shift
- 			;;
- 
-@@ -76,7 +74,7 @@
- 		echo Warning: qmake not in \$QTDIR/bin/qmake
- 		echo trying to find it in \$PATH
- 	fi
--	qm=`type -p qmake`
-+	qm=`which qmake`
- 	if [ -x "$qm" ]; then
- 		if [ "$QC_DEBUG" = "Y" ]; then
- 			echo qmake found in $qm
-@@ -477,13 +475,6 @@
- 	echo
- 	exit 1;
- fi
--cat >Makefile.tmp <<EOT
--export QTDIR = $QTDIR
--EOT
--cat Makefile >> Makefile.tmp
--rm -f Makefile
--cp -f Makefile.tmp Makefile
--rm -f Makefile.tmp
- 
- echo
- echo Good, your configure finished.  Now run \'make\'.
diff --git a/devel/qca/files/patch-src-src.pro b/devel/qca/files/patch-src-src.pro
new file mode 100644
index 000000000000..a1746511e001
--- /dev/null
+++ b/devel/qca/files/patch-src-src.pro
@@ -0,0 +1,11 @@
+--- src/src.pro.orig	2007-08-15 01:00:28.000000000 +0400
++++ src/src.pro	2008-02-06 17:30:57.000000000 +0300
+@@ -92,7 +92,7 @@
+ 	incfiles.files += $$QCA_INC/qca.h $$QCA_INC/QtCrypto
+ 	INSTALLS += incfiles
+ 
+-	manfiles.path = $$DATADIR/man/man1
++	manfiles.path = $$PREFIX/man/man1
+ 	manfiles.files = $$QCA_BASE/man/qcatool2.1
+ 	INSTALLS += manfiles
+ }
diff --git a/devel/qca/pkg-plist b/devel/qca/pkg-plist
index 53d373f0f8fc..90a837a54ac5 100644
--- a/devel/qca/pkg-plist
+++ b/devel/qca/pkg-plist
@@ -1,7 +1,26 @@
+bin/qcatool2
+certs/rootcerts.pem
+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.so
-lib/libqca.so.1
-lib/libqca.so.1.0.0
-include/plugins/qca/qca.h
-include/plugins/qca/qcaprovider.h
-@dirrm include/plugins/qca
-@dirrm include/plugins
+lib/libqca.so.2
+lib/libqca.so.2.0.0
+libdata/pkgconfig/qca.pc
+mkspecs/features/crypto.prf
+@dirrmtry mkspecs/features
+@dirrmtry mkspecs
+@dirrmtry include/QtCrypto
+@dirrmtry certs