KeePassXC: update to 2.5.1

Also obsoletes KeePassXC-devel

security/KeePassXC-devel/Portfile

@@ -0,0 +1,12 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+
+PortSystem          1.0
+PortGroup           obsolete 1.0
+
+name                KeePassXC-devel
+categories          security aqua
+version             20191026
+revision            1
+replaced_by         KeePassXC
+
+# Remove after 2020-11-13

security/KeePassXC/Portfile

@@ -8,24 +8,48 @@ PortGroup               compiler_blacklist_versions 1.0
 PortGroup               gpg_verify 1.0
 
 name                    KeePassXC
-
-subport KeePassXC-devel {}
-
 categories              security aqua
 maintainers             {yan12125 @yan12125} openmaintainer
-
 description             KeePassXC is a cross-platform community-driven port \
                         of the Windows application “Keepass Password Safe”.
 long_description        KeePassXC is a community fork of KeePassX with the \
                         goal to extend and improve it with new features and \
                         bugfixes to provide a feature-rich, fully \
                         cross-platform and modern open-source password manager.
-
 platforms               darwin
 license                 GPL-2+
 license_noconflict      openssl
 
-homepage                https://keepassxc.org
+github.setup            keepassxreboot keepassxc 2.5.1
+github.tarball_from     releases
+distname                keepassxc-${version}-src
+use_xz                  yes
+distfiles-append        ${distname}${extract.suffix}.sig
+
+# See keepassxc-${version}-src.tar.xz.DIGEST on upstream GitHub releases page for SHA256 sums
+checksums               ${distname}${extract.suffix} \
+                        rmd160  4b3c639ec001fec15f16560f795dbbfd9a79ab9c \
+                        sha256  ef33258b859a7b996af007113613b0f6210f2341e8f5fb3a005564262c2caf30 \
+                        size    6798880 \
+                        ${distname}${extract.suffix}.sig \
+                        size    488
+
+gpg_verify.use_gpg_verification \
+                        yes
+
+if {[option gpg_verify.use_gpg_verification]} {
+    post-checksum {
+        # The public key is downloaded from [1], and the key ID is listed on [2].
+        # [1] https://keepassxc.org/keepassxc_master_signing_key.asc
+        # [2] https://keepassxc.org/verifying-signatures/
+        set gpg_keyid CFB4C2166397D0D2
+
+        gpg_verify.verify_gpg_signature \
+            ${filespath}/keyid-${gpg_keyid}.txt \
+            ${distpath}/[lindex ${distfiles} 0].sig \
+            ${distpath}/[lindex ${distfiles} 0]
+    }
+}
 
 qt5.depends_component   qtmacextras qtsvg
 qt5.depends_build_component \
@@ -42,6 +66,8 @@ depends_lib-append      port:argon2 \
 
 compiler.cxx_standard   2011
 
+patchfiles              patch-no-deployqt.diff
+
 # KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
 # available until clang 602 [2] or upstream clang 3.5 [3]
 # [1] https://github.com/keepassxreboot/keepassxc/blob/develop/CMakeLists.txt
@@ -59,6 +85,7 @@ pre-configure {
 configure.pre_args-append \
     -DCMAKE_INSTALL_PREFIX=${applications_dir} \
     -DCMAKE_INSTALL_MANDIR=${prefix}/share/man \
+    -DKEEPASSXC_BUILD_TYPE=Release \
     -DWITH_XC_BROWSER=ON \
     -DWITH_XC_KEESHARE=ON \
     -DWITH_XC_KEESHARE_SECURE=ON \
@@ -80,62 +107,6 @@ if {${os.major} < 16} {
     }
 }
 
-if {${subport} eq ${name}} {
-    # stable
-    github.setup            keepassxreboot keepassxc 2.5.0
-    github.tarball_from     releases
-
-    conflicts               KeePassXC-devel
-
-    distname                keepassxc-${version}-src
-    use_xz                  yes
-    distfiles-append        ${distname}${extract.suffix}.sig
-
-    # See keepassxc-${version}-src.tar.xz.DIGEST on upstream GitHub releases page for SHA256 sums
-    checksums               ${distname}${extract.suffix} \
-                            rmd160  a0b7f407c13c1241e9526dc320c28479bd12863d \
-                            sha256  6359ce972b720a8bce1e8ba54000666e9c58f9164f2e9e52bef2e24e46127881 \
-                            size    6752776 \
-                            ${distname}${extract.suffix}.sig \
-                            size    488
-
-    gpg_verify.use_gpg_verification \
-                            yes
-
-    if {[option gpg_verify.use_gpg_verification]} {
-        post-checksum {
-            # The public key is downloaded from [1], and the key ID is listed on [2].
-            # [1] https://keepassxc.org/keepassxc_master_signing_key.asc
-            # [2] https://keepassxc.org/verifying-signatures/
-            set gpg_keyid CFB4C2166397D0D2
-
-            gpg_verify.verify_gpg_signature \
-                ${filespath}/stable/keyid-${gpg_keyid}.txt \
-                ${distpath}/[lindex ${distfiles} 0].sig \
-                ${distpath}/[lindex ${distfiles} 0]
-        }
-    }
-
-    patchfiles              stable/patch-no-deployqt.diff
-
-    configure.pre_args-append \
-                            -DKEEPASSXC_BUILD_TYPE=Release
-} else {
-    # devel
-    github.setup            keepassxreboot keepassxc 9b5a46f4b01112e9930c7f17f457e2daaad31505
-    github.tarball_from     archive
-    version                 20191026
-    revision                0
-
-    conflicts               KeePassXC
-
-    checksums               rmd160  55ff7f6e7fd385472c2cca5da23944f744397d45 \
-                            sha256  66b7b27e4ff670d1991d7fff37157163740a33c2bb5692d57f2c24b3aaa9add6 \
-                            size    9756901
-
-    patchfiles              devel/patch-no-deployqt.diff
-}
-
 post-destroot {
     xinstall -d ${destroot}${prefix}/share/doc/${name}
     xinstall -W ${worksrcpath} COPYING LICENSE.BOOST-1.0 LICENSE.BSD \