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

[michaelld at macports.org]

Revision: 69821
          http://trac.macports.org/changeset/69821
Author:   michaelld at macports.org
Date:     2010-07-16 21:07:04 -0700 (Fri, 16 Jul 2010)
Log Message:
-----------
Switch maintainer.  Remove patches (works for me).  Correct plugin
extension (back to dylib).  Fix use of MD2 cipher (ticket #25652).

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

Removed Paths:
-------------
    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	2010-07-17 03:38:51 UTC (rev 69820)
+++ trunk/dports/devel/qca-ossl/Portfile	2010-07-17 04:07:04 UTC (rev 69821)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem          1.0
@@ -3,7 +4,7 @@
 name                qca-ossl
 version             2.0.0-beta3
-revision        1
+revision            2
 categories          devel crypto security
-maintainers         rowue openmaintainer
+maintainers         michaelld openmaintainer
 description         Qt Cryptographic Architecture - openssl plugin
 long_description \
@@ -12,7 +13,7 @@
     X509, SASL, RSA, Hashing (SHA1, MD5), Ciphers (BlowFish, 3DES, AES), \
     Functionality is supplied via plugins. \
     \
-    This plugin provides support for openssl related chipers
+    This plugin provides support for OpenSSL related ciphers.
 
 platforms           darwin
 
@@ -27,15 +28,25 @@
 depends_lib         port:qca \
                     port:openssl
 
-patchfiles          disable-whirlpool.patch \
-                    fix-configure.patch
+# Without the patch, if MD2 isn't part of OpenSSL (which it is not by
+# default) then compiling will error out.  Upstream has already fixed
+# this issue; just waiting for a new release here.
+patchfiles          patch-qca-ossl.cpp.diff
 
-configure.pre_args  --qtdir=${prefix}/libexec/qt4-mac --with-qca=${prefix}
+set qt_dir         ${prefix}/libexec/qt4-mac
 
-destroot {
-    xinstall -m 755 -d ${destroot}${prefix}/libexec/qt4-mac/plugins/crypto
-        
-    xinstall -m 644 -W ${worksrcpath}/lib libqca-ossl.bundle \
-                ${destroot}${prefix}/libexec/qt4-mac/plugins/crypto
+configure.pre_args  --qtdir=${qt_dir} --with-qca=${prefix}
+
+destroot.destdir    INSTALL_ROOT="${destroot}"
+
+post-destroot {
+    # fix library path of installed library/ies
+    foreach fixfile [exec find ${destroot}${qt_dir} -name "*.dylib" | \
+                         sed -e "s@${destroot}@@g"] {
+        system "install_name_tool -id ${fixfile} ${destroot}${fixfile}"
+    }
 }
 
+variant universal {
+    configure.universal_args-append --universal
+}

Deleted: trunk/dports/devel/qca-ossl/files/disable-whirlpool.patch
===================================================================
--- trunk/dports/devel/qca-ossl/files/disable-whirlpool.patch	2010-07-17 03:38:51 UTC (rev 69820)
+++ trunk/dports/devel/qca-ossl/files/disable-whirlpool.patch	2010-07-17 04:07:04 UTC (rev 69821)
@@ -1,27 +0,0 @@
---- 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)" )

Deleted: trunk/dports/devel/qca-ossl/files/fix-configure.patch
===================================================================
--- trunk/dports/devel/qca-ossl/files/fix-configure.patch	2010-07-17 03:38:51 UTC (rev 69820)
+++ trunk/dports/devel/qca-ossl/files/fix-configure.patch	2010-07-17 04:07:04 UTC (rev 69821)
@@ -1,10 +0,0 @@
---- 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/20100716/b0fef92e/attachment-0001.html>