Clean up Makefile,

remove staled patch,
install qt4 related stuff to appropriate place.

PR:		ports/130722
Approved by:	shaun (maintainer timeout), miwi (mentor)

4 files changed, 31 insertions, 22 deletions

diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index 4363ad1e24aa..536835fe3bdc 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qca
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
 DISTNAME=	qca-${PORTVERSION}
@@ -14,21 +15,15 @@ DISTNAME=	qca-${PORTVERSION}
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Cross-platform crypto API for QT
 
-USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 CMAKE_USE_PTHREAD=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake gui moc uic rcc qtestlib network
+QT_COMPONENTS=	gui qtestlib network qmake_build \
+		moc_build uic_build rcc_build
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DQT_QMAKE_EXECUTABLE=${QMAKE}
 
-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/files/patch-CMakeLists.txt b/devel/qca/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4dde05acfeba
--- /dev/null
+++ b/devel/qca/files/patch-CMakeLists.txt
@@ -0,0 +1,24 @@
+--- ./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-src-src.pro b/devel/qca/files/patch-src-src.pro
deleted file mode 100644
index a1746511e001..000000000000
--- a/devel/qca/files/patch-src-src.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 90a837a54ac5..8cf7cddc1326 100644
--- a/devel/qca/pkg-plist
+++ b/devel/qca/pkg-plist
@@ -19,8 +19,9 @@ lib/libqca.so
 lib/libqca.so.2
 lib/libqca.so.2.0.0
 libdata/pkgconfig/qca.pc
-mkspecs/features/crypto.prf
-@dirrmtry mkspecs/features
-@dirrmtry mkspecs
+share/qt4/mkspecs/features/crypto.prf
+@dirrmtry share/qt4/mkspecs/features
+@dirrmtry share/qt4/mkspecs
+@dirrmtry share/qt4
 @dirrmtry include/QtCrypto
 @dirrmtry certs