[59539] trunk/dports/devel/qca-ossl

[sharky at macports.org]

Revision: 59539
          http://trac.macports.org/changeset/59539
Author:   sharky at macports.org
Date:     2009-10-16 03:02:47 -0700 (Fri, 16 Oct 2009)
Log Message:
-----------
qca-ossl : fix configuration, compilation and installation

* update references to the qt4-mac location
* disable references to whirlpool (patch from Debian)
* install qca-ossl plugin to the correct directory

Modified Paths:
--------------
    trunk/dports/devel/qca-ossl/Portfile

Added Paths:
-----------
    trunk/dports/devel/qca-ossl/files/
    trunk/dports/devel/qca-ossl/files/disable-whirlpool.patch
    trunk/dports/devel/qca-ossl/files/fix-configure.patch

Modified: trunk/dports/devel/qca-ossl/Portfile
===================================================================
--- trunk/dports/devel/qca-ossl/Portfile	2009-10-16 09:54:25 UTC (rev 59538)
+++ trunk/dports/devel/qca-ossl/Portfile	2009-10-16 10:02:47 UTC (rev 59539)
@@ -26,17 +26,15 @@
 depends_lib         port:qca \
                     port:openssl
 
-configure.pre_args  --qtdir=${prefix}
+patchfiles          disable-whirlpool.patch \
+                    fix-configure.patch
 
-post-build {
-    system "install_name_tool -id ${prefix}/lib/libqca-ossl.dylib \
-        ${worksrcpath}/lib/libqca-ossl.dylib"
-}
+configure.pre_args  --qtdir=${prefix}/libexec/qt4-mac --with-qca=${prefix}
 
 destroot {
-    xinstall -m 755 -d ${destroot}${prefix}/lib/qt4-plugins/crypto
+    xinstall -m 755 -d ${destroot}${prefix}/libexec/qt4-mac/plugins/crypto
         
-    xinstall -m 644 -W ${worksrcpath}/lib libqca-ossl.dylib \
-                ${destroot}${prefix}/lib/qt4-plugins/crypto
+    xinstall -m 644 -W ${worksrcpath}/lib libqca-ossl.bundle \
+                ${destroot}${prefix}/libexec/qt4-mac/plugins/crypto
 }
 

Added: trunk/dports/devel/qca-ossl/files/disable-whirlpool.patch
===================================================================
--- trunk/dports/devel/qca-ossl/files/disable-whirlpool.patch	                        (rev 0)
+++ trunk/dports/devel/qca-ossl/files/disable-whirlpool.patch	2009-10-16 10:02:47 UTC (rev 59539)
@@ -0,0 +1,27 @@
+--- qca-ossl.cpp.orig	2009-10-16 11:48:59.000000000 +0200
++++ qca-ossl.cpp	2009-10-16 11:49:26.000000000 +0200
+@@ -6597,9 +6597,11 @@
+ #ifdef SHA512_DIGEST_LENGTH
+ 	list += "sha512";
+ #endif
++/*
+ #ifdef OBJ_whirlpool
+ 	list += "whirlpool";
+ #endif
++*/
+ 	return list;
+ }
+ 
+@@ -6810,10 +6812,12 @@
+ 		else if ( type == "sha512" )
+ 			return new opensslHashContext( EVP_sha512(), this, type);
+ #endif
++/*
+ #ifdef OBJ_whirlpool
+ 		else if ( type == "whirlpool" )
+ 			return new opensslHashContext( EVP_whirlpool(), this, type);
+ #endif
++*/
+ 		else if ( type == "pbkdf1(sha1)" )
+ 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
+ 		else if ( type == "pbkdf1(md2)" )

Added: trunk/dports/devel/qca-ossl/files/fix-configure.patch
===================================================================
--- trunk/dports/devel/qca-ossl/files/fix-configure.patch	                        (rev 0)
+++ trunk/dports/devel/qca-ossl/files/fix-configure.patch	2009-10-16 10:02:47 UTC (rev 59539)
@@ -0,0 +1,10 @@
+--- configure.orig	2009-10-16 11:40:20.000000000 +0200
++++ configure	2009-10-16 11:44:17.000000000 +0200
+@@ -559,7 +559,6 @@
+ 	"LINKAGE = -lqca\n"
+ 	"CONFIG(debug, debug|release) {\n"
+         "	windows:LINKAGE = -lqcad\n"
+-        "	mac:LINKAGE = -lqca_debug\n"
+ 	"}\n"
+ 	"LIBS += \$\$LINKAGE\n"
+ 	).arg(incdir, libdir);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091016/fd61fd22/attachment.html>