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

[michaelld at macports.org]

Revision: 86121
          http://trac.macports.org/changeset/86121
Author:   michaelld at macports.org
Date:     2011-10-19 07:56:10 -0700 (Wed, 19 Oct 2011)
Log Message:
-----------
qca-ossl: Fix to be correctly universal; ticket #31438.

Modified Paths:
--------------
    trunk/dports/devel/qca-ossl/Portfile
    trunk/dports/devel/qca-ossl/files/patch-configure.diff

Modified: trunk/dports/devel/qca-ossl/Portfile
===================================================================
--- trunk/dports/devel/qca-ossl/Portfile	2011-10-19 14:28:19 UTC (rev 86120)
+++ trunk/dports/devel/qca-ossl/Portfile	2011-10-19 14:56:10 UTC (rev 86121)
@@ -6,7 +6,7 @@
 
 name                qca-ossl
 version             2.0.0-beta3
-revision            3
+revision            4
 categories          devel crypto security
 maintainers         michaelld openmaintainer
 description         Qt Cryptographic Architecture - openssl plugin
@@ -33,18 +33,30 @@
 # Without the patch to "qca-ossl.cpp", if MD2 isn't part of OpenSSL
 # (which it is not by default as of at least version 0.9.7) then
 # compiling will error out.  Upstream has already fixed this issue for
-# this port; just waiting for a new release.  The patch to "configure"
-# uses QCA's 'crypto.prf' file to correctly include its libraries (no
-# matter how QCA is installed), instead of forcing patching of
-# multiple files.
-patchfiles          patch-qca-ossl.cpp.diff \
-                    patch-configure.diff
+# this port; just waiting for a new release.
+patchfiles-append   patch-qca-ossl.cpp.diff
 
+# (2) Use QCA's 'crypto.prf' file to correctly include its libraries
+# (no matter how QCA is installed), instead of forcing patching of
+# multiple files.  Correct compiling for universal or set of arches.
+patchfiles-append   patch-configure.diff
+
 # qca-ossl does not use --prefix
 configure.pre_args
 configure.args       --verbose             \
                      --qtdir=${qt_dir}
 
+# QCA's configure does not handle this flag,
+# but does not generate an error either.
+configure.universal_args-delete --disable-dependency-tracking
+configure.args-delete  --disable-dependency-tracking
+
+post-patch {
+    # set arch type(s)
+    reinplace "s|@ARCHES@|${qt_arch_types}|g" \
+        ${worksrcpath}/configure
+}
+
 post-destroot {
     # fix library path of installed library/ies
     foreach fixfile [exec find ${destroot}${qt_dir} -name "*.dylib" | \

Modified: trunk/dports/devel/qca-ossl/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/qca-ossl/files/patch-configure.diff	2011-10-19 14:28:19 UTC (rev 86120)
+++ trunk/dports/devel/qca-ossl/files/patch-configure.diff	2011-10-19 14:56:10 UTC (rev 86121)
@@ -1,6 +1,33 @@
---- configure_orig	2010-08-04 09:53:50.000000000 -0400
-+++ configure	2010-08-04 10:12:43.000000000 -0400
-@@ -551,18 +551,7 @@
+--- configure.orig	2011-10-19 10:12:54.000000000 -0400
++++ configure	2011-10-19 10:16:06.000000000 -0400
+@@ -518,24 +518,19 @@
+ 	bool exec()
+ 	{
+ #ifdef Q_OS_MAC
++		QString str = "CONFIG += @ARCHES@\n";
+ 		if(qc_getenv("QC_UNIVERSAL") == "Y")
+ 		{
+ 			qc_universal_enabled = true;
+ 
+-			QString str =
+-			"contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
+-			"	CONFIG += x86 ppc\n"
+-			"}\n";
+-
+ 			QString sdk = qc_getenv("QC_MAC_SDK");
+ 			if(!sdk.isEmpty())
+ 			{
+ 				str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
+ 				qc_universal_sdk = sdk;
+ 			}
+-
+-			conf->addExtra(str);
+ 		}
++		conf->addExtra(str);
+ #endif
+ 		return true;
+ 	}
+@@ -551,18 +546,7 @@
  // based on crypto.prf. any changes made to that file need to be tracked here.
  static QString internal_crypto_prf(const QString &incdir, const QString &libdir)
  {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111019/5f721171/attachment.html>