diff --git a/Formula/fontforge.rb b/Formula/fontforge.rb
index 7bbb8835211c4..6eed68ec5764b 100644
--- a/Formula/fontforge.rb
+++ b/Formula/fontforge.rb
@@ -3,6 +3,7 @@ class Fontforge < Formula
   homepage "https://fontforge.github.io"
   url "https://github.com/fontforge/fontforge/releases/download/20190801/fontforge-20190801.tar.gz"
   sha256 "d92075ca783c97dc68433b1ed629b9054a4b4c74ac64c54ced7f691540f70852"
+  revision 1
 
   bottle do
     cellar :any
diff --git a/Formula/gdal.rb b/Formula/gdal.rb
index 09a8e416f91bd..ac09d2bedba26 100644
--- a/Formula/gdal.rb
+++ b/Formula/gdal.rb
@@ -3,7 +3,7 @@ class Gdal < Formula
   homepage "https://www.gdal.org/"
   url "https://download.osgeo.org/gdal/2.4.2/gdal-2.4.2.tar.xz"
   sha256 "dcc132e469c5eb76fa4aaff238d32e45a5d947dc5b6c801a123b70045b618e0c"
-  revision 2
+  revision 3
 
   bottle do
     sha256 "a4a409e4e4008b8888b736017aaf8b304fc5eead7ec06b648d9d99ba1e04c7a5" => :catalina
diff --git a/Formula/giflib.rb b/Formula/giflib.rb
index 1a312292d68ce..e70f01f837cc1 100644
--- a/Formula/giflib.rb
+++ b/Formula/giflib.rb
@@ -1,9 +1,8 @@
 class Giflib < Formula
   desc "Library and utilities for processing GIFs"
   homepage "https://giflib.sourceforge.io/"
-  url "https://downloads.sourceforge.net/project/giflib/giflib-5.1.4.tar.bz2"
-  sha256 "df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5"
-  revision 1
+  url "https://downloads.sourceforge.net/project/giflib/giflib-5.2.1.tar.gz"
+  sha256 "31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd"
 
   bottle do
     cellar :any
@@ -14,18 +13,16 @@ class Giflib < Formula
     sha256 "91161dd227491e058a9ca79ca89bb647d2bac5e368bed5457fc80a30d383ff2d" => :el_capitan
   end
 
-  # CVE-2016-3977
-  # https://sourceforge.net/p/giflib/bugs/102/
-  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820526
-  patch do
-    url "https://deb.debian.org/debian/pool/main/g/giflib/giflib_5.1.4-3.debian.tar.xz"
-    sha256 "767ea03c1948fa203626107ead3d8b08687a3478d6fbe4690986d545fb1d60bf"
-    apply "patches/CVE-2016-3977.patch"
+  # Upstream has stripped out the previous autotools-based build system and their
+  # Makefile doesn't work on macOS. See https://sourceforge.net/p/giflib/bugs/133/
+  patch :p0 do
+    url "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch"
+    sha256 "a94e7bdd8840a31cecacc301684dfdbf7b98773ad824aeaab611fabfdc513036"
   end
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
-    system "make", "install"
+    system "make", "all"
+    system "make", "install", "PREFIX=#{prefix}"
   end
 
   test do
diff --git a/Formula/leptonica.rb b/Formula/leptonica.rb
index 966a55140be88..a2063342106e7 100644
--- a/Formula/leptonica.rb
+++ b/Formula/leptonica.rb
@@ -3,6 +3,7 @@ class Leptonica < Formula
   homepage "http://www.leptonica.org/"
   url "http://www.leptonica.org/source/leptonica-1.78.0.tar.gz"
   sha256 "e2ed2e81e7a22ddf45d2c05f0bc8b9ae7450545d995bfe28517ba408d14a5a88"
+  revision 1
 
   bottle do
     cellar :any
diff --git a/Formula/libming.rb b/Formula/libming.rb
index be598054376dc..30fe0bd699a6f 100644
--- a/Formula/libming.rb
+++ b/Formula/libming.rb
@@ -3,6 +3,7 @@ class Libming < Formula
   homepage "http://www.libming.org"
   url "https://github.com/libming/libming/archive/ming-0_4_8.tar.gz"
   sha256 "2a44cc8b7f6506adaa990027397b6e0f60ba0e3c1fe8c9514be5eb8e22b2375c"
+  revision 1
 
   bottle do
     cellar :any
