diff --git a/MOVED b/MOVED
index 575e5fa8dfd..ed2c90a3be7 100644
--- a/MOVED
+++ b/MOVED
@@ -10875,7 +10875,6 @@ security/py-yubioath-desktop|security/yubioath-desktop|2018-12-27|New Yubikey Oa
 audio/amarok-kde4|audio/amarok|2018-12-28|Renamed as no longer kde4 based
 games/knights-kde|games/knights|2018-12-30|Switch to version from KDE Applications
 multimedia/kmplayer-kde4|multimedia/kmplayer|2018-12-30|Moved to KF5 based version
-net/pecl-mosquitto||2018-12-30|Has expired: Works only with EOL php 5.6
 net/pecl-ip2location||2018-12-30|Has expired: Works only with EOL php 5.6
 net/pecl-yp||2018-12-30|Has expired: Works only with EOL php 5.6
 net/pecl-oauth||2018-12-30|Has expired: Works only with EOL php 5.6
@@ -12849,3 +12848,7 @@ misc/tcb||2019-07-13|Has expired: Abandonware that uses sys/dir.h
 editors/xed||2019-07-13|Has expired: Abandonware using sys/dir.h
 databases/gtksql||2019-07-13|Has expired: Abandonware using sys/dir.h
 security/snortreport||2019-07-16|Has expired: Abandonware
+databases/pecl-redis3|databases/pecl-redis|2019-07-19|No longer needed after PHP 5 removal
+www/weblint||2019-07-20|Broken, uses nonexistant perl libraries, and upstream disappeared. Use www/p5-HTML-Lint instead
+www/august||2019-07-20|Uses removed weblint
+misc/bitwise|math/bitwise|2019-07-21|Moved to math category
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index e7fd578d43c..9dabb0157ed 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -107,13 +107,14 @@ cabal-extract-deps:
 # Generates USE_CABAL= ... line ready to be pasted into the port based on artifacts of cabal-extract-deps.
 make-use-cabal:
 	@echo ====================
-	@find ${CABAL_HOME} -name '*.conf' -exec basename {} + | sed -E 's|-[0-9a-z]{64}\.conf||' | sort | xargs echo -n USE_CABAL= && echo
+	@echo -n USE_CABAL=
+	@find ${CABAL_HOME} -name '*.conf' -exec basename {} + | sed -E 's|-[0-9a-z]{64}\.conf||' | sort | sed 's/$$/ \\/'
 
-# Checks USE_CABAL items that have revisions.
-check-revs:
+# Re-generates USE_CABAL items to have revision numbers.
+make-use-cabal-revs:
 .  for package in ${_use_cabal}
-	@(fetch -o /dev/null http://hackage.haskell.org/package/${package:C/_[0-9]+//}/revision/1.cabal 2>/dev/null && echo "Package ${package} has revisions") || true
-	@([ -d ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/revision ] && echo "    hint: " `find ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//} -name *.cabal | xargs basename`) || true
+	@(${ENV} HTTP_ACCEPT="application/json" fetch -q -o - http://hackage.haskell.org/package/${package:C/_[0-9]+//}/revisions/ | sed -Ee 's/.*":([0-9]+)}\]/${package:C/_[0-9]+//}_\1 /' -e 's/_0//')
+	@echo '\'
 .  endfor
 
 .  if !defined(CABAL_BOOTSTRAP)