diff --git a/databases/sqlite3/Portfile b/databases/sqlite3/Portfile
index a95875e3bb211..5a6871d7bde38 100644
--- a/databases/sqlite3/Portfile
+++ b/databases/sqlite3/Portfile
@@ -41,11 +41,11 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"}
     clang_dependency.extra_versions 3.7
 }
 
-if {${subport} ne "${name}-tools"} {
-    patchfiles      patch-sqlite3_fix-atomic-clang-4.diff
-} else {
-    patchfiles      patch-sqlite3-tools_fix-atomic-clang-4.diff
-}
+# if {${subport} ne "${name}-tools"} {
+#     patchfiles      patch-sqlite3_fix-atomic-clang-4.diff
+# } else {
+#     patchfiles      patch-sqlite3-tools_fix-atomic-clang-4.diff
+# }
 
 configure.args      --enable-threadsafe \
                     --disable-readline \
@@ -64,8 +64,8 @@ platform darwin 8 {
 }
 
 if {${subport} eq ${name}} {
-    patchfiles-append \
-                    no-rpath.patch
+    patchfiles      no-rpath.patch \
+                    patch-sqlite3_fix-atomic-clang-4.diff
 
     post-patch {
         # See https://sqlite.org/forum/forumpost/566126d8c7 this should not
@@ -99,32 +99,33 @@ if {${subport} eq ${name}} {
 }
 
 subport ${name}-tcl {
-    revision        1
+    revision                1
 
-    depends_lib     port:tcl
+    depends_lib             port:tcl
 
-    configure.dir   ${worksrcpath}/tea
-    build.dir       ${configure.dir}
-    patch.dir       ${configure.dir}
+    configure.dir           ${worksrcpath}/tea
+    build.dir               ${configure.dir}
+    patch.dir               ${configure.dir}
 
-    configure.args  --exec-prefix=${prefix} \
-                    --with-tcl=${prefix}/lib \
-                    --with-tclinclude=${prefix}/include
+    configure.args          --exec-prefix=${prefix} \
+                            --with-tcl=${prefix}/lib \
+                            --with-tclinclude=${prefix}/include
 
-    configure.cppflags-prepend  -I${worksrcpath}
+    configure.cppflags-prepend \
+                            -I${worksrcpath}
 
-    patchfiles      patch-tea-generic-tclsqlite3.c.diff
+    patchfiles              patch-tea-generic-tclsqlite3.c.diff
 
     platform darwin {
         if {${os.major} < 11} {
             patchfiles-append \
-                        patch-tea-configure.diff
+                            patch-tea-configure.diff
         }
     }
 }
 
 subport ${name}-tools {
-    revision                0
+    revision                1
 
     distname                sqlite-src-${padded_ver}
 
@@ -138,9 +139,12 @@ subport ${name}-tools {
                     size    14371111
 
     use_zip                 yes
+
     depends_lib             port:tcl \
                             port:zlib
 
+    patchfiles              patch-sqlite3-tools_fix-atomic-clang-4.diff
+
     configure.args          --with-tcl=${prefix}/lib
     build.target            sqldiff sqlite3_analyzer
     destroot {