Update to 2.0.1

7 files changed, 102 insertions, 50 deletions

diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index e3e95268d28c..5a7c70d1766e 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qca
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	devel
 MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
 DISTNAME=	qca-${PORTVERSION}
@@ -16,14 +15,35 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Cross-platform crypto API for QT
 
 USE_BZIP2=	yes
-USE_CMAKE=	yes
-CMAKE_USE_PTHREAD=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui qtestlib network qmake_build \
-		moc_build uic_build rcc_build
+QT_COMPONENTS=	corelib qmake_build moc_build
+HAS_CONFIGURE=	yes
+QT_NONSTANDARD=	yes
+CONFIGURE_ARGS+=--prefix=${PREFIX}
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS+=	-DQT_QMAKE_EXECUTABLE=${QMAKE}
+MAN1=		qcatool2.1
+
+.if defined(MAINTAINER_MODE)
+QT_COMPONENTS+=	qtestlib
+.else
+CONFIGURE_ARGS+=--disable-tests
+.endif
+
+.if !defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--release --no-separate-debug-info
+PLIST_SUB+=	DEBUG="@comment "
+.else
+CONFIGURE_ARGS+=--debug
+PLIST_SUB+=	DEBUG=""
+.endif
+
+pre-configure:
+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/configure
+	${MKDIR} ${WRKSRC}/libdata/pkgconfig
+
+post-install:
+	${STRIP_CMD} ${PREFIX}/bin/qcatool2 ${PREFIX}/lib/libqca.so.${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/qca/distinfo b/devel/qca/distinfo
index a330c20232f0..9bc93f60791f 100644
--- a/devel/qca/distinfo
+++ b/devel/qca/distinfo
@@ -1,3 +1,3 @@
-MD5 (qca-2.0.0.tar.bz2) = 07d54358ef4880d05b3c6f56b629aa55
-SHA256 (qca-2.0.0.tar.bz2) = 2ed0d49300459ae1f2d138fc2e68ed7f92850065981032c96f2538e1878fc2d3
-SIZE (qca-2.0.0.tar.bz2) = 5106520
+MD5 (qca-2.0.1.tar.bz2) = a0a87d0b3210e23f8c1713562282b7d6
+SHA256 (qca-2.0.1.tar.bz2) = e1d10f9ef1286f3f129661f3bd6b18161843e0c5cb54fb8956aaecd8b78d41e6
+SIZE (qca-2.0.1.tar.bz2) = 1925152
diff --git a/devel/qca/files/patch-CMakeLists.txt b/devel/qca/files/patch-CMakeLists.txt
deleted file mode 100644
index 4dde05acfeba..000000000000
--- a/devel/qca/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./CMakeLists.txt.orig	2007-09-30 19:54:31.000000000 +0400
-+++ ./CMakeLists.txt	2009-01-19 03:18:54.000000000 +0300
-@@ -6,7 +6,7 @@
- 
- set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will install")
- 
--set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
-+set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
- 
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" )
- 
-@@ -127,11 +127,10 @@
- endif(NOT WIN32)
- 
- CONFIGURE_FILE("crypto.prf.cmake" "${CMAKE_BINARY_DIR}/crypto.prf" @ONLY)
--INSTALL(FILES "${CMAKE_BINARY_DIR}/crypto.prf" DESTINATION ${CMAKE_INSTALL_PREFIX}/mkspecs/features)
-+INSTALL(FILES "${CMAKE_BINARY_DIR}/crypto.prf" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/qt4/mkspecs/features)
- 
- add_subdirectory(src)
- add_subdirectory(tools)
--add_subdirectory(plugins)
- if(BUILD_TESTS)
- 	ENABLE_TESTING()
-         add_subdirectory(unittest)
diff --git a/devel/qca/files/patch-cmake-modules_FindQt4.cmake b/devel/qca/files/patch-cmake-modules_FindQt4.cmake
deleted file mode 100644
index 23475b408e1a..000000000000
--- a/devel/qca/files/patch-cmake-modules_FindQt4.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
new file mode 100644
index 000000000000..d5d2849efc05
--- /dev/null
+++ b/devel/qca/files/patch-configure
@@ -0,0 +1,50 @@
+--- ./configure.orig	2008-07-21 21:27:13.000000000 +0400
++++ ./configure	2009-03-15 18:24:58.000000000 +0300
+@@ -799,10 +799,10 @@
+ 		}
+ 
+ 		str = QString(
+-		"prffiles.path = %1/mkspecs/features\n"
++		"prffiles.path = %%PREFIX%%/share/qt4/mkspecs/features\n"
+ 		"prffiles.files = crypto.prf\n"
+ 		"INSTALLS += prffiles\n"
+-		).arg(QLibraryInfo::location(QLibraryInfo::DataPath));
++		);
+ 		conf->addExtra(str);
+ 
+ 		// write pkg-config files
+@@ -852,11 +852,11 @@
+ 			str += pkg_template2.arg("QCA");
+ 			str += pkg_template3.arg("QtCore");
+ 			str += pkg_template4.arg("qca");
+-			f.setFileName("lib/pkgconfig/qca2.pc");
++			f.setFileName("libdata/pkgconfig/qca2.pc");
+ 			if(f.open(QFile::WriteOnly | QFile::Truncate))
+ 				f.write(str.toLatin1());
+ 			f.close();
+-			pcfiles += "lib/pkgconfig/qca2.pc";
++			pcfiles += "libdata/pkgconfig/qca2.pc";
+ 		}
+ 
+ 		if(do_pc_debug)
+@@ -865,17 +865,17 @@
+ 			str += pkg_template2.arg("QCA_debug");
+ 			str += pkg_template3.arg("QtCore_debug");
+ 			str += pkg_template4.arg("qca_debug");
+-			f.setFileName("lib/pkgconfig/qca2_debug.pc");
++			f.setFileName("libdata/pkgconfig/qca2_debug.pc");
+ 			if(f.open(QFile::WriteOnly | QFile::Truncate))
+ 				f.write(str.toLatin1());
+ 			f.close();
+-			pcfiles += "lib/pkgconfig/qca2_debug.pc";
++			pcfiles += "libdata/pkgconfig/qca2_debug.pc";
+ 		}
+ 
+ 		if(!pcfiles.isEmpty())
+ 		{
+         		str = QString(
+-			"pcfiles.path = \$\$LIBDIR/pkgconfig\n"
++			"pcfiles.path = %%PREFIX%%/libdata/pkgconfig\n"
+ 			"pcfiles.files = %1\n"
+ 			"INSTALLS += pcfiles\n"
+ 			).arg(pcfiles.join(" "));
diff --git a/devel/qca/files/patch-src__src.pro b/devel/qca/files/patch-src__src.pro
new file mode 100644
index 000000000000..b7051b7f4c87
--- /dev/null
+++ b/devel/qca/files/patch-src__src.pro
@@ -0,0 +1,11 @@
+--- ./src/src.pro.orig	2008-06-04 04:50:25.000000000 +0400
++++ ./src/src.pro	2009-03-15 18:39:38.000000000 +0300
+@@ -110,7 +110,7 @@
+ 	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
+ }
diff --git a/devel/qca/pkg-plist b/devel/qca/pkg-plist
index 8cf7cddc1326..e2881617f1f6 100644
--- a/devel/qca/pkg-plist
+++ b/devel/qca/pkg-plist
@@ -1,5 +1,5 @@
 bin/qcatool2
-certs/rootcerts.pem
+%%DEBUG%%bin/qcatool2.debug
 include/QtCrypto/QtCrypto
 include/QtCrypto/qca.h
 include/QtCrypto/qca_basic.h
@@ -15,13 +15,19 @@ include/QtCrypto/qca_textfilter.h
 include/QtCrypto/qca_tools.h
 include/QtCrypto/qcaprovider.h
 include/QtCrypto/qpipe.h
+lib/libqca.prl
 lib/libqca.so
 lib/libqca.so.2
-lib/libqca.so.2.0.0
-libdata/pkgconfig/qca.pc
+lib/libqca.so.2.0
+lib/libqca.so.2.0.1
+%%DEBUG%%lib/libqca.so.2.0.1.debug
+libdata/pkgconfig/qca2.pc
+share/qca/certs/README
+share/qca/certs/rootcerts.pem
 share/qt4/mkspecs/features/crypto.prf
 @dirrmtry share/qt4/mkspecs/features
 @dirrmtry share/qt4/mkspecs
 @dirrmtry share/qt4
-@dirrmtry include/QtCrypto
-@dirrmtry certs
+@dirrm share/qca/certs
+@dirrm share/qca
+@dirrm include/QtCrypto