[144947] trunk/dports/devel/qca/Portfile

[vince at macports.org]

Revision: 144947
          https://trac.macports.org/changeset/144947
Author:   vince at macports.org
Date:     2016-01-22 02:26:04 -0800 (Fri, 22 Jan 2016)
Log Message:
-----------
qca: bump to 2.1, obsoleting qca-ossl

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

Modified: trunk/dports/devel/qca/Portfile
===================================================================
--- trunk/dports/devel/qca/Portfile	2016-01-22 09:39:09 UTC (rev 144946)
+++ trunk/dports/devel/qca/Portfile	2016-01-22 10:26:04 UTC (rev 144947)
@@ -2,11 +2,10 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           qt4 1.0
+PortGroup           cmake 1.0
 
 name                qca
-version             2.0.3
-revision            2
+version             2.1.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel crypto security
 maintainers         michaelld openmaintainer
@@ -20,52 +19,38 @@
 platforms            darwin
 
 homepage             http://delta.affinix.com/qca/
-master_sites         http://delta.affinix.com/download/qca/${branch}/
-use_bzip2            yes
+master_sites         http://delta.affinix.com/download/qca/2.0/
 
-checksums            md5     fc15bd4da22b8096c51fcfe52d2fa309 \
-                     sha1    9c868b05b81dce172c41b813de4de68554154c60 \
-                     rmd160  333cfdce91fedfaec09c205528de52d7b569c521
+checksums           rmd160  30358bbd182cfeb9eaa696b5b39fa9e6d1f99b4c \
+                    sha256  226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284
 
+
 # (1) correct pkgconfig file for framework install, if selected.
 # (2) allow for 'debug' and 'framework' options at the same time.
 #     This change is needed to allow for +debug [+framework] --
 #     disallow just debug framework via no variants for it.
 # (3) allow simple replacement for universal arch arguments, if that
 #     variant is requested.
-patchfiles           patch-configure.diff
+patchfiles          patch-qca_basic_h.diff \
+                    patch_CMakeLists_txt.diff
 
 # fix C++ inheritance for a specific class to make clang happy
-patchfiles-append    patch-src_botantools_botan_botan_secmem.h.diff
+#patchfiles-append    patch-src_botantools_botan_botan_secmem.h.diff
 
 # remove unnecessary Carbon #include, which fails on 10.8
-patchfiles-append    patch-src_qac_systemstore_mac.cpp.diff
+#patchfiles-append    patch-src_qac_systemstore_mac.cpp.diff
+variant qt4 conflicts qt5 description "Build with qt4" {
 
-post-patch {
-    # set arch type(s)
-    reinplace "s|@ARCHES@|${qt_arch_types}|g" \
-        ${worksrcpath}/configure
-
-    # since Qt now uses the correct install_name for libraries,
-    # remove that from QCA's library
-    reinplace "/QMAKE_LFLAGS_SONAME/d" \
-        ${worksrcpath}/src/src.pro
+    PortGroup   qt4 1.0
+    configure.args-append   "-DQT4_BUILD=ON"
 }
 
-# set QCA to install into the QT4 directory
-configure.pre_args   --prefix=${qt_dir}
+variant qt5 conflicts qt4 description "Build with qt5" {
 
-# defaults: release only, no-framework, specific build_arch.
-# use variants to change everything except framework
-configure.args        --verbose         \
-                      --qtdir=${qt_dir} \
-                      --release         \
-                      --no-framework
+    PortGroup               qt5 1.0
+    configure.args-append   "-DQCA_FEATURE_INSTALL_DIR=${prefix}/libexec/qt5/mkspecs"
 
-# 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
+}
 
 # allow ccache, if specified by the user
 pre-build {
@@ -83,13 +68,15 @@
     xinstall -m 644 -W ${worksrcpath} COPYING README TODO \
         ${destroot_qt}/share/doc/${name}
 
-    # install cmake file (taken from port 'kdelibs4'). To use this
-    # file, include '-DCMAKE_MODULE_PATH=...' in configure.args during
-    # the initial 'configure' stage (which uses CMake), to the full
-    # path of where the CMake files are installed.
-    xinstall -d -m 755 ${destroot}${qt_cmake_module_dir}
-    xinstall -m 644 -W ${filespath} FindQCA2.cmake \
-        ${destroot}${qt_cmake_module_dir}
+    if {[variant_isset qt4]} {
+        # install cmake file (taken from port 'kdelibs4'). To use this
+        # file, include '-DCMAKE_MODULE_PATH=...' in configure.args during
+        # the initial 'configure' stage (which uses CMake), to the full
+        # path of where the CMake files are installed.
+        xinstall -d -m 755 ${destroot}${qt_cmake_module_dir}
+        xinstall -m 644 -W ${filespath} FindQCA2.cmake \
+            ${destroot}${qt_cmake_module_dir}
+    }
 }
 
 variant debug description \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160122/5f100537/attachment.html>