From nobody@FreeBSD.org  Mon Jan 19 00:40:17 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E094106567B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Jan 2009 00:40:17 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 4EB0E8FC23
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Jan 2009 00:40:17 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n0J0eGRP068647
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Jan 2009 00:40:16 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n0J0eGu7068646;
	Mon, 19 Jan 2009 00:40:16 GMT
	(envelope-from nobody)
Message-Id: <200901190040.n0J0eGu7068646@www.freebsd.org>
Date: Mon, 19 Jan 2009 00:40:16 GMT
From: Max Brazhnikov <makc@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: devel/qca: clean up port
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         130722
>Category:       ports
>Synopsis:       devel/qca: clean up port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    shaun
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 19 00:50:02 UTC 2009
>Closed-Date:    Fri Feb 06 13:11:45 UTC 2009
>Last-Modified:  Fri Feb 06 13:11:45 UTC 2009
>Originator:     Max Brazhnikov
>Release:        FreeBSD 7.1-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 7.1-STABLE FreeBSD 7.1-STABLE #2: Sun Jan 18 21:48:53 MSK 2009     root@luna.dio.ru:/usr/obj/usr/freebsd/7/src/sys/LUNA  i386
>Description:
Clean up Makefile,
install Qt *.prf files to appropriate directory.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/qca/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	10 Jul 2008 23:25:35 -0000	1.11
+++ Makefile	19 Jan 2009 00:35:06 -0000
@@ -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 @@
 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>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/qca/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	10 Jul 2008 23:25:35 -0000	1.3
+++ pkg-plist	19 Jan 2009 00:20:22 -0000
@@ -19,8 +19,9 @@
 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
Index: files/patch-CMakeLists.txt
===================================================================
RCS file: files/patch-CMakeLists.txt
diff -N files/patch-CMakeLists.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-CMakeLists.txt	19 Jan 2009 00:18:59 -0000
@@ -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)
Index: files/patch-src-src.pro
===================================================================
RCS file: files/patch-src-src.pro
diff -N files/patch-src-src.pro
--- files/patch-src-src.pro	10 Jul 2008 23:25:35 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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
- }


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->shaun 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jan 19 00:50:37 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130722 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/130722: commit references a PR
Date: Fri,  6 Feb 2009 13:08:16 +0000 (UTC)

 makc        2009-02-06 13:08:05 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/qca            Makefile pkg-plist 
   Added files:
     devel/qca/files      patch-CMakeLists.txt 
   Removed files:
     devel/qca/files      patch-src-src.pro 
   Log:
   Clean up Makefile,
   remove staled patch,
   install qt4 related stuff to appropriate place.
   
   PR:             ports/130722
   Approved by:    shaun (maintainer timeout), miwi (mentor)
   
   Revision  Changes    Path
   1.12      +3 -8      ports/devel/qca/Makefile
   1.1       +24 -0     ports/devel/qca/files/patch-CMakeLists.txt (new)
   1.2       +0 -11     ports/devel/qca/files/patch-src-src.pro (dead)
   1.4       +4 -3      ports/devel/qca/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Fri Feb 6 13:11:45 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130722 
>Unformatted:
