[141016] trunk/dports/security/KeePassX/Portfile

[eborisch at macports.org]

Revision: 141016
          https://trac.macports.org/changeset/141016
Author:   eborisch at macports.org
Date:     2015-10-07 16:29:28 -0700 (Wed, 07 Oct 2015)
Log Message:
-----------
KeePassX: Update to 2.0-beta2. Use github and cmake (with out_of_source) groups. WITH_CXX11 switched to default ON; change config options.

Modified Paths:
--------------
    trunk/dports/security/KeePassX/Portfile

Modified: trunk/dports/security/KeePassX/Portfile
===================================================================
--- trunk/dports/security/KeePassX/Portfile	2015-10-07 23:17:32 UTC (rev 141015)
+++ trunk/dports/security/KeePassX/Portfile	2015-10-07 23:29:28 UTC (rev 141016)
@@ -3,9 +3,11 @@
 
 PortSystem              1.0
 PortGroup               qt4 1.0
+PortGroup               github 1.0
+PortGroup               cmake 1.0
+github.setup            keepassx keepassx 2.0-beta2
 
 name                    KeePassX
-version                 2.0-beta1
 revision                0
 categories              security aqua
 maintainers             nomaintainer
@@ -27,56 +29,37 @@
 "
 
 homepage                https://www.keepassx.org/
-master_sites            https://www.keepassx.org/dev/attachments/download/100
-distname                keepassx-${version}
 
 checksums \
-    rmd160  d464465eeceaf94d5bedf0e124702dea2ca13324 \
-    sha256  bce1933c48fd33ef8043dd526d769fd9c454d1b63464c82a35e1f7a8689acbf2
+    rmd160  542eda22b8393f1de6798d7c3072d229da3103d1 \
+    sha256  a81239227905fcace9efd007b53a98b84c7711a3600bf2ded0d6743e8ddfce66
 
 depends_lib-append      port:libgcrypt \
                         port:zlib
 
 depends_build-append    port:cmake
 
-worksrcdir              build
+cmake.out_of_source     yes
 
-post-extract {
-    file mkdir ${worksrcpath}
-    reinplace "s|zlib.h|${prefix}/include/zlib.h|" ../${distname}/CMakeLists.txt
-    platform darwin {
-        if {${os.major} >= 13} {
-            reinplace "s|-stack-protector-buffer-size=4||g" \
-                      ../${distname}/CMakeLists.txt
-            reinplace "s|-mllvm||g" \
-                      ../${distname}/CMakeLists.txt
-        }
-    }
-}
-
-configure.cmd           cmake
-configure.pre_args      -DCMAKE_INSTALL_PREFIX=${applications_dir} \
-                        -DZLIB_ROOT=${prefix}
-configure.args          ${qt_cmake_defines} ../${distname}
-
 platform darwin {
     if {${os.major} < 13} {
         # Build fails with clang: unsupported -stack-protector-buffer-size=4
         # (even though clang -help lists option)
-        compiler.blacklist          clang
-    } else {
-        configure.pre_args-append   -DWITH_CXX11=On
+        # Disabling blacklist; option no longer set in source CMakeLists.txt
+        # compiler.blacklist          clang
+        configure.pre_args-append   -DWITH_CXX11=OFF
     }
 }
 
 # Don't make copies of all the QT4 libraries etc... (MUCH smaller install)
 post-configure {
-    reinplace "s/FIXUP_QT4_EXECUTABLE.*//" src/cmake_install.cmake
+    reinplace "s/FIXUP_QT4_EXECUTABLE.*//" \
+        ${cmake.build_dir}/src/cmake_install.cmake
 }
 
 post-destroot {
     xinstall -d ${destroot}${prefix}/share/doc/${name}
-    xinstall -W ${workpath}/${distname} COPYING LICENSE.BSD LICENSE.CC0 \
+    xinstall -W ${worksrcpath} COPYING LICENSE.BSD LICENSE.CC0 \
              LICENSE.GPL-2 LICENSE.LGPL-2.1 LICENSE.LGPL-3 \
              LICENSE.NOKIA-LGPL-EXCEPTION \
              ${destroot}${prefix}/share/doc/${name}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151007/f15be1a6/attachment-0001.html>