[97906] trunk/dports/devel/qca-gnupg

[michaelld at macports.org]

Revision: 97906
          http://trac.macports.org//changeset/97906
Author:   michaelld at macports.org
Date:     2012-09-19 06:25:28 -0700 (Wed, 19 Sep 2012)
Log Message:
-----------
qca-gnupg : handle +universal correctly.

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

Modified: trunk/dports/devel/qca-gnupg/Portfile
===================================================================
--- trunk/dports/devel/qca-gnupg/Portfile	2012-09-19 12:55:04 UTC (rev 97905)
+++ trunk/dports/devel/qca-gnupg/Portfile	2012-09-19 13:25:28 UTC (rev 97906)
@@ -6,7 +6,7 @@
 
 name                qca-gnupg
 version             2.0.0-beta3
-revision            1
+revision            2
 categories          devel crypto security
 maintainers         michaelld openmaintainer
 description         Qt Cryptographic Architecture - gnupg plugin
@@ -34,6 +34,15 @@
 # forcing patching of multiple files.
 patchfiles          patch-configure.diff
 
+post-patch {
+    # set arch type(s)
+    reinplace "s|@ARCHES@|${qt_arch_types}|g" \
+        ${worksrcpath}/configure
+}
+
+# --disable-dependency-tracking is not recognized.
+configure.universal_args-delete --disable-dependency-tracking
+
 # qca-gnupg does not use --prefix
 configure.pre_args
 configure.args       --verbose             \

Modified: trunk/dports/devel/qca-gnupg/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/qca-gnupg/files/patch-configure.diff	2012-09-19 12:55:04 UTC (rev 97905)
+++ trunk/dports/devel/qca-gnupg/files/patch-configure.diff	2012-09-19 13:25:28 UTC (rev 97906)
@@ -1,6 +1,33 @@
---- configure_orig	2010-08-04 20:17:53.000000000 -0400
-+++ configure	2010-08-04 20:22:54.000000000 -0400
-@@ -537,18 +537,7 @@
+--- configure.orig	2012-09-19 09:17:45.000000000 -0400
++++ configure	2012-09-19 09:20:17.000000000 -0400
+@@ -504,24 +504,8 @@
+ 	bool exec()
+ 	{
+ #ifdef Q_OS_MAC
+-		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);
+-		}
++		QString str = "CONFIG += @ARCHES@\n";
++		conf->addExtra(str);
+ #endif
+ 		return true;
+ 	}
+@@ -537,18 +521,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/20120919/c0080345/attachment.html>