diff --git a/Formula/mapserver.rb b/Formula/mapserver.rb
index cf6fc25cd5f6d..f8f93041aeffe 100644
--- a/Formula/mapserver.rb
+++ b/Formula/mapserver.rb
@@ -3,6 +3,7 @@ class Mapserver < Formula
   homepage "https://mapserver.org/"
   url "https://download.osgeo.org/mapserver/mapserver-7.2.2.tar.gz"
   sha256 "287f8dfe10961bc685bb87e118b7aa81382df907b2b3961d6559169b527ba95c"
+  revision 1
 
   bottle do
     cellar :any
@@ -13,7 +14,7 @@ class Mapserver < Formula
 
   depends_on "cmake" => :build
   depends_on "pkg-config" => :build
-  depends_on "swig" => :build
+  depends_on "swig@3" => :build
   depends_on "cairo"
   depends_on "fcgi"
   depends_on "freetype"
diff --git a/Formula/openimageio.rb b/Formula/openimageio.rb
index 26f2b6c47cb6d..b43d204ad20db 100644
--- a/Formula/openimageio.rb
+++ b/Formula/openimageio.rb
@@ -3,6 +3,7 @@ class Openimageio < Formula
   homepage "https://openimageio.org/"
   url "https://github.com/OpenImageIO/oiio/archive/Release-2.0.12.tar.gz"
   sha256 "930a142c9cabbbc3b249577083c97e9f0407cc8cbf933144f3a3ed0f3ec9cfe0"
+  revision 1
   head "https://github.com/OpenImageIO/oiio.git"
 
   bottle do
diff --git a/Formula/pdf2htmlex.rb b/Formula/pdf2htmlex.rb
index 8395d6887b66f..c9106e83ebdbd 100644
--- a/Formula/pdf2htmlex.rb
+++ b/Formula/pdf2htmlex.rb
@@ -3,7 +3,7 @@ class Pdf2htmlex < Formula
   homepage "https://coolwanglu.github.io/pdf2htmlEX/"
   url "https://github.com/coolwanglu/pdf2htmlEX/archive/v0.14.6.tar.gz"
   sha256 "320ac2e1c2ea4a2972970f52809d90073ee00a6c42ef6d9833fb48436222f0e5"
-  revision 22
+  revision 23
   head "https://github.com/coolwanglu/pdf2htmlEX.git"
 
   bottle do
diff --git a/Formula/sxiv.rb b/Formula/sxiv.rb
index fd03578beca3c..c7b2e6834fd4b 100644
--- a/Formula/sxiv.rb
+++ b/Formula/sxiv.rb
@@ -4,6 +4,7 @@ class Sxiv < Formula
   url "https://github.com/muennich/sxiv/archive/v25.tar.gz"
   mirror "https://deb.debian.org/debian/pool/main/s/sxiv/sxiv_25.orig.tar.gz"
   sha256 "16d1aca1a179e1c0875844efe2e51cfa396a4403467c389f7e9221a733ae5e26"
+  revision 1
   head "https://github.com/muennich/sxiv.git"
 
   bottle do
diff --git a/Formula/vips.rb b/Formula/vips.rb
index 246cbaf3eef8b..bcc6199a24a75 100644
--- a/Formula/vips.rb
+++ b/Formula/vips.rb
@@ -3,7 +3,7 @@ class Vips < Formula
   homepage "https://github.com/libvips/libvips"
   url "https://github.com/libvips/libvips/releases/download/v8.8.3/vips-8.8.3.tar.gz"
   sha256 "c5e4dd5a5c6a777c129037d19ca606769b3f1d405fcc9c8eeda906a61491f790"
-  revision 1
+  revision 2
 
   bottle do
     sha256 "153d701602b9bbc3e967b06fbfa9975c7e80cd61b0416ac722b3e75ef4a6dcbc" => :catalina
diff --git a/Formula/xplanet.rb b/Formula/xplanet.rb
index a90376c3f7529..ee41c693089d7 100644
--- a/Formula/xplanet.rb
+++ b/Formula/xplanet.rb
@@ -3,7 +3,7 @@ class Xplanet < Formula
   homepage "https://xplanet.sourceforge.io/"
   url "https://downloads.sourceforge.net/project/xplanet/xplanet/1.3.1/xplanet-1.3.1.tar.gz"
   sha256 "4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7"
-  revision 3
+  revision 4
 
   bottle do
     sha256 "aceb0af3fffbec2688b79ed1ae4d9c3c4004d8f6d685fb3156799b416403595a" => :catalina