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

[michaelld at macports.org]

Revision: 70437
          http://trac.macports.org/changeset/70437
Author:   michaelld at macports.org
Date:     2010-08-09 10:55:34 -0700 (Mon, 09 Aug 2010)
Log Message:
-----------
Patch configure to find QCA more robustly; fixes ticket #25715.
Install this plugin into default location (inside QT4 plugins).
Allow variant for debug, which installs both release and debug plugins.

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

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

Modified: trunk/dports/devel/qca-ossl/Portfile
===================================================================
--- trunk/dports/devel/qca-ossl/Portfile	2010-08-09 17:52:21 UTC (rev 70436)
+++ trunk/dports/devel/qca-ossl/Portfile	2010-08-09 17:55:34 UTC (rev 70437)
@@ -25,17 +25,26 @@
                     sha1 dd925e8732ff76f24f9f90f4094abaf2f0ac27bf \
                     rmd160 c979c3c3427eb45e8866e28746f83966e8bcf3c2
 
+depends_build       port:pkgconfig
 depends_lib         port:qca \
                     port:openssl
 
-# 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
+# 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
 
 set qt_dir         ${prefix}/libexec/qt4-mac
 
-configure.pre_args  --qtdir=${qt_dir} --with-qca=${prefix}
+# qca-ossl does not use --prefix
+configure.pre_args
+configure.args       --verbose             \
+                     --qtdir=${qt_dir}
 
 destroot.destdir    INSTALL_ROOT="${destroot}"
 
@@ -47,6 +56,13 @@
     }
 }
 
+variant debug description \
+{Build both release and debug library} \
+{
+    configure.args-delete --release
+    configure.args-append --debug-and-release
+}
+
 variant universal {
     configure.universal_args-append --universal
 }

Added: trunk/dports/devel/qca-ossl/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/qca-ossl/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/devel/qca-ossl/files/patch-configure.diff	2010-08-09 17:55:34 UTC (rev 70437)
@@ -0,0 +1,22 @@
+--- configure_orig	2010-08-04 09:53:50.000000000 -0400
++++ configure	2010-08-04 10:12:43.000000000 -0400
+@@ -551,18 +551,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)
+ {
+-	QString out = QString(
+-	"CONFIG *= qt\n"
+-	"INCLUDEPATH += %1/QtCrypto\n"
+-	"LIBS += -L%2\n"
+-	"\n"
+-	"LINKAGE = -lqca\n"
+-	"CONFIG(debug, debug|release) {\n"
+-        "	windows:LINKAGE = -lqcad\n"
+-        "	mac:LINKAGE = -lqca_debug\n"
+-	"}\n"
+-	"LIBS += \$\$LINKAGE\n"
+-	).arg(incdir, libdir);
++	QString out = QString("CONFIG *= crypto\n");
+ 	return out;
+ }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100809/116d426a/attachment.html>