<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b49f40a3669ddd05d7b55a420c30e3a20a588f65">https://github.com/macports/macports-ports/commit/b49f40a3669ddd05d7b55a420c30e3a20a588f65</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new b49f40a  KeePassXC-devel: add new subport
</span>b49f40a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b49f40a3669ddd05d7b55a420c30e3a20a588f65
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Thu Oct 25 08:19:17 2018 +0800

<span style='display:block; white-space:pre;color:#404040;'>    KeePassXC-devel: add new subport
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    And enable YubiKey support by default; eliminate +yubikey variant
</span>---
 security/KeePassXC/Portfile                        | 67 ++++++++++++++++------
 .../KeePassXC/files/devel/patch-no-deployqt.diff   | 41 +++++++++++++
 .../files/{ => stable}/patch-no-deployqt.diff      |  0
 3 files changed, 89 insertions(+), 19 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/Portfile b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f0d5bb..f2a70bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,10 @@ PortGroup               github 1.0
</span> PortGroup               cmake 1.0
 PortGroup               compiler_blacklist_versions 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            keepassxreboot keepassxc 2.3.4
</span> name                    KeePassXC
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport KeePassXC-devel {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories              security aqua
 maintainers             {yan12125 @yan12125} openmaintainer
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,16 +25,6 @@ license                 GPL-2+
</span> license_noconflict      openssl
 
 homepage                https://keepassxc.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from     releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz                  yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname                ${github.project}-${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir              ${github.project}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               rmd160  9b7e6deead5b858d72a6af8644756876ce3c3b69 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  0c24a78895185b9b6b098f08a15b332c600f80aa570d608940fcc2a38e02780a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    4137176
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles              patch-no-deployqt.diff
</span> 
 qt5.depends_component   qtmacextras
 qt5.depends_build_component \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +33,7 @@ qt5.depends_build_component \
</span> depends_lib-append      port:argon2 \
                         port:libgcrypt \
                         port:libsodium \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:ykpers \
</span>                         port:zlib
 
 # KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,10 +51,52 @@ cmake.out_of_source     yes
</span> configure.pre_args-append \
     -DCMAKE_INSTALL_PREFIX=${applications_dir} \
     -DCMAKE_INSTALL_MANDIR=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DWITH_XC_HTTP=ON \
</span>     -DWITH_XC_BROWSER=ON \
     -DWITH_XC_SSHAGENT=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DWITH_XC_NETWORKING=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DWITH_XC_NETWORKING=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DWITH_XC_YUBIKEY=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup            keepassxreboot keepassxc 2.3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.tarball_from     releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    use_xz                  yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts               KeePassXC-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    distname                ${github.project}-${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    worksrcdir              ${github.project}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums               rmd160  9b7e6deead5b858d72a6af8644756876ce3c3b69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  0c24a78895185b9b6b098f08a15b332c600f80aa570d608940fcc2a38e02780a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    4137176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles              stable/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DWITH_XC_HTTP=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set commit a67cac1322d4545c72c75cedb06059b9009aa7ae
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup            keepassxreboot keepassxc ${commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version                 20181125
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts               KeePassXC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    distname                ${github.project}-${commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    worksrcdir              ${github.project}-${commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums               rmd160  6c551f964752ab335a7efa027bf78242dfbfad83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  bad7b4e8dff41a2419d83df95bc13ef5c1ae4d5ab56d65d6a7ab1c787a244809 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    4886891
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles              devel/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:qrencode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DWITH_XC_TOUCHID=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 if {${configure.cxx_stdlib} eq "libstdc++"} {
     configure.pre_args-append   -DWITH_CXX11=OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,12 +107,6 @@ if {${os.major} < 12} {
</span>     configure.pre_args-append   -DWITH_XC_AUTOTYPE=OFF
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant yubikey description {Enable YubiKey challenge-response support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DWITH_XC_YUBIKEY=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:ykpers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-configure {
     reinplace "s#/usr/local/bin#${prefix}/bin#" \
         ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-no-deployqt.diff b/security/KeePassXC/files/devel/patch-no-deployqt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3131252
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/devel/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2018-02-28 05:38:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-03-02 16:51:27.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,12 +306,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(CMAKE_MACOSX_RPATH TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    if(NOT MACDEPLOYQT_EXE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        message(FATAL_ERROR "macdeployqt is required to build in macOS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Debian sets the the build type to None for package builds.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt     2018-02-28 05:38:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt     2018-03-02 16:47:48.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -319,11 +319,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     include(CPack)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    add_custom_command(TARGET ${PROGNAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            COMMENT "Deploying app bundle")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS ${PROGNAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/autotype/mac/CMakeLists.txt        2018-02-28 05:38:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/autotype/mac/CMakeLists.txt        2018-03-02 16:48:26.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,8 +13,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WITH_APP_BUNDLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     add_custom_command(TARGET keepassx-autotype-cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            COMMAND ${CMAKE_COMMAND} -E make_directory ${PLUGIN_INSTALL_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             COMMENT "Deploying autotype plugin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-no-deployqt.diff b/security/KeePassXC/files/stable/patch-no-deployqt.diff
</span>similarity index 100%
rename from security/KeePassXC/files/patch-no-deployqt.diff
rename to security/KeePassXC/files/stable/patch-no-deployqt.diff
</pre><pre style='margin:0'>

</pre>