diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 195638b0c..8ee4a948d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -29,7 +29,8 @@ jobs:
           - core-apps
           - core-autopatch
           - core-compat
-          - core-deps
+          # Trick GH runners into picking this slower job early.
+          - ACME=1 c=core-deps
           - core-makedep
           - core-misc
           - core-plugins
@@ -41,7 +42,10 @@ jobs:
           - cover
           - c-src
           - ct
-          - dialyzer
+          - dialyzer SET=1
+          - dialyzer SET=2
+          - dialyzer SET=3
+          - dialyzer SET=4
           - edoc
           - erlydtl
           - escript
@@ -49,12 +53,13 @@ jobs:
           - hex
           - proper
           - protobuffs
-          - relx
+          # Trick GH runners into picking this slower job early.
+          - ACME=1 c=relx
           - shell
           - sphinx
           - triq
           - xref
-        extra: ['', 'LEGACY=1']
+        extra: ['', 'CACHE_DEPS=1', 'LEGACY=1']
         exclude:
           # We disable proper/triq tests until ubuntu-latest includes GNU Make 4.4 or later.
           - os: ubuntu-latest
@@ -93,12 +98,12 @@ jobs:
 
     - name: Run tests (Linux)
       if: matrix.os == 'ubuntu-latest'
-      run: make check c=${{ matrix.suite }} -k ${{ matrix.extra }}
+      run: make check c=${{ matrix.suite }} -j4 -k ${{ matrix.extra }}
 
     - name: Run tests (Windows)
       if: matrix.os == 'windows-latest'
       shell: msys2 {0}
-      run: PATH=$INSTALL_DIR_FOR_OTP/bin:$PATH make check c=${{ matrix.suite }} -k V=3 ${{ matrix.extra }}
+      run: PATH=$INSTALL_DIR_FOR_OTP/bin:$PATH make check c=${{ matrix.suite }} -j4 -k ${{ matrix.extra }}
 
     - name: Upload artifacts
       if: failure()
@@ -107,3 +112,58 @@ jobs:
         name: ${{ matrix.os }} OTP-${{ matrix.erlang }} ${{ matrix.suite }} ${{ matrix.extra }}
         path: |
           test/test_*/
+
+  packages:
+    strategy:
+      fail-fast: false
+      matrix:
+        erlang:
+          - '27'
+        os:
+#          - macos-latest
+          - ubuntu-latest
+#          - windows-latest
+        extra: ['', 'LEGACY=1']
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Install Erlang/OTP
+      uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{ matrix.erlang }}
+        version-type: loose
+
+    - name: Setup MSYS2 (Windows)
+      if: matrix.os == 'windows-latest'
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: mingw64
+        release: false
+        update: true
+        install: >-
+          git
+          make
+          mingw-w64-x86_64-gcc
+          gnu-netcat
+          diffutils
+
+    - name: Run tests (Linux)
+      if: matrix.os == 'ubuntu-latest'
+      run: make packages -k ${{ matrix.extra }}
+
+    - name: Run tests (Windows)
+      if: matrix.os == 'windows-latest'
+      shell: msys2 {0}
+      run: PATH=$INSTALL_DIR_FOR_OTP/bin:$PATH make packages -j4 -k ${{ matrix.extra }}
+
+    - name: Upload artifacts
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.os }} OTP-${{ matrix.erlang }} packages ${{ matrix.extra }}
+        path: |
+          test/packages/
diff --git a/.gitignore b/.gitignore
index f2ca65932..9f6d9605a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ doc/guide.pdf
 doc/html
 test/logs/
 test/packages/
+test/test_hex_core_git/
 test/test_rebar_git/
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c6b759b59..863780e21 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -1,33 +1,3 @@
-2022/03/25: The -Wrace_conditions Dialyzer flag was removed
-            as it is no longer available starting from OTP 25.
-
-2022/05/20: Relx has been updated to v4. Relx v4 is no longer
-            an escript, therefore breaking changes were
-            introduced. The `RELX`, `RELX_URL` and `RELX_OPTS`
-            variables were removed. The `relx` project must
-            be added as a `DEPS`, `BUILD_DEPS` or `REL_DEPS`
-            dependency to enable building releases. For example:
-            `REL_DEPS = relx`. Relx itself has had some
-            additional changes: the `start` command has
-            been replaced by `daemon`, and configuration
-            defaults have changed so that you may need
-            to add the following to your relx.config file:
-
-            ``` erlang
-            {dev_mode, false}.
-            {include_erts, true}.
-            ```
-
-2022/05/31: Xref support has been rewritten. Erlang.mk no
-            longer uses the xref_runner, instead implementing
-            its own interface. This new interface is more
-            flexible and more powerful: it supports both
-            checks and informational analyses as well as
-            the Xref query functions that use the powerful
-            Xref language to perform custom queries. Erlang.mk
-            can also run analyses and queries against all
-            dependencies as well as Erlang/OTP applications.
-
 2023/05/12: Rebar3 is now used for autopatch instead of
             Rebar2. `make distclean` or `rm -rf .erlang.mk`
             might be required after updating Erlang.mk.
@@ -53,3 +23,23 @@
 2024/10/01: Initial beam-cache implementation. This is used
             to cache beam files when switching from/to test
             builds.
+
+2024/11/14: Most packages in the Erlang.mk package index
+            have been removed. To ensure that existing
+            projects continue working, please add the
+            relevant dep_* lines to your projects. If
+            you were using dep_*_commit lines make sure
+            to update them as well. Note that projects
+            that have corresponding Erlang.mk functionality,
+            as well as Cowboy, Ranch, Gun and Cowlib remain
+            in the index.
+
+2024/11/19: The deprecated defines `dep_fetch`, `dep_name`,
+            `dep_repo` and `dep_commit` have been removed
+            in favor of their `query_*` equivalents.
++
+            The deprecated legacy fetch method has also
+            been removed (`dep_cowboy = https://... ref`
+            without an explicit fetch method). Adding "git"
+            at the beginning of the dep line is the modern
+            equivalent.
diff --git a/README.asciidoc b/README.asciidoc
index 78a95a34b..c3189a5a2 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -17,3 +17,5 @@ http://erlang.mk/guide/getting_started.html[Get started]
 Tested and supported on
 http://erlang.mk/guide/installation.html#_on_unix[Linux, FreeBSD, OSX]
 and http://erlang.mk/guide/installation.html#_on_windows[Windows].
+
+Get help! https://discord.gg/x468ZsxG[Discord server].
diff --git a/core/compat.mk b/core/compat.mk
index afba4f145..f9dcfe778 100644
--- a/core/compat.mk
+++ b/core/compat.mk
@@ -23,9 +23,9 @@ endef
 define compat_rebar_config
 {deps, [
 $(call comma_list,$(foreach d,$(DEPS),\
-	$(if $(filter hex,$(call dep_fetch,$d)),\
-		{$(call dep_name,$d)$(comma)"$(call dep_repo,$d)"},\
-		{$(call dep_name,$d)$(comma)".*"$(comma){git,"$(call dep_repo,$d)"$(comma)$(call compat_ref,$(call dep_name,$d),$(call dep_commit,$d))}})))
+	$(if $(filter hex,$(call query_fetch_method,$d)),\
+		{$(call query_name,$d)$(comma)"$(call query_version_hex,$d)"},\
+		{$(call query_name,$d)$(comma)".*"$(comma){git,"$(call query_repo,$d)"$(comma)$(call compat_ref,$(call query_name,$d),$(call query_version,$d))}})))
 ]}.
 {erl_opts, $(call compat_erlc_opts_to_list,$(ERLC_OPTS))}.
 endef
diff --git a/core/core.mk b/core/core.mk
index dde4f8659..22ea935ee 100644
--- a/core/core.mk
+++ b/core/core.mk
@@ -47,7 +47,7 @@ verbose_0 = @
 verbose_2 = set -x;
 verbose = $(verbose_$(V))
 
-ifeq ($(V),3)
+ifeq ($V,3)
 SHELL := $(SHELL) -x
 endif
 
@@ -162,7 +162,7 @@ define newline
 endef
 
 define comma_list
-$(subst $(space),$(comma),$(strip $(1)))
+$(subst $(space),$(comma),$(strip $1))
 endef
 
 define escape_dquotes
@@ -180,23 +180,23 @@ else
 core_native_path = $1
 endif
 
-core_http_get = curl -Lf$(if $(filter-out 0,$(V)),,s)o $(call core_native_path,$1) $2
+core_http_get = curl -Lf$(if $(filter-out 0,$V),,s)o $(call core_native_path,$1) $2
 
-core_eq = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
+core_eq = $(and $(findstring $1,$2),$(findstring $2,$1))
 
 # We skip files that contain spaces because they end up causing issues.
 # Files that begin with a dot are already ignored by the wildcard function.
 core_find = $(foreach f,$(wildcard $(1:%/=%)/*),$(if $(wildcard $f/.),$(call core_find,$f,$2),$(if $(filter $(subst *,%,$2),$f),$(if $(wildcard $f),$f))))
 
-core_lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$(1)))))))))))))))))))))))))))
+core_lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))
 
-core_ls = $(filter-out $(1),$(shell echo $(1)))
+core_ls = $(filter-out $1,$(shell echo $1))
 
 # @todo Use a solution that does not require using perl.
 core_relpath = $(shell perl -e 'use File::Spec; print File::Spec->abs2rel(@ARGV) . "\n"' $1 $2)
 
 define core_render
-	printf -- '$(subst $(newline),\n,$(subst %,%%,$(subst ','\'',$(subst $(tab),$(WS),$(call $(1))))))\n' > $(2)
+	printf -- '$(subst $(newline),\n,$(subst %,%%,$(subst ','\'',$(subst $(tab),$(WS),$(call $1)))))\n' > $2
 endef
 
 # Automated update.
diff --git a/core/deps-tools.mk b/core/deps-tools.mk
index 262d045d5..47f3b8e84 100644
--- a/core/deps-tools.mk
+++ b/core/deps-tools.mk
@@ -107,14 +107,14 @@ list-deps list-doc-deps list-rel-deps list-test-deps list-shell-deps:
 QUERY ?= name fetch_method repo version
 
 define query_target
-$(1): $(2) clean-tmp-query.log
+$1: $2 clean-tmp-query.log
 ifeq ($(IS_APP)$(IS_DEP),)
-	$(verbose) rm -f $(4)
+	$(verbose) rm -f $4
 endif
-	$(verbose) $(foreach dep,$(3),\
-		echo $(PROJECT): $(foreach q,$(QUERY),$(call query_$(q),$(dep))) >> $(4) ;)
-	$(if $(filter-out query-deps,$(1)),,\
-		$(verbose) set -e; for dep in $(3) ; do \
+	$(verbose) $(foreach dep,$3,\
+		echo $(PROJECT): $(foreach q,$(QUERY),$(call query_$(q),$(dep))) >> $4 ;)
+	$(if $(filter-out query-deps,$1),,\
+		$(verbose) set -e; for dep in $3 ; do \
 			if grep -qs ^$$$$dep$$$$ $(ERLANG_MK_TMP)/query.log; then \
 				:; \
 			else \
@@ -123,8 +123,8 @@ endif
 			fi \
 		done)
 ifeq ($(IS_APP)$(IS_DEP),)
-	$(verbose) touch $(4)
-	$(verbose) cat $(4)
+	$(verbose) touch $4
+	$(verbose) cat $4
 endif
 endef
 
diff --git a/core/deps.mk b/core/deps.mk
index c78146ef9..310db802e 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -31,16 +31,25 @@ CACHE_DEPS ?= 0
 CACHE_DIR ?= $(if $(XDG_CACHE_HOME),$(XDG_CACHE_HOME),$(HOME)/.cache)/erlang.mk
 export CACHE_DIR
 
+HEX_CONFIG ?=
+
+define hex_config.erl
+	begin
+		Config0 = hex_core:default_config(),
+		Config0$(HEX_CONFIG)
+	end
+endef
+
 # External "early" plugins (see core/plugins.mk for regular plugins).
 # They both use the core_dep_plugin macro.
 
 define core_dep_plugin
-ifeq ($(2),$(PROJECT))
--include $$(patsubst $(PROJECT)/%,%,$(1))
+ifeq ($2,$(PROJECT))
+-include $$(patsubst $(PROJECT)/%,%,$1)
 else
--include $(DEPS_DIR)/$(1)
+-include $(DEPS_DIR)/$1
 
-$(DEPS_DIR)/$(1): $(DEPS_DIR)/$(2) ;
+$(DEPS_DIR)/$1: $(DEPS_DIR)/$2 ;
 endif
 endef
 
@@ -53,44 +62,42 @@ $(foreach p,$(DEP_EARLY_PLUGINS),\
 
 # Query functions.
 
-query_fetch_method = $(if $(dep_$(1)),$(call _qfm_dep,$(word 1,$(dep_$(1)))),$(call _qfm_pkg,$(1)))
-_qfm_dep = $(if $(dep_fetch_$(1)),$(1),$(if $(IS_DEP),legacy,fail))
+query_fetch_method = $(if $(dep_$(1)),$(call _qfm_dep,$(word 1,$(dep_$(1)))),$(call _qfm_pkg,$1))
+_qfm_dep = $(if $(dep_fetch_$(1)),$1,fail)
 _qfm_pkg = $(if $(pkg_$(1)_fetch),$(pkg_$(1)_fetch),fail)
 
-query_name = $(if $(dep_$(1)),$(1),$(if $(pkg_$(1)_name),$(pkg_$(1)_name),$(1)))
+query_name = $(if $(dep_$(1)),$1,$(if $(pkg_$(1)_name),$(pkg_$(1)_name),$1))
 
-query_repo = $(call _qr,$(1),$(call query_fetch_method,$(1)))
-_qr = $(if $(query_repo_$(2)),$(call query_repo_$(2),$(1)),$(call dep_repo,$(1)))
+query_repo = $(call _qr,$1,$(call query_fetch_method,$1))
+_qr = $(if $(query_repo_$(2)),$(call query_repo_$(2),$1),$(call query_repo_git,$1))
 
 query_repo_default = $(if $(dep_$(1)),$(word 2,$(dep_$(1))),$(pkg_$(1)_repo))
-query_repo_git = $(patsubst git://github.com/%,https://github.com/%,$(call query_repo_default,$(1)))
-query_repo_git-subfolder = $(call query_repo_git,$(1))
+query_repo_git = $(patsubst git://github.com/%,https://github.com/%,$(call query_repo_default,$1))
+query_repo_git-subfolder = $(call query_repo_git,$1)
 query_repo_git-submodule = -
-query_repo_hg = $(call query_repo_default,$(1))
-query_repo_svn = $(call query_repo_default,$(1))
-query_repo_cp = $(call query_repo_default,$(1))
-query_repo_ln = $(call query_repo_default,$(1))
-query_repo_hex = https://hex.pm/packages/$(if $(word 3,$(dep_$(1))),$(word 3,$(dep_$(1))),$(1))
+query_repo_hg = $(call query_repo_default,$1)
+query_repo_svn = $(call query_repo_default,$1)
+query_repo_cp = $(call query_repo_default,$1)
+query_repo_ln = $(call query_repo_default,$1)
+query_repo_hex = https://hex.pm/packages/$(if $(word 3,$(dep_$(1))),$(word 3,$(dep_$(1))),$1)
 query_repo_fail = -
-query_repo_legacy = -
 
-query_version = $(call _qv,$(1),$(call query_fetch_method,$(1)))
-_qv = $(if $(query_version_$(2)),$(call query_version_$(2),$(1)),$(call dep_commit,$(1)))
+query_version = $(call _qv,$1,$(call query_fetch_method,$1))
+_qv = $(if $(query_version_$(2)),$(call query_version_$(2),$1),$(call query_version_default,$1))
 
 query_version_default = $(if $(dep_$(1)_commit),$(dep_$(1)_commit),$(if $(dep_$(1)),$(word 3,$(dep_$(1))),$(pkg_$(1)_commit)))
-query_version_git = $(call query_version_default,$(1))
-query_version_git-subfolder = $(call query_version_git,$(1))
+query_version_git = $(call query_version_default,$1)
+query_version_git-subfolder = $(call query_version_default,$1)
 query_version_git-submodule = -
-query_version_hg = $(call query_version_default,$(1))
+query_version_hg = $(call query_version_default,$1)
 query_version_svn = -
 query_version_cp = -
 query_version_ln = -
 query_version_hex = $(if $(dep_$(1)_commit),$(dep_$(1)_commit),$(if $(dep_$(1)),$(word 2,$(dep_$(1))),$(pkg_$(1)_commit)))
 query_version_fail = -
-query_version_legacy = -
 
-query_extra = $(call _qe,$(1),$(call query_fetch_method,$(1)))
-_qe = $(if $(query_extra_$(2)),$(call query_extra_$(2),$(1)),-)
+query_extra = $(call _qe,$1,$(call query_fetch_method,$1))
+_qe = $(if $(query_extra_$(2)),$(call query_extra_$(2),$1),-)
 
 query_extra_git = -
 query_extra_git-subfolder = $(if $(dep_$(1)),subfolder=$(word 4,$(dep_$(1))),-)
@@ -101,18 +108,13 @@ query_extra_cp = -
 query_extra_ln = -
 query_extra_hex = $(if $(dep_$(1)),package-name=$(word 3,$(dep_$(1))),-)
 query_extra_fail = -
-query_extra_legacy = -
 
-query_absolute_path = $(addprefix $(DEPS_DIR)/,$(call query_name,$(1)))
+query_absolute_path = $(addprefix $(DEPS_DIR)/,$(call query_name,$1))
 
-# Deprecated legacy query functions.
-dep_fetch = $(call query_fetch_method,$(1))
-dep_name = $(call query_name,$(1))
-dep_repo = $(call query_repo_git,$(1))
-dep_commit = $(if $(dep_$(1)_commit),$(dep_$(1)_commit),$(if $(dep_$(1)),$(if $(filter hex,$(word 1,$(dep_$(1)))),$(word 2,$(dep_$(1))),$(word 3,$(dep_$(1)))),$(pkg_$(1)_commit)))
+# Application directories.
 
-LOCAL_DEPS_DIRS = $(foreach a,$(LOCAL_DEPS),$(if $(wildcard $(APPS_DIR)/$(a)),$(APPS_DIR)/$(a)))
-ALL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(foreach dep,$(filter-out $(IGNORE_DEPS),$(BUILD_DEPS) $(DEPS)),$(call dep_name,$(dep))))
+LOCAL_DEPS_DIRS = $(foreach a,$(LOCAL_DEPS),$(if $(wildcard $(APPS_DIR)/$a),$(APPS_DIR)/$a))
+ALL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(foreach dep,$(filter-out $(IGNORE_DEPS),$(BUILD_DEPS) $(DEPS)),$(call query_name,$(dep))))
 
 # When we are calling an app directly we don't want to include it here
 # otherwise it'll be treated both as an apps and a top-level project.
@@ -136,7 +138,7 @@ export NO_AUTOPATCH
 
 # Verbosity.
 
-dep_verbose_0 = @echo " DEP    $1 ($(call dep_commit,$1))";
+dep_verbose_0 = @echo " DEP    $1 ($(call query_version,$1))";
 dep_verbose_2 = set -x;
 dep_verbose = $(dep_verbose_$(V))
 
@@ -234,25 +236,25 @@ endif
 # While Makefile file could be GNUmakefile or makefile,
 # in practice only Makefile is needed so far.
 define dep_autopatch
-	if [ -f $(DEPS_DIR)/$(1)/erlang.mk ]; then \
+	if [ -f $(DEPS_DIR)/$1/erlang.mk ]; then \
 		rm -rf $(DEPS_DIR)/$1/ebin/; \
-		$(call erlang,$(call dep_autopatch_appsrc.erl,$(1))); \
-		$(call dep_autopatch_erlang_mk,$(1)); \
-	elif [ -f $(DEPS_DIR)/$(1)/Makefile ]; then \
+		$(call erlang,$(call dep_autopatch_appsrc.erl,$1)); \
+		$(call dep_autopatch_erlang_mk,$1); \
+	elif [ -f $(DEPS_DIR)/$1/Makefile ]; then \
 		if [ -f $(DEPS_DIR)/$1/rebar.lock ]; then \
 			$(call dep_autopatch2,$1); \
-		elif [ 0 != `grep -c "include ../\w*\.mk" $(DEPS_DIR)/$(1)/Makefile` ]; then \
-			$(call dep_autopatch2,$(1)); \
-		elif [ 0 != `grep -ci "^[^#].*rebar" $(DEPS_DIR)/$(1)/Makefile` ]; then \
-			$(call dep_autopatch2,$(1)); \
-		elif [ -n "`find $(DEPS_DIR)/$(1)/ -type f -name \*.mk -not -name erlang.mk -exec grep -i "^[^#].*rebar" '{}' \;`" ]; then \
-			$(call dep_autopatch2,$(1)); \
+		elif [ 0 != `grep -c "include ../\w*\.mk" $(DEPS_DIR)/$1/Makefile` ]; then \
+			$(call dep_autopatch2,$1); \
+		elif [ 0 != `grep -ci "^[^#].*rebar" $(DEPS_DIR)/$1/Makefile` ]; then \
+			$(call dep_autopatch2,$1); \
+		elif [ -n "`find $(DEPS_DIR)/$1/ -type f -name \*.mk -not -name erlang.mk -exec grep -i "^[^#].*rebar" '{}' \;`" ]; then \
+			$(call dep_autopatch2,$1); \
 		fi \
 	else \
-		if [ ! -d $(DEPS_DIR)/$(1)/src/ ]; then \
-			$(call dep_autopatch_noop,$(1)); \
+		if [ ! -d $(DEPS_DIR)/$1/src/ ]; then \
+			$(call dep_autopatch_noop,$1); \
 		else \
-			$(call dep_autopatch2,$(1)); \
+			$(call dep_autopatch2,$1); \
 		fi \
 	fi
 endef
@@ -262,19 +264,19 @@ define dep_autopatch2
 	mv -n $(DEPS_DIR)/$1/ebin/$1.app $(DEPS_DIR)/$1/src/$1.app.src; \
 	rm -f $(DEPS_DIR)/$1/ebin/$1.app; \
 	if [ -f $(DEPS_DIR)/$1/src/$1.app.src.script ]; then \
-		$(call erlang,$(call dep_autopatch_appsrc_script.erl,$(1))); \
+		$(call erlang,$(call dep_autopatch_appsrc_script.erl,$1)); \
 	fi; \
-	$(call erlang,$(call dep_autopatch_appsrc.erl,$(1))); \
-	if [ -f $(DEPS_DIR)/$(1)/rebar -o -f $(DEPS_DIR)/$(1)/rebar.config -o -f $(DEPS_DIR)/$(1)/rebar.config.script -o -f $(DEPS_DIR)/$1/rebar.lock ]; then \
+	$(call erlang,$(call dep_autopatch_appsrc.erl,$1)); \
+	if [ -f $(DEPS_DIR)/$1/rebar -o -f $(DEPS_DIR)/$1/rebar.config -o -f $(DEPS_DIR)/$1/rebar.config.script -o -f $(DEPS_DIR)/$1/rebar.lock ]; then \
 		$(call dep_autopatch_fetch_rebar); \
-		$(call dep_autopatch_rebar,$(1)); \
+		$(call dep_autopatch_rebar,$1); \
 	else \
-		$(call dep_autopatch_gen,$(1)); \
+		$(call dep_autopatch_gen,$1); \
 	fi
 endef
 
 define dep_autopatch_noop
-	printf "noop:\n" > $(DEPS_DIR)/$(1)/Makefile
+	printf "noop:\n" > $(DEPS_DIR)/$1/Makefile
 endef
 
 # Replace "include erlang.mk" with a line that will load the parent Erlang.mk
@@ -296,7 +298,7 @@ endif
 define dep_autopatch_gen
 	printf "%s\n" \
 		"ERLC_OPTS = +debug_info" \
-		"include ../../erlang.mk" > $(DEPS_DIR)/$(1)/Makefile
+		"include ../../erlang.mk" > $(DEPS_DIR)/$1/Makefile
 endef
 
 # We use flock/lockf when available to avoid concurrency issues.
@@ -321,11 +323,11 @@ define dep_autopatch_fetch_rebar2
 endef
 
 define dep_autopatch_rebar
-	if [ -f $(DEPS_DIR)/$(1)/Makefile ]; then \
-		mv $(DEPS_DIR)/$(1)/Makefile $(DEPS_DIR)/$(1)/Makefile.orig.mk; \
+	if [ -f $(DEPS_DIR)/$1/Makefile ]; then \
+		mv $(DEPS_DIR)/$1/Makefile $(DEPS_DIR)/$1/Makefile.orig.mk; \
 	fi; \
-	$(call erlang,$(call dep_autopatch_rebar.erl,$(1))); \
-	rm -f $(DEPS_DIR)/$(1)/ebin/$(1).app
+	$(call erlang,$(call dep_autopatch_rebar.erl,$1)); \
+	rm -f $(DEPS_DIR)/$1/ebin/$1.app
 endef
 
 define dep_autopatch_rebar.erl
@@ -698,7 +700,7 @@ define dep_autopatch_appsrc.erl
 	case filelib:is_regular(AppSrcIn) of
 		false -> ok;
 		true ->
-			{ok, [{application, $(1), L0}]} = file:consult(AppSrcIn),
+			{ok, [{application, $1, L0}]} = file:consult(AppSrcIn),
 			L1 = lists:keystore(modules, 1, L0, {modules, []}),
 			L2 = case lists:keyfind(vsn, 1, L1) of
 				{_, git} -> lists:keyreplace(vsn, 1, L1, {vsn, lists:droplast(os:cmd("git -C $(DEPS_DIR)/$1 describe --dirty --tags --always"))});
@@ -706,7 +708,7 @@ define dep_autopatch_appsrc.erl
 				_ -> L1
 			end,
 			L3 = case lists:keyfind(registered, 1, L2) of false -> [{registered, []}|L2]; _ -> L2 end,
-			ok = file:write_file(AppSrcOut, io_lib:format("~p.~n", [{application, $(1), L3}])),
+			ok = file:write_file(AppSrcOut, io_lib:format("~p.~n", [{application, $1, L3}])),
 			case AppSrcOut of AppSrcIn -> ok; _ -> ok = file:delete(AppSrcIn) end
 	end,
 	halt()
@@ -716,45 +718,46 @@ ifeq ($(CACHE_DEPS),1)
 
 define dep_cache_fetch_git
 	mkdir -p $(CACHE_DIR)/git; \
-	if test -d "$(join $(CACHE_DIR)/git/,$(call dep_name,$1))"; then \
-		cd $(join $(CACHE_DIR)/git/,$(call dep_name,$1)); \
-		if ! git checkout -q $(call dep_commit,$1); then \
-			git remote set-url origin $(call dep_repo,$1) && \
+	if test -d "$(join $(CACHE_DIR)/git/,$(call query_name,$1))"; then \
+		cd $(join $(CACHE_DIR)/git/,$(call query_name,$1)); \
+		if ! git checkout -q $(call query_version,$1); then \
+			git remote set-url origin $(call query_repo_git,$1) && \
 			git pull --all && \
-			git cat-file -e $(call dep_commit,$1) 2>/dev/null; \
+			git cat-file -e $(call query_version_git,$1) 2>/dev/null; \
 		fi; \
 	else \
-		git clone -q -n -- $(call dep_repo,$1) $(join $(CACHE_DIR)/git/,$(call dep_name,$1)); \
+		git clone -q -n -- $(call query_repo_git,$1) $(join $(CACHE_DIR)/git/,$(call query_name,$1)); \
 	fi; \
-	git clone -q --branch $(call dep_commit,$1) --single-branch -- $(join $(CACHE_DIR)/git/,$(call dep_name,$1)) $2
+	git clone -q --single-branch -- $(join $(CACHE_DIR)/git/,$(call query_name,$1)) $2; \
+	cd $2 && git checkout -q $(call query_version_git,$1)
 endef
 
 define dep_fetch_git
-	$(call dep_cache_fetch_git,$1,$(DEPS_DIR)/$(call dep_name,$1));
+	$(call dep_cache_fetch_git,$1,$(DEPS_DIR)/$(call query_name,$1));
 endef
 
 define dep_fetch_git-subfolder
 	mkdir -p $(ERLANG_MK_TMP)/git-subfolder; \
-	$(call dep_cache_fetch_git,$1,$(ERLANG_MK_TMP)/git-subfolder/$(call dep_name,$1)); \
-	ln -s $(ERLANG_MK_TMP)/git-subfolder/$(call dep_name,$1)/$(word 4,$(dep_$1)) \
-		$(DEPS_DIR)/$(call dep_name,$1);
+	$(call dep_cache_fetch_git,$1,$(ERLANG_MK_TMP)/git-subfolder/$(call query_name,$1)); \
+	ln -s $(ERLANG_MK_TMP)/git-subfolder/$(call query_name,$1)/$(word 4,$(dep_$1)) \
+		$(DEPS_DIR)/$(call query_name,$1);
 endef
 
 else
 
 define dep_fetch_git
-	git clone -q -n -- $(call dep_repo,$1) $(DEPS_DIR)/$(call dep_name,$1); \
-	cd $(DEPS_DIR)/$(call dep_name,$1) && git checkout -q $(call dep_commit,$1);
+	git clone -q -n -- $(call query_repo_git,$1) $(DEPS_DIR)/$(call query_name,$1); \
+	cd $(DEPS_DIR)/$(call query_name,$1) && git checkout -q $(call query_version_git,$1);
 endef
 
 define dep_fetch_git-subfolder
 	mkdir -p $(ERLANG_MK_TMP)/git-subfolder; \
-	git clone -q -n -- $(call dep_repo,$1) \
-		$(ERLANG_MK_TMP)/git-subfolder/$(call dep_name,$1); \
-	cd $(ERLANG_MK_TMP)/git-subfolder/$(call dep_name,$1) \
-		&& git checkout -q $(call dep_commit,$1); \
-	ln -s $(ERLANG_MK_TMP)/git-subfolder/$(call dep_name,$1)/$(word 4,$(dep_$1)) \
-		$(DEPS_DIR)/$(call dep_name,$1);
+	git clone -q -n -- $(call query_repo_git-subfolder,$1) \
+		$(ERLANG_MK_TMP)/git-subfolder/$(call query_name,$1); \
+	cd $(ERLANG_MK_TMP)/git-subfolder/$(call query_name,$1) \
+		&& git checkout -q $(call query_version_git-subfolder,$1); \
+	ln -s $(ERLANG_MK_TMP)/git-subfolder/$(call query_name,$1)/$(word 4,$(dep_$1)) \
+		$(DEPS_DIR)/$(call query_name,$1);
 endef
 
 endif
@@ -764,20 +767,34 @@ define dep_fetch_git-submodule
 endef
 
 define dep_fetch_hg
-	hg clone -q -U $(call dep_repo,$(1)) $(DEPS_DIR)/$(call dep_name,$(1)); \
-	cd $(DEPS_DIR)/$(call dep_name,$(1)) && hg update -q $(call dep_commit,$(1));
+	hg clone -q -U $(call query_repo_hg,$1) $(DEPS_DIR)/$(call query_name,$1); \
+	cd $(DEPS_DIR)/$(call query_name,$1) && hg update -q $(call query_version_hg,$1);
 endef
 
 define dep_fetch_svn
-	svn checkout -q $(call dep_repo,$(1)) $(DEPS_DIR)/$(call dep_name,$(1));
+	svn checkout -q $(call query_repo_svn,$1) $(DEPS_DIR)/$(call query_name,$1);
 endef
 
 define dep_fetch_cp
-	cp -R $(call dep_repo,$(1)) $(DEPS_DIR)/$(call dep_name,$(1));
+	cp -R $(call query_repo_cp,$1) $(DEPS_DIR)/$(call query_name,$1);
 endef
 
 define dep_fetch_ln
-	ln -s $(call dep_repo,$(1)) $(DEPS_DIR)/$(call dep_name,$(1));
+	ln -s $(call query_repo_ln,$1) $(DEPS_DIR)/$(call query_name,$1);
+endef
+
+define hex_get_tarball.erl
+	{ok, _} = application:ensure_all_started(ssl),
+	{ok, _} = application:ensure_all_started(inets),
+	Config = $(hex_config.erl),
+	case hex_repo:get_tarball(Config, <<"$1">>, <<"$(strip $2)">>) of
+		{ok, {200, _, Tarball}} ->
+			ok = file:write_file("$3", Tarball),
+			halt(0);
+		{ok, {Status, _, Errors}} ->
+			io:format("Error ~b: ~0p~n", [Status, Errors]),
+			halt(79)
+	end
 endef
 
 ifeq ($(CACHE_DEPS),1)
@@ -785,9 +802,10 @@ ifeq ($(CACHE_DEPS),1)
 # Hex only has a package version. No need to look in the Erlang.mk packages.
 define dep_fetch_hex
 	mkdir -p $(CACHE_DIR)/hex $(DEPS_DIR)/$1; \
-	$(eval hex_tar_name=$(if $(word 3,$(dep_$1)),$(word 3,$(dep_$1)),$1)-$(strip $(word 2,$(dep_$1))).tar) \
-	$(if $(wildcard $(CACHE_DIR)/hex/$(hex_tar_name)),,$(call core_http_get,$(CACHE_DIR)/hex/$(hex_tar_name),\
-		https://repo.hex.pm/tarballs/$(hex_tar_name);)) \
+	$(eval hex_pkg_name := $(if $(word 3,$(dep_$1)),$(word 3,$(dep_$1)),$1)) \
+	$(eval hex_tar_name := $(hex_pkg_name)-$(strip $(word 2,$(dep_$1))).tar) \
+	$(if $(wildcard $(CACHE_DIR)/hex/$(hex_tar_name)),,\
+		$(call erlang,$(call hex_get_tarball.erl,$(hex_pkg_name),$(word 2,$(dep_$1)),$(CACHE_DIR)/hex/$(hex_tar_name)));) \
 	tar -xOf $(CACHE_DIR)/hex/$(hex_tar_name) contents.tar.gz | tar -C $(DEPS_DIR)/$1 -xzf -;
 endef
 
@@ -796,58 +814,60 @@ else
 # Hex only has a package version. No need to look in the Erlang.mk packages.
 define dep_fetch_hex
 	mkdir -p $(ERLANG_MK_TMP)/hex $(DEPS_DIR)/$1; \
-	$(call core_http_get,$(ERLANG_MK_TMP)/hex/$1.tar,\
-		https://repo.hex.pm/tarballs/$(if $(word 3,$(dep_$1)),$(word 3,$(dep_$1)),$1)-$(strip $(word 2,$(dep_$1))).tar); \
+	$(call erlang,$(call hex_get_tarball.erl,$(if $(word 3,$(dep_$1)),$(word 3,$(dep_$1)),$1),$(word 2,$(dep_$1)),$(ERLANG_MK_TMP)/hex/$1.tar)); \
 	tar -xOf $(ERLANG_MK_TMP)/hex/$1.tar contents.tar.gz | tar -C $(DEPS_DIR)/$1 -xzf -;
 endef
 
 endif
 
 define dep_fetch_fail
-	echo "Error: Unknown or invalid dependency: $(1)." >&2; \
+	echo "Error: Unknown or invalid dependency: $1." >&2; \
 	exit 78;
 endef
 
-# Kept for compatibility purposes with older Erlang.mk configuration.
-define dep_fetch_legacy
-	$(warning WARNING: '$(1)' dependency configuration uses deprecated format.) \
-	git clone -q -n -- $(word 1,$(dep_$(1))) $(DEPS_DIR)/$(1); \
-	cd $(DEPS_DIR)/$(1) && git checkout -q $(if $(word 2,$(dep_$(1))),$(word 2,$(dep_$(1))),master);
-endef
-
 define dep_target
-$(DEPS_DIR)/$(call dep_name,$1): | $(ERLANG_MK_TMP)
-	$(eval DEP_NAME := $(call dep_name,$1))
+$(DEPS_DIR)/$(call query_name,$1): $(if $(filter hex,$(call query_fetch_method,$1)),hex-core) | $(ERLANG_MK_TMP)
+	$(eval DEP_NAME := $(call query_name,$1))
 	$(eval DEP_STR := $(if $(filter $1,$(DEP_NAME)),$1,"$1 ($(DEP_NAME))"))
 	$(verbose) if test -d $(APPS_DIR)/$(DEP_NAME); then \
 		echo "Error: Dependency" $(DEP_STR) "conflicts with application found in $(APPS_DIR)/$(DEP_NAME)." >&2; \
 		exit 17; \
 	fi
 	$(verbose) mkdir -p $(DEPS_DIR)
-	$(dep_verbose) $(call dep_fetch_$(strip $(call dep_fetch,$(1))),$(1))
-	$(verbose) if [ -f $(DEPS_DIR)/$(1)/configure.ac -o -f $(DEPS_DIR)/$(1)/configure.in ] \
-			&& [ ! -f $(DEPS_DIR)/$(1)/configure ]; then \
+	$(dep_verbose) $(call dep_fetch_$(strip $(call query_fetch_method,$1)),$1)
+	$(verbose) if [ -f $(DEPS_DIR)/$1/configure.ac -o -f $(DEPS_DIR)/$1/configure.in ] \
+			&& [ ! -f $(DEPS_DIR)/$1/configure ]; then \
 		echo " AUTO  " $(DEP_STR); \
-		cd $(DEPS_DIR)/$(1) && autoreconf -Wall -vif -I m4; \
+		cd $(DEPS_DIR)/$1 && autoreconf -Wall -vif -I m4; \
 	fi
 	- $(verbose) if [ -f $(DEPS_DIR)/$(DEP_NAME)/configure ]; then \
 		echo " CONF  " $(DEP_STR); \
 		cd $(DEPS_DIR)/$(DEP_NAME) && ./configure; \
 	fi
-ifeq ($(filter $(1),$(NO_AUTOPATCH)),)
+ifeq ($(filter $1,$(NO_AUTOPATCH)),)
 	$(verbose) $$(MAKE) --no-print-directory autopatch-$(DEP_NAME)
 endif
 
-.PHONY: autopatch-$(call dep_name,$1)
+.PHONY: autopatch-$(call query_name,$1)
 
-autopatch-$(call dep_name,$1)::
+autopatch-$(call query_name,$1)::
 	$(verbose) if [ "$1" = "elixir" -a "$(ELIXIR_PATCH)" ]; then \
 		ln -s lib/elixir/ebin $(DEPS_DIR)/elixir/; \
 	else \
-		$$(call dep_autopatch,$(call dep_name,$1)) \
+		$$(call dep_autopatch,$(call query_name,$1)) \
 	fi
 endef
 
+# We automatically depend on hex_core when the project isn't already.
+$(if $(filter hex_core,$(DEPS) $(BUILD_DEPS) $(DOC_DEPS) $(REL_DEPS) $(TEST_DEPS)),,\
+	$(eval $(call dep_target,hex_core)))
+
+hex-core: $(DEPS_DIR)/hex_core
+	$(verbose) if [ ! -e $(DEPS_DIR)/hex_core/ebin/dep_built ]; then \
+		$(MAKE) -C $(DEPS_DIR)/hex_core IS_DEP=1; \
+		touch $(DEPS_DIR)/hex_core/ebin/dep_built; \
+	fi
+
 $(foreach dep,$(BUILD_DEPS) $(DEPS),$(eval $(call dep_target,$(dep))))
 
 ifndef IS_APP
diff --git a/core/erlc.mk b/core/erlc.mk
index 8f9abc2da..f3b499a63 100644
--- a/core/erlc.mk
+++ b/core/erlc.mk
@@ -62,10 +62,10 @@ define app_file
 {application, '$(PROJECT)', [
 	{description, "$(PROJECT_DESCRIPTION)"},
 	{vsn, "$(PROJECT_VERSION)"},$(if $(IS_DEP),
-	{id$(comma)$(space)"$(1)"}$(comma))
-	{modules, [$(call comma_list,$(2))]},
+	{id$(comma)$(space)"$1"}$(comma))
+	{modules, [$(call comma_list,$2)]},
 	{registered, []},
-	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(LOCAL_DEPS) $(OPTIONAL_DEPS) $(foreach dep,$(DEPS),$(call dep_name,$(dep))))]},
+	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(LOCAL_DEPS) $(OPTIONAL_DEPS) $(foreach dep,$(DEPS),$(call query_name,$(dep))))]},
 	{optional_applications, [$(call comma_list,$(OPTIONAL_DEPS))]},
 	{env, $(subst \,\\,$(PROJECT_ENV))}$(if $(findstring {,$(PROJECT_APP_EXTRA_KEYS)),$(comma)$(newline)$(tab)$(subst \,\\,$(PROJECT_APP_EXTRA_KEYS)),)
 ]}.
@@ -75,10 +75,10 @@ define app_file
 {application, '$(PROJECT)', [
 	{description, "$(PROJECT_DESCRIPTION)"},
 	{vsn, "$(PROJECT_VERSION)"},$(if $(IS_DEP),
-	{id$(comma)$(space)"$(1)"}$(comma))
-	{modules, [$(call comma_list,$(2))]},
+	{id$(comma)$(space)"$1"}$(comma))
+	{modules, [$(call comma_list,$2)]},
 	{registered, [$(call comma_list,$(PROJECT)_sup $(PROJECT_REGISTERED))]},
-	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(LOCAL_DEPS) $(OPTIONAL_DEPS) $(foreach dep,$(DEPS),$(call dep_name,$(dep))))]},
+	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(LOCAL_DEPS) $(OPTIONAL_DEPS) $(foreach dep,$(DEPS),$(call query_name,$(dep))))]},
 	{optional_applications, [$(call comma_list,$(OPTIONAL_DEPS))]},
 	{mod, {$(PROJECT_MOD), []}},
 	{env, $(subst \,\\,$(PROJECT_ENV))}$(if $(findstring {,$(PROJECT_APP_EXTRA_KEYS)),$(comma)$(newline)$(tab)$(subst \,\\,$(PROJECT_APP_EXTRA_KEYS)),)
@@ -104,7 +104,7 @@ ERL_FILES += $(addprefix src/,$(patsubst %.asn1,%.erl,$(notdir $(ASN1_FILES))))
 
 define compile_asn1
 	$(verbose) mkdir -p include/
-	$(asn1_verbose) erlc -v -I include/ -o asn1/ +noobj $(ERLC_ASN1_OPTS) $(1)
+	$(asn1_verbose) erlc -v -I include/ -o asn1/ +noobj $(ERLC_ASN1_OPTS) $1
 	$(verbose) mv asn1/*.erl src/
 	-$(verbose) mv asn1/*.hrl include/
 	$(verbose) mv asn1/*.asn1db include/
@@ -266,7 +266,7 @@ define makedep.erl
 		[233] -> unicode:characters_to_binary(Output0);
 		_ -> Output0
 	end,
-	ok = file:write_file("$(1)", Output),
+	ok = file:write_file("$1", Output),
 	halt()
 endef
 
@@ -302,7 +302,7 @@ ebin/:
 
 define compile_erl
 	$(erlc_verbose) erlc -v $(if $(IS_DEP),$(filter-out -Werror,$(ERLC_OPTS)),$(ERLC_OPTS)) -o ebin/ \
-		-pa ebin/ -I include/ $(filter-out $(ERLC_EXCLUDE_PATHS),$(COMPILE_FIRST_PATHS) $(1))
+		-pa ebin/ -I include/ $(filter-out $(ERLC_EXCLUDE_PATHS),$(COMPILE_FIRST_PATHS) $1)
 endef
 
 define validate_app_file
diff --git a/core/index.mk b/core/index.mk
index 0b75209bb..25c5e5158 100644
--- a/core/index.mk
+++ b/core/index.mk
@@ -5,7 +5,7 @@
 
 define pkg_print
 	$(verbose) printf "%s\n" \
-		$(if $(call core_eq,$(1),$(pkg_$(1)_name)),,"Pkg name:    $(1)") \
+		$(if $(call core_eq,$1,$(pkg_$(1)_name)),,"Pkg name:    $1") \
 		"App name:    $(pkg_$(1)_name)" \
 		"Description: $(pkg_$(1)_description)" \
 		"Home page:   $(pkg_$(1)_homepage)" \
@@ -19,8 +19,8 @@ endef
 search:
 ifdef q
 	$(foreach p,$(PACKAGES), \
-		$(if $(findstring $(call core_lc,$(q)),$(call core_lc,$(pkg_$(p)_name) $(pkg_$(p)_description))), \
-			$(call pkg_print,$(p))))
+		$(if $(findstring $(call core_lc,$q),$(call core_lc,$(pkg_$(p)_name) $(pkg_$(p)_description))), \
+			$(call pkg_print,$p)))
 else
-	$(foreach p,$(PACKAGES),$(call pkg_print,$(p)))
+	$(foreach p,$(PACKAGES),$(call pkg_print,$p))
 endif
diff --git a/core/kerl.mk b/core/kerl.mk
index f6995e98e..35ce1f3b9 100644
--- a/core/kerl.mk
+++ b/core/kerl.mk
@@ -21,10 +21,10 @@ KERL_MAKEFLAGS ?=
 OTP_GIT ?= https://github.com/erlang/otp
 
 define kerl_otp_target
-$(KERL_INSTALL_DIR)/$(1): $(KERL)
+$(KERL_INSTALL_DIR)/$1: $(KERL)
 	$(verbose) if [ ! -d $$@ ]; then \
-		MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $(1) $(1); \
-		$(KERL) install $(1) $(KERL_INSTALL_DIR)/$(1); \
+		MAKEFLAGS="$(KERL_MAKEFLAGS)" $(KERL) build git $(OTP_GIT) $1 $1; \
+		$(KERL) install $1 $(KERL_INSTALL_DIR)/$1; \
 	fi
 endef
 
diff --git a/core/test.mk b/core/test.mk
index 8967fd15e..d576619c1 100644
--- a/core/test.mk
+++ b/core/test.mk
@@ -41,7 +41,7 @@ test_erlc_verbose = $(test_erlc_verbose_$(V))
 
 define compile_test_erl
 	$(test_erlc_verbose) erlc -v $(TEST_ERLC_OPTS) -o $(TEST_DIR) \
-		-pa ebin/ -I include/ $(1)
+		-pa ebin/ -I include/ $1
 endef
 
 ERL_TEST_FILES = $(call core_find,$(TEST_DIR)/,*.erl)
diff --git a/doc/src/guide/deps.asciidoc b/doc/src/guide/deps.asciidoc
index c46dce675..1ac2d8a39 100644
--- a/doc/src/guide/deps.asciidoc
+++ b/doc/src/guide/deps.asciidoc
@@ -163,7 +163,7 @@ variable. In the case of Cowboy, this would look like this:
 
 [source,make]
 DEPS = cowboy
-dep_cowboy_commit = 2.0.0-pre.2
+dep_cowboy_commit = 2.12.0
 
 Erlang.mk will use the package index to get all information
 about Cowboy, except the commit number which will be overridden.
@@ -175,7 +175,7 @@ can define the `dep_$(DEP_NAME)` variable with everything:
 
 [source,make]
 DEPS = cowboy
-dep_cowboy = git https://github.com/essen/cowboy 2.0.0-pre.2
+dep_cowboy = git https://github.com/essen/cowboy 2.12.0
 
 This will fetch Cowboy from your fork at the given commit.
 
@@ -264,7 +264,7 @@ If none of the existing methods fit your use, you can simply
 define your own. Erlang.mk will consider all variables that
 are named as `dep_fetch_$(METHOD)` to be available fetch
 methods. You can do anything inside this variable, as long
-as you create a folder named '$(DEPS_DIR)/$(call dep_name,$1)'.
+as you create a folder named '$(DEPS_DIR)/$(call query_name,$1)'.
 Or in layman terms, if your dependency is Cowboy, this would
 become 'deps/cowboy'.
 
@@ -273,8 +273,8 @@ To give an example, this is what the Git method does:
 [source,make]
 ----
 define dep_fetch_git
-	git clone -q -n -- $(call dep_repo,$1) $(DEPS_DIR)/$(call dep_name,$1); \
-	cd $(DEPS_DIR)/$(call dep_name,$1) && git checkout -q $(call dep_commit,$1);
+	git clone -q -n -- $(call query_repo_git,$1) $(DEPS_DIR)/$(call query_name,$1); \
+	cd $(DEPS_DIR)/$(call query_name,$1) && git checkout -q $(call query_version_git,$1);
 endef
 ----
 
diff --git a/doc/src/guide/getting_started.asciidoc b/doc/src/guide/getting_started.asciidoc
index 7a4a11453..5f782cafc 100644
--- a/doc/src/guide/getting_started.asciidoc
+++ b/doc/src/guide/getting_started.asciidoc
@@ -350,7 +350,8 @@ Bootstrap targets:
 
 This guide should provide any other answer. If not, please
 open a ticket on https://github.com/ninenines/erlang.mk/issues[the official repository]
-and we will work on improving the guide.
+and we will work on improving the guide. For any other questions,
+please visit the https://discord.gg/x468ZsxG[erlang-mk channel on Discord].
 
 Commercial support is available through Nine Nines. Please contact
 Loïc Hoguin by sending an email to mailto:contact@ninenines.eu[].
diff --git a/index/aberth.mk b/index/aberth.mk
deleted file mode 100644
index 4a346514f..000000000
--- a/index/aberth.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += aberth
-pkg_aberth_name = aberth
-pkg_aberth_description = Generic BERT-RPC server in Erlang
-pkg_aberth_homepage = https://github.com/a13x/aberth
-pkg_aberth_fetch = git
-pkg_aberth_repo = https://github.com/a13x/aberth
-pkg_aberth_commit = master
diff --git a/index/active.mk b/index/active.mk
deleted file mode 100644
index f91b19540..000000000
--- a/index/active.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += active
-pkg_active_name = active
-pkg_active_description = Active development for Erlang: rebuild and reload source/binary files while the VM is running
-pkg_active_homepage = https://github.com/proger/active
-pkg_active_fetch = git
-pkg_active_repo = https://github.com/proger/active
-pkg_active_commit = master
diff --git a/index/aleppo.mk b/index/aleppo.mk
deleted file mode 100644
index 9f5a22790..000000000
--- a/index/aleppo.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += aleppo
-pkg_aleppo_name = aleppo
-pkg_aleppo_description = Alternative Erlang Pre-Processor
-pkg_aleppo_homepage = https://github.com/ErlyORM/aleppo
-pkg_aleppo_fetch = git
-pkg_aleppo_repo = https://github.com/ErlyORM/aleppo
-pkg_aleppo_commit = master
diff --git a/index/alog.mk b/index/alog.mk
deleted file mode 100644
index 9eccd0578..000000000
--- a/index/alog.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += alog
-pkg_alog_name = alog
-pkg_alog_description = Simply the best logging framework for Erlang
-pkg_alog_homepage = https://github.com/siberian-fast-food/alogger
-pkg_alog_fetch = git
-pkg_alog_repo = https://github.com/siberian-fast-food/alogger
-pkg_alog_commit = master
diff --git a/index/annotations.mk b/index/annotations.mk
deleted file mode 100644
index 8ef682d4f..000000000
--- a/index/annotations.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += annotations
-pkg_annotations_name = annotations
-pkg_annotations_description = Simple code instrumentation utilities
-pkg_annotations_homepage = https://github.com/hyperthunk/annotations
-pkg_annotations_fetch = git
-pkg_annotations_repo = https://github.com/hyperthunk/annotations
-pkg_annotations_commit = master
diff --git a/index/apns.mk b/index/apns.mk
deleted file mode 100644
index 538278a56..000000000
--- a/index/apns.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += apns
-pkg_apns_name = apns
-pkg_apns_description = Apple Push Notification Server for Erlang
-pkg_apns_homepage = http://inaka.github.com/apns4erl
-pkg_apns_fetch = git
-pkg_apns_repo = https://github.com/inaka/apns4erl
-pkg_apns_commit = master
diff --git a/index/backoff.mk b/index/backoff.mk
deleted file mode 100644
index 9ebc40538..000000000
--- a/index/backoff.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += backoff
-pkg_backoff_name = backoff
-pkg_backoff_description = Simple exponential backoffs in Erlang
-pkg_backoff_homepage = https://github.com/ferd/backoff
-pkg_backoff_fetch = git
-pkg_backoff_repo = https://github.com/ferd/backoff
-pkg_backoff_commit = master
diff --git a/index/barrel_tcp.mk b/index/barrel_tcp.mk
deleted file mode 100644
index fae8f4da7..000000000
--- a/index/barrel_tcp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += barrel_tcp
-pkg_barrel_tcp_name = barrel_tcp
-pkg_barrel_tcp_description = barrel is a generic TCP acceptor pool with low latency in Erlang.
-pkg_barrel_tcp_homepage = https://github.com/benoitc-attic/barrel_tcp
-pkg_barrel_tcp_fetch = git
-pkg_barrel_tcp_repo = https://github.com/benoitc-attic/barrel_tcp
-pkg_barrel_tcp_commit = master
diff --git a/index/basho_bench.mk b/index/basho_bench.mk
deleted file mode 100644
index 479628433..000000000
--- a/index/basho_bench.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += basho_bench
-pkg_basho_bench_name = basho_bench
-pkg_basho_bench_description = A load-generation and testing tool for basically whatever you can write a returning Erlang function for.
-pkg_basho_bench_homepage = https://github.com/basho/basho_bench
-pkg_basho_bench_fetch = git
-pkg_basho_bench_repo = https://github.com/basho/basho_bench
-pkg_basho_bench_commit = master
diff --git a/index/bcrypt.mk b/index/bcrypt.mk
deleted file mode 100644
index acde9df07..000000000
--- a/index/bcrypt.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += bcrypt
-pkg_bcrypt_name = bcrypt
-pkg_bcrypt_description = Bcrypt Erlang / C library
-pkg_bcrypt_homepage = https://github.com/erlangpack/bcrypt
-pkg_bcrypt_fetch = git
-pkg_bcrypt_repo = https://github.com/erlangpack/bcrypt.git
-pkg_bcrypt_commit = master
diff --git a/index/beam.mk b/index/beam.mk
deleted file mode 100644
index 44da5d0fa..000000000
--- a/index/beam.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += beam
-pkg_beam_name = beam
-pkg_beam_description = BEAM emulator written in Erlang
-pkg_beam_homepage = https://github.com/tonyrog/beam
-pkg_beam_fetch = git
-pkg_beam_repo = https://github.com/tonyrog/beam
-pkg_beam_commit = master
diff --git a/index/bear.mk b/index/bear.mk
deleted file mode 100644
index 547d333f3..000000000
--- a/index/bear.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += bear
-pkg_bear_name = bear
-pkg_bear_description = a set of statistics functions for erlang
-pkg_bear_homepage = https://github.com/boundary/bear
-pkg_bear_fetch = git
-pkg_bear_repo = https://github.com/boundary/bear
-pkg_bear_commit = master
diff --git a/index/bertconf.mk b/index/bertconf.mk
deleted file mode 100644
index f3aa1e1fa..000000000
--- a/index/bertconf.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += bertconf
-pkg_bertconf_name = bertconf
-pkg_bertconf_description = Make ETS tables out of statc BERT files that are auto-reloaded
-pkg_bertconf_homepage = https://github.com/ferd/bertconf
-pkg_bertconf_fetch = git
-pkg_bertconf_repo = https://github.com/ferd/bertconf
-pkg_bertconf_commit = master
diff --git a/index/bifrost.mk b/index/bifrost.mk
deleted file mode 100644
index 40eb4a5b3..000000000
--- a/index/bifrost.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += bifrost
-pkg_bifrost_name = bifrost
-pkg_bifrost_description = Erlang FTP Server Framework
-pkg_bifrost_homepage = https://github.com/thorstadt/bifrost
-pkg_bifrost_fetch = git
-pkg_bifrost_repo = https://github.com/thorstadt/bifrost
-pkg_bifrost_commit = master
diff --git a/index/binpp.mk b/index/binpp.mk
deleted file mode 100644
index 880426159..000000000
--- a/index/binpp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += binpp
-pkg_binpp_name = binpp
-pkg_binpp_description = Erlang Binary Pretty Printer
-pkg_binpp_homepage = https://github.com/jtendo/binpp
-pkg_binpp_fetch = git
-pkg_binpp_repo = https://github.com/jtendo/binpp
-pkg_binpp_commit = master
diff --git a/index/bisect.mk b/index/bisect.mk
deleted file mode 100644
index 7815868ec..000000000
--- a/index/bisect.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += bisect
-pkg_bisect_name = bisect
-pkg_bisect_description = Ordered fixed-size binary dictionary in Erlang
-pkg_bisect_homepage = https://github.com/knutin/bisect
-pkg_bisect_fetch = git
-pkg_bisect_repo = https://github.com/knutin/bisect
-pkg_bisect_commit = master
diff --git a/index/bitcask.mk b/index/bitcask.mk
deleted file mode 100644
index 31930f3ef..000000000
--- a/index/bitcask.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += bitcask
-pkg_bitcask_name = bitcask
-pkg_bitcask_description = because you need another a key/value storage engine
-pkg_bitcask_homepage = https://github.com/basho/bitcask
-pkg_bitcask_fetch = git
-pkg_bitcask_repo = https://github.com/basho/bitcask
-pkg_bitcask_commit = develop
diff --git a/index/bootstrap.mk b/index/bootstrap.mk
deleted file mode 100644
index 4c705a48d..000000000
--- a/index/bootstrap.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += bootstrap
-pkg_bootstrap_name = bootstrap
-pkg_bootstrap_description = A simple, yet powerful Erlang cluster bootstrapping application.
-pkg_bootstrap_homepage = https://github.com/schlagert/bootstrap
-pkg_bootstrap_fetch = git
-pkg_bootstrap_repo = https://github.com/schlagert/bootstrap
-pkg_bootstrap_commit = master
diff --git a/index/boss.mk b/index/boss.mk
deleted file mode 100644
index 3fbc1de17..000000000
--- a/index/boss.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += boss
-pkg_boss_name = boss
-pkg_boss_description = Erlang web MVC, now featuring Comet
-pkg_boss_homepage = https://github.com/ChicagoBoss/ChicagoBoss
-pkg_boss_fetch = git
-pkg_boss_repo = https://github.com/ChicagoBoss/ChicagoBoss
-pkg_boss_commit = master
diff --git a/index/boss_db.mk b/index/boss_db.mk
deleted file mode 100644
index ef0c80f88..000000000
--- a/index/boss_db.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += boss_db
-pkg_boss_db_name = boss_db
-pkg_boss_db_description = BossDB: a sharded, caching, pooling, evented ORM for Erlang
-pkg_boss_db_homepage = https://github.com/ErlyORM/boss_db
-pkg_boss_db_fetch = git
-pkg_boss_db_repo = https://github.com/ErlyORM/boss_db
-pkg_boss_db_commit = master
diff --git a/index/brod.mk b/index/brod.mk
deleted file mode 100644
index 2650f2c96..000000000
--- a/index/brod.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += brod
-pkg_brod_name = brod
-pkg_brod_description = Kafka client in Erlang
-pkg_brod_homepage = https://github.com/klarna/brod
-pkg_brod_fetch = git
-pkg_brod_repo = https://github.com/klarna/brod.git
-pkg_brod_commit = master
diff --git a/index/bson.mk b/index/bson.mk
deleted file mode 100644
index 729722bb5..000000000
--- a/index/bson.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += bson
-pkg_bson_name = bson
-pkg_bson_description = BSON documents in Erlang, see bsonspec.org
-pkg_bson_homepage = https://github.com/comtihon/bson-erlang
-pkg_bson_fetch = git
-pkg_bson_repo = https://github.com/comtihon/bson-erlang
-pkg_bson_commit = master
diff --git a/index/bullet.mk b/index/bullet.mk
deleted file mode 100644
index e36567418..000000000
--- a/index/bullet.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += bullet
-pkg_bullet_name = bullet
-pkg_bullet_description = Simple, reliable, efficient streaming for Cowboy.
-pkg_bullet_homepage = http://ninenines.eu
-pkg_bullet_fetch = git
-pkg_bullet_repo = https://github.com/ninenines/bullet
-pkg_bullet_commit = master
diff --git a/index/cache.mk b/index/cache.mk
deleted file mode 100644
index 82a76274a..000000000
--- a/index/cache.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cache
-pkg_cache_name = cache
-pkg_cache_description = Erlang in-memory cache
-pkg_cache_homepage = https://github.com/fogfish/cache
-pkg_cache_fetch = git
-pkg_cache_repo = https://github.com/fogfish/cache
-pkg_cache_commit = master
diff --git a/index/cake.mk b/index/cake.mk
deleted file mode 100644
index a60ddf587..000000000
--- a/index/cake.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cake
-pkg_cake_name = cake
-pkg_cake_description = Really simple terminal colorization
-pkg_cake_homepage = https://github.com/darach/cake-erl
-pkg_cake_fetch = git
-pkg_cake_repo = https://github.com/darach/cake-erl
-pkg_cake_commit = master
diff --git a/index/cberl.mk b/index/cberl.mk
deleted file mode 100644
index 90aa02bb0..000000000
--- a/index/cberl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cberl
-pkg_cberl_name = cberl
-pkg_cberl_description = NIF based Erlang bindings for Couchbase
-pkg_cberl_homepage = https://github.com/chitika/cberl
-pkg_cberl_fetch = git
-pkg_cberl_repo = https://github.com/chitika/cberl
-pkg_cberl_commit = master
diff --git a/index/cecho.mk b/index/cecho.mk
deleted file mode 100644
index 5cd82e3c7..000000000
--- a/index/cecho.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cecho
-pkg_cecho_name = cecho
-pkg_cecho_description = An ncurses library for Erlang
-pkg_cecho_homepage = https://github.com/mazenharake/cecho
-pkg_cecho_fetch = git
-pkg_cecho_repo = https://github.com/mazenharake/cecho
-pkg_cecho_commit = master
diff --git a/index/cferl.mk b/index/cferl.mk
deleted file mode 100644
index 18ca5866b..000000000
--- a/index/cferl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cferl
-pkg_cferl_name = cferl
-pkg_cferl_description = Rackspace / Open Stack Cloud Files Erlang Client
-pkg_cferl_homepage = https://github.com/ddossot/cferl
-pkg_cferl_fetch = git
-pkg_cferl_repo = https://github.com/ddossot/cferl
-pkg_cferl_commit = master
diff --git a/index/chaos_monkey.mk b/index/chaos_monkey.mk
deleted file mode 100644
index e89d26355..000000000
--- a/index/chaos_monkey.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += chaos_monkey
-pkg_chaos_monkey_name = chaos_monkey
-pkg_chaos_monkey_description = This is The CHAOS MONKEY.  It will kill your processes.
-pkg_chaos_monkey_homepage = https://github.com/dLuna/chaos_monkey
-pkg_chaos_monkey_fetch = git
-pkg_chaos_monkey_repo = https://github.com/dLuna/chaos_monkey
-pkg_chaos_monkey_commit = master
diff --git a/index/check_node.mk b/index/check_node.mk
deleted file mode 100644
index f95316c35..000000000
--- a/index/check_node.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += check_node
-pkg_check_node_name = check_node
-pkg_check_node_description = Nagios Scripts for monitoring Riak
-pkg_check_node_homepage = https://github.com/basho-labs/riak_nagios
-pkg_check_node_fetch = git
-pkg_check_node_repo = https://github.com/basho-labs/riak_nagios
-pkg_check_node_commit = master
diff --git a/index/chronos.mk b/index/chronos.mk
deleted file mode 100644
index 5c536fe6d..000000000
--- a/index/chronos.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += chronos
-pkg_chronos_name = chronos
-pkg_chronos_description = Timer module for Erlang that makes it easy to abstract time out of the tests.
-pkg_chronos_homepage = https://github.com/lehoff/chronos
-pkg_chronos_fetch = git
-pkg_chronos_repo = https://github.com/lehoff/chronos
-pkg_chronos_commit = master
diff --git a/index/chumak.mk b/index/chumak.mk
deleted file mode 100644
index 38cd11393..000000000
--- a/index/chumak.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += chumak
-pkg_chumak_name = chumak
-pkg_chumak_description = Pure Erlang implementation of ZeroMQ Message Transport Protocol.
-pkg_chumak_homepage = http://choven.ca
-pkg_chumak_fetch = git
-pkg_chumak_repo = https://github.com/chovencorp/chumak
-pkg_chumak_commit = master
diff --git a/index/cl.mk b/index/cl.mk
deleted file mode 100644
index 8df503e0a..000000000
--- a/index/cl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cl
-pkg_cl_name = cl
-pkg_cl_description = OpenCL binding for Erlang
-pkg_cl_homepage = https://github.com/tonyrog/cl
-pkg_cl_fetch = git
-pkg_cl_repo = https://github.com/tonyrog/cl
-pkg_cl_commit = master
diff --git a/index/clique.mk b/index/clique.mk
deleted file mode 100644
index 46fa5e518..000000000
--- a/index/clique.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += clique
-pkg_clique_name = clique
-pkg_clique_description = CLI Framework for Erlang
-pkg_clique_homepage = https://github.com/basho/clique
-pkg_clique_fetch = git
-pkg_clique_repo = https://github.com/basho/clique
-pkg_clique_commit = develop
diff --git a/index/cloudi_core.mk b/index/cloudi_core.mk
deleted file mode 100644
index 496202b7a..000000000
--- a/index/cloudi_core.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_core
-pkg_cloudi_core_name = cloudi_core
-pkg_cloudi_core_description = CloudI internal service runtime
-pkg_cloudi_core_homepage = http://cloudi.org/
-pkg_cloudi_core_fetch = git
-pkg_cloudi_core_repo = https://github.com/CloudI/cloudi_core
-pkg_cloudi_core_commit = master
diff --git a/index/cloudi_service_api_requests.mk b/index/cloudi_service_api_requests.mk
deleted file mode 100644
index 8728cb496..000000000
--- a/index/cloudi_service_api_requests.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_api_requests
-pkg_cloudi_service_api_requests_name = cloudi_service_api_requests
-pkg_cloudi_service_api_requests_description = CloudI Service API requests (JSON-RPC/Erlang-term support)
-pkg_cloudi_service_api_requests_homepage = http://cloudi.org/
-pkg_cloudi_service_api_requests_fetch = git
-pkg_cloudi_service_api_requests_repo = https://github.com/CloudI/cloudi_service_api_requests
-pkg_cloudi_service_api_requests_commit = master
diff --git a/index/cloudi_service_db_mysql.mk b/index/cloudi_service_db_mysql.mk
deleted file mode 100644
index 39cf4c92d..000000000
--- a/index/cloudi_service_db_mysql.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_db_mysql
-pkg_cloudi_service_db_mysql_name = cloudi_service_db_mysql
-pkg_cloudi_service_db_mysql_description = MySQL CloudI Service
-pkg_cloudi_service_db_mysql_homepage = http://cloudi.org/
-pkg_cloudi_service_db_mysql_fetch = git
-pkg_cloudi_service_db_mysql_repo = https://github.com/CloudI/cloudi_service_db_mysql
-pkg_cloudi_service_db_mysql_commit = master
diff --git a/index/cloudi_service_db_pgsql.mk b/index/cloudi_service_db_pgsql.mk
deleted file mode 100644
index 5a6cb4161..000000000
--- a/index/cloudi_service_db_pgsql.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_db_pgsql
-pkg_cloudi_service_db_pgsql_name = cloudi_service_db_pgsql
-pkg_cloudi_service_db_pgsql_description = PostgreSQL CloudI Service
-pkg_cloudi_service_db_pgsql_homepage = http://cloudi.org/
-pkg_cloudi_service_db_pgsql_fetch = git
-pkg_cloudi_service_db_pgsql_repo = https://github.com/CloudI/cloudi_service_db_pgsql
-pkg_cloudi_service_db_pgsql_commit = master
diff --git a/index/cloudi_service_filesystem.mk b/index/cloudi_service_filesystem.mk
deleted file mode 100644
index 9c6287bb2..000000000
--- a/index/cloudi_service_filesystem.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_filesystem
-pkg_cloudi_service_filesystem_name = cloudi_service_filesystem
-pkg_cloudi_service_filesystem_description = Filesystem CloudI Service
-pkg_cloudi_service_filesystem_homepage = http://cloudi.org/
-pkg_cloudi_service_filesystem_fetch = git
-pkg_cloudi_service_filesystem_repo = https://github.com/CloudI/cloudi_service_filesystem
-pkg_cloudi_service_filesystem_commit = master
diff --git a/index/cloudi_service_http_client.mk b/index/cloudi_service_http_client.mk
deleted file mode 100644
index 203b83f9c..000000000
--- a/index/cloudi_service_http_client.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_http_client
-pkg_cloudi_service_http_client_name = cloudi_service_http_client
-pkg_cloudi_service_http_client_description = HTTP client CloudI Service
-pkg_cloudi_service_http_client_homepage = http://cloudi.org/
-pkg_cloudi_service_http_client_fetch = git
-pkg_cloudi_service_http_client_repo = https://github.com/CloudI/cloudi_service_http_client
-pkg_cloudi_service_http_client_commit = master
diff --git a/index/cloudi_service_http_cowboy.mk b/index/cloudi_service_http_cowboy.mk
deleted file mode 100644
index 0dcb8b867..000000000
--- a/index/cloudi_service_http_cowboy.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_http_cowboy
-pkg_cloudi_service_http_cowboy_name = cloudi_service_http_cowboy
-pkg_cloudi_service_http_cowboy_description = cowboy HTTP/HTTPS CloudI Service
-pkg_cloudi_service_http_cowboy_homepage = http://cloudi.org/
-pkg_cloudi_service_http_cowboy_fetch = git
-pkg_cloudi_service_http_cowboy_repo = https://github.com/CloudI/cloudi_service_http_cowboy
-pkg_cloudi_service_http_cowboy_commit = master
diff --git a/index/cloudi_service_http_elli.mk b/index/cloudi_service_http_elli.mk
deleted file mode 100644
index 5b134fa97..000000000
--- a/index/cloudi_service_http_elli.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_http_elli
-pkg_cloudi_service_http_elli_name = cloudi_service_http_elli
-pkg_cloudi_service_http_elli_description = elli HTTP CloudI Service
-pkg_cloudi_service_http_elli_homepage = http://cloudi.org/
-pkg_cloudi_service_http_elli_fetch = git
-pkg_cloudi_service_http_elli_repo = https://github.com/CloudI/cloudi_service_http_elli
-pkg_cloudi_service_http_elli_commit = master
diff --git a/index/cloudi_service_map_reduce.mk b/index/cloudi_service_map_reduce.mk
deleted file mode 100644
index 8a4766dbd..000000000
--- a/index/cloudi_service_map_reduce.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_map_reduce
-pkg_cloudi_service_map_reduce_name = cloudi_service_map_reduce
-pkg_cloudi_service_map_reduce_description = Map/Reduce CloudI Service
-pkg_cloudi_service_map_reduce_homepage = http://cloudi.org/
-pkg_cloudi_service_map_reduce_fetch = git
-pkg_cloudi_service_map_reduce_repo = https://github.com/CloudI/cloudi_service_map_reduce
-pkg_cloudi_service_map_reduce_commit = master
diff --git a/index/cloudi_service_oauth1.mk b/index/cloudi_service_oauth1.mk
deleted file mode 100644
index ac7857ebc..000000000
--- a/index/cloudi_service_oauth1.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_oauth1
-pkg_cloudi_service_oauth1_name = cloudi_service_oauth1
-pkg_cloudi_service_oauth1_description = OAuth v1.0 CloudI Service
-pkg_cloudi_service_oauth1_homepage = http://cloudi.org/
-pkg_cloudi_service_oauth1_fetch = git
-pkg_cloudi_service_oauth1_repo = https://github.com/CloudI/cloudi_service_oauth1
-pkg_cloudi_service_oauth1_commit = master
diff --git a/index/cloudi_service_queue.mk b/index/cloudi_service_queue.mk
deleted file mode 100644
index e7727cc72..000000000
--- a/index/cloudi_service_queue.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_queue
-pkg_cloudi_service_queue_name = cloudi_service_queue
-pkg_cloudi_service_queue_description = Persistent Queue Service
-pkg_cloudi_service_queue_homepage = http://cloudi.org/
-pkg_cloudi_service_queue_fetch = git
-pkg_cloudi_service_queue_repo = https://github.com/CloudI/cloudi_service_queue
-pkg_cloudi_service_queue_commit = master
diff --git a/index/cloudi_service_quorum.mk b/index/cloudi_service_quorum.mk
deleted file mode 100644
index f38496b25..000000000
--- a/index/cloudi_service_quorum.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_quorum
-pkg_cloudi_service_quorum_name = cloudi_service_quorum
-pkg_cloudi_service_quorum_description = CloudI Quorum Service
-pkg_cloudi_service_quorum_homepage = http://cloudi.org/
-pkg_cloudi_service_quorum_fetch = git
-pkg_cloudi_service_quorum_repo = https://github.com/CloudI/cloudi_service_quorum
-pkg_cloudi_service_quorum_commit = master
diff --git a/index/cloudi_service_router.mk b/index/cloudi_service_router.mk
deleted file mode 100644
index 9096b3714..000000000
--- a/index/cloudi_service_router.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_router
-pkg_cloudi_service_router_name = cloudi_service_router
-pkg_cloudi_service_router_description = CloudI Router Service
-pkg_cloudi_service_router_homepage = http://cloudi.org/
-pkg_cloudi_service_router_fetch = git
-pkg_cloudi_service_router_repo = https://github.com/CloudI/cloudi_service_router
-pkg_cloudi_service_router_commit = master
diff --git a/index/cloudi_service_tcp.mk b/index/cloudi_service_tcp.mk
deleted file mode 100644
index 263413eca..000000000
--- a/index/cloudi_service_tcp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_tcp
-pkg_cloudi_service_tcp_name = cloudi_service_tcp
-pkg_cloudi_service_tcp_description = TCP CloudI Service
-pkg_cloudi_service_tcp_homepage = http://cloudi.org/
-pkg_cloudi_service_tcp_fetch = git
-pkg_cloudi_service_tcp_repo = https://github.com/CloudI/cloudi_service_tcp
-pkg_cloudi_service_tcp_commit = master
diff --git a/index/cloudi_service_udp.mk b/index/cloudi_service_udp.mk
deleted file mode 100644
index 16d867038..000000000
--- a/index/cloudi_service_udp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_udp
-pkg_cloudi_service_udp_name = cloudi_service_udp
-pkg_cloudi_service_udp_description = UDP CloudI Service
-pkg_cloudi_service_udp_homepage = http://cloudi.org/
-pkg_cloudi_service_udp_fetch = git
-pkg_cloudi_service_udp_repo = https://github.com/CloudI/cloudi_service_udp
-pkg_cloudi_service_udp_commit = master
diff --git a/index/cloudi_service_validate.mk b/index/cloudi_service_validate.mk
deleted file mode 100644
index 4ee9a726b..000000000
--- a/index/cloudi_service_validate.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_validate
-pkg_cloudi_service_validate_name = cloudi_service_validate
-pkg_cloudi_service_validate_description = CloudI Validate Service
-pkg_cloudi_service_validate_homepage = http://cloudi.org/
-pkg_cloudi_service_validate_fetch = git
-pkg_cloudi_service_validate_repo = https://github.com/CloudI/cloudi_service_validate
-pkg_cloudi_service_validate_commit = master
diff --git a/index/cloudi_service_zeromq.mk b/index/cloudi_service_zeromq.mk
deleted file mode 100644
index 2352a563b..000000000
--- a/index/cloudi_service_zeromq.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cloudi_service_zeromq
-pkg_cloudi_service_zeromq_name = cloudi_service_zeromq
-pkg_cloudi_service_zeromq_description = ZeroMQ CloudI Service
-pkg_cloudi_service_zeromq_homepage = http://cloudi.org/
-pkg_cloudi_service_zeromq_fetch = git
-pkg_cloudi_service_zeromq_repo = https://github.com/CloudI/cloudi_service_zeromq
-pkg_cloudi_service_zeromq_commit = master
diff --git a/index/cluster_info.mk b/index/cluster_info.mk
deleted file mode 100644
index 39968be83..000000000
--- a/index/cluster_info.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cluster_info
-pkg_cluster_info_name = cluster_info
-pkg_cluster_info_description = Fork of Hibari's nifty cluster_info OTP app
-pkg_cluster_info_homepage = https://github.com/basho/cluster_info
-pkg_cluster_info_fetch = git
-pkg_cluster_info_repo = https://github.com/basho/cluster_info
-pkg_cluster_info_commit = master
diff --git a/index/color.mk b/index/color.mk
deleted file mode 100644
index 27d39ac4f..000000000
--- a/index/color.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += color
-pkg_color_name = color
-pkg_color_description = ANSI colors for your Erlang
-pkg_color_homepage = https://github.com/julianduque/erlang-color
-pkg_color_fetch = git
-pkg_color_repo = https://github.com/julianduque/erlang-color
-pkg_color_commit = master
diff --git a/index/confetti.mk b/index/confetti.mk
deleted file mode 100644
index 06995d8d9..000000000
--- a/index/confetti.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += confetti
-pkg_confetti_name = confetti
-pkg_confetti_description = Erlang configuration provider / application:get_env/2 on steroids
-pkg_confetti_homepage = https://github.com/jtendo/confetti
-pkg_confetti_fetch = git
-pkg_confetti_repo = https://github.com/jtendo/confetti
-pkg_confetti_commit = master
diff --git a/index/couchbeam.mk b/index/couchbeam.mk
deleted file mode 100644
index ef9cef872..000000000
--- a/index/couchbeam.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += couchbeam
-pkg_couchbeam_name = couchbeam
-pkg_couchbeam_description = Apache CouchDB client in Erlang
-pkg_couchbeam_homepage = https://github.com/benoitc/couchbeam
-pkg_couchbeam_fetch = git
-pkg_couchbeam_repo = https://github.com/benoitc/couchbeam
-pkg_couchbeam_commit = master
diff --git a/index/covertool.mk b/index/covertool.mk
deleted file mode 100644
index e67b4a417..000000000
--- a/index/covertool.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += covertool
-pkg_covertool_name = covertool
-pkg_covertool_description = Tool to convert Erlang cover data files into Cobertura XML reports
-pkg_covertool_homepage = https://github.com/idubrov/covertool
-pkg_covertool_fetch = git
-pkg_covertool_repo = https://github.com/idubrov/covertool
-pkg_covertool_commit = master
diff --git a/index/cowdb.mk b/index/cowdb.mk
deleted file mode 100644
index 76c8e7258..000000000
--- a/index/cowdb.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cowdb
-pkg_cowdb_name = cowdb
-pkg_cowdb_description = Pure Key/Value database library for Erlang Applications
-pkg_cowdb_homepage = https://github.com/refuge/cowdb
-pkg_cowdb_fetch = git
-pkg_cowdb_repo = https://github.com/refuge/cowdb
-pkg_cowdb_commit = master
diff --git a/index/cowlib.mk b/index/cowlib.mk
index 0650ff980..b237a1b45 100644
--- a/index/cowlib.mk
+++ b/index/cowlib.mk
@@ -4,4 +4,4 @@ pkg_cowlib_description = Support library for manipulating Web protocols.
 pkg_cowlib_homepage = http://ninenines.eu
 pkg_cowlib_fetch = git
 pkg_cowlib_repo = https://github.com/ninenines/cowlib
-pkg_cowlib_commit = 1.0.2
+pkg_cowlib_commit = master
diff --git a/index/cpg.mk b/index/cpg.mk
deleted file mode 100644
index 7d6233437..000000000
--- a/index/cpg.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cpg
-pkg_cpg_name = cpg
-pkg_cpg_description = CloudI Process Groups
-pkg_cpg_homepage = https://github.com/okeuday/cpg
-pkg_cpg_fetch = git
-pkg_cpg_repo = https://github.com/okeuday/cpg
-pkg_cpg_commit = master
diff --git a/index/cqerl.mk b/index/cqerl.mk
deleted file mode 100644
index 18f25a321..000000000
--- a/index/cqerl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cqerl
-pkg_cqerl_name = cqerl
-pkg_cqerl_description = Native Erlang CQL client for Cassandra
-pkg_cqerl_homepage = https://matehat.github.io/cqerl/
-pkg_cqerl_fetch = git
-pkg_cqerl_repo = https://github.com/matehat/cqerl
-pkg_cqerl_commit = master
diff --git a/index/cr.mk b/index/cr.mk
deleted file mode 100644
index 04e0af12e..000000000
--- a/index/cr.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cr
-pkg_cr_name = cr
-pkg_cr_description = Chain Replication
-pkg_cr_homepage = https://synrc.com/apps/cr/doc/cr.htm
-pkg_cr_fetch = git
-pkg_cr_repo = https://github.com/spawnproc/cr
-pkg_cr_commit = master
diff --git a/index/cuttlefish.mk b/index/cuttlefish.mk
deleted file mode 100644
index 354a540da..000000000
--- a/index/cuttlefish.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += cuttlefish
-pkg_cuttlefish_name = cuttlefish
-pkg_cuttlefish_description = cuttlefish configuration abstraction
-pkg_cuttlefish_homepage = https://github.com/Kyorai/cuttlefish
-pkg_cuttlefish_fetch = git
-pkg_cuttlefish_repo = https://github.com/Kyorai/cuttlefish
-pkg_cuttlefish_commit = main
diff --git a/index/damocles.mk b/index/damocles.mk
deleted file mode 100644
index cbd259599..000000000
--- a/index/damocles.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += damocles
-pkg_damocles_name = damocles
-pkg_damocles_description = Erlang library for generating adversarial network conditions for QAing distributed applications/systems on a single Linux box.
-pkg_damocles_homepage = https://github.com/lostcolony/damocles
-pkg_damocles_fetch = git
-pkg_damocles_repo = https://github.com/lostcolony/damocles
-pkg_damocles_commit = master
diff --git a/index/debbie.mk b/index/debbie.mk
deleted file mode 100644
index a0513d7a2..000000000
--- a/index/debbie.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += debbie
-pkg_debbie_name = debbie
-pkg_debbie_description = .DEB Built In Erlang
-pkg_debbie_homepage = https://github.com/crownedgrouse/debbie
-pkg_debbie_fetch = git
-pkg_debbie_repo = https://github.com/crownedgrouse/debbie
-pkg_debbie_commit = master
diff --git a/index/decimal.mk b/index/decimal.mk
deleted file mode 100644
index b8879b943..000000000
--- a/index/decimal.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += decimal
-pkg_decimal_name = decimal
-pkg_decimal_description = An Erlang decimal arithmetic library
-pkg_decimal_homepage = https://github.com/egobrain/decimal
-pkg_decimal_fetch = git
-pkg_decimal_repo = https://github.com/egobrain/decimal
-pkg_decimal_commit = master
diff --git a/index/detergent.mk b/index/detergent.mk
deleted file mode 100644
index 2af4d4c2e..000000000
--- a/index/detergent.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += detergent
-pkg_detergent_name = detergent
-pkg_detergent_description = An emulsifying Erlang SOAP library
-pkg_detergent_homepage = https://github.com/devinus/detergent
-pkg_detergent_fetch = git
-pkg_detergent_repo = https://github.com/devinus/detergent
-pkg_detergent_commit = master
diff --git a/index/dh_date.mk b/index/dh_date.mk
deleted file mode 100644
index c564dd31d..000000000
--- a/index/dh_date.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += dh_date
-pkg_dh_date_name = dh_date
-pkg_dh_date_description = Date formatting / parsing library for erlang
-pkg_dh_date_homepage = https://github.com/daleharvey/dh_date
-pkg_dh_date_fetch = git
-pkg_dh_date_repo = https://github.com/daleharvey/dh_date
-pkg_dh_date_commit = master
diff --git a/index/dirbusterl.mk b/index/dirbusterl.mk
deleted file mode 100644
index 5fcc2abd7..000000000
--- a/index/dirbusterl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += dirbusterl
-pkg_dirbusterl_name = dirbusterl
-pkg_dirbusterl_description = DirBuster successor in Erlang
-pkg_dirbusterl_homepage = https://github.com/silentsignal/DirBustErl
-pkg_dirbusterl_fetch = git
-pkg_dirbusterl_repo = https://github.com/silentsignal/DirBustErl
-pkg_dirbusterl_commit = master
diff --git a/index/dispcount.mk b/index/dispcount.mk
deleted file mode 100644
index fcfce51f0..000000000
--- a/index/dispcount.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += dispcount
-pkg_dispcount_name = dispcount
-pkg_dispcount_description = Erlang task dispatcher based on ETS counters.
-pkg_dispcount_homepage = https://github.com/ferd/dispcount
-pkg_dispcount_fetch = git
-pkg_dispcount_repo = https://github.com/ferd/dispcount
-pkg_dispcount_commit = master
diff --git a/index/dlhttpc.mk b/index/dlhttpc.mk
deleted file mode 100644
index 6805accff..000000000
--- a/index/dlhttpc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += dlhttpc
-pkg_dlhttpc_name = dlhttpc
-pkg_dlhttpc_description = dispcount-based lhttpc fork for massive amounts of requests to limited endpoints
-pkg_dlhttpc_homepage = https://github.com/ferd/dlhttpc
-pkg_dlhttpc_fetch = git
-pkg_dlhttpc_repo = https://github.com/ferd/dlhttpc
-pkg_dlhttpc_commit = master
diff --git a/index/dns.mk b/index/dns.mk
deleted file mode 100644
index 27e9a511a..000000000
--- a/index/dns.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += dns
-pkg_dns_name = dns
-pkg_dns_description = Erlang DNS library
-pkg_dns_homepage = https://github.com/aetrion/dns_erlang
-pkg_dns_fetch = git
-pkg_dns_repo = https://github.com/aetrion/dns_erlang
-pkg_dns_commit = main
diff --git a/index/dynamic_compile.mk b/index/dynamic_compile.mk
deleted file mode 100644
index 142d14d37..000000000
--- a/index/dynamic_compile.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += dynamic_compile
-pkg_dynamic_compile_name = dynamic_compile
-pkg_dynamic_compile_description = compile and load erlang modules from string input
-pkg_dynamic_compile_homepage = https://github.com/jkvor/dynamic_compile
-pkg_dynamic_compile_fetch = git
-pkg_dynamic_compile_repo = https://github.com/jkvor/dynamic_compile
-pkg_dynamic_compile_commit = master
diff --git a/index/e2.mk b/index/e2.mk
deleted file mode 100644
index d2aa1de87..000000000
--- a/index/e2.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += e2
-pkg_e2_name = e2
-pkg_e2_description = Library to simply writing correct OTP applications.
-pkg_e2_homepage = http://e2project.org
-pkg_e2_fetch = git
-pkg_e2_repo = https://github.com/gar1t/e2
-pkg_e2_commit = master
diff --git a/index/eamf.mk b/index/eamf.mk
deleted file mode 100644
index 3d4d711c0..000000000
--- a/index/eamf.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eamf
-pkg_eamf_name = eamf
-pkg_eamf_description = eAMF provides Action Message Format (AMF) support for Erlang
-pkg_eamf_homepage = https://github.com/mrinalwadhwa/eamf
-pkg_eamf_fetch = git
-pkg_eamf_repo = https://github.com/mrinalwadhwa/eamf
-pkg_eamf_commit = master
diff --git a/index/eavro.mk b/index/eavro.mk
deleted file mode 100644
index 9ff4f97c6..000000000
--- a/index/eavro.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eavro
-pkg_eavro_name = eavro
-pkg_eavro_description = Apache Avro encoder/decoder
-pkg_eavro_homepage = https://github.com/SIfoxDevTeam/eavro
-pkg_eavro_fetch = git
-pkg_eavro_repo = https://github.com/SIfoxDevTeam/eavro
-pkg_eavro_commit = master
diff --git a/index/ecapnp.mk b/index/ecapnp.mk
deleted file mode 100644
index ac9e4696d..000000000
--- a/index/ecapnp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ecapnp
-pkg_ecapnp_name = ecapnp
-pkg_ecapnp_description = Cap'n Proto library for Erlang
-pkg_ecapnp_homepage = https://github.com/kaos/ecapnp
-pkg_ecapnp_fetch = git
-pkg_ecapnp_repo = https://github.com/kaos/ecapnp
-pkg_ecapnp_commit = master
diff --git a/index/econfig.mk b/index/econfig.mk
deleted file mode 100644
index 3afa97644..000000000
--- a/index/econfig.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += econfig
-pkg_econfig_name = econfig
-pkg_econfig_description = simple Erlang config handler using INI files
-pkg_econfig_homepage = https://github.com/benoitc/econfig
-pkg_econfig_fetch = git
-pkg_econfig_repo = https://github.com/benoitc/econfig
-pkg_econfig_commit = master
diff --git a/index/edate.mk b/index/edate.mk
deleted file mode 100644
index f9ee33a06..000000000
--- a/index/edate.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += edate
-pkg_edate_name = edate
-pkg_edate_description = date manipulation library for erlang
-pkg_edate_homepage = https://github.com/dweldon/edate
-pkg_edate_fetch = git
-pkg_edate_repo = https://github.com/dweldon/edate
-pkg_edate_commit = master
diff --git a/index/edgar.mk b/index/edgar.mk
deleted file mode 100644
index 07a36012b..000000000
--- a/index/edgar.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += edgar
-pkg_edgar_name = edgar
-pkg_edgar_description = Erlang Does GNU AR
-pkg_edgar_homepage = https://github.com/crownedgrouse/edgar
-pkg_edgar_fetch = git
-pkg_edgar_repo = https://github.com/crownedgrouse/edgar
-pkg_edgar_commit = master
diff --git a/index/edns.mk b/index/edns.mk
deleted file mode 100644
index 7f984b657..000000000
--- a/index/edns.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += edns
-pkg_edns_name = edns
-pkg_edns_description = Erlang/OTP DNS server
-pkg_edns_homepage = https://github.com/hcvst/erlang-dns
-pkg_edns_fetch = git
-pkg_edns_repo = https://github.com/hcvst/erlang-dns
-pkg_edns_commit = master
diff --git a/index/edown.mk b/index/edown.mk
deleted file mode 100644
index 3c62927fc..000000000
--- a/index/edown.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += edown
-pkg_edown_name = edown
-pkg_edown_description = EDoc extension for generating Github-flavored Markdown
-pkg_edown_homepage = https://github.com/uwiger/edown
-pkg_edown_fetch = git
-pkg_edown_repo = https://github.com/uwiger/edown
-pkg_edown_commit = master
diff --git a/index/eep.mk b/index/eep.mk
deleted file mode 100644
index e7754ec9f..000000000
--- a/index/eep.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eep
-pkg_eep_name = eep
-pkg_eep_description = Erlang Easy Profiling (eep) application provides a way to analyze application performance and call hierarchy
-pkg_eep_homepage = https://github.com/virtan/eep
-pkg_eep_fetch = git
-pkg_eep_repo = https://github.com/virtan/eep
-pkg_eep_commit = master
diff --git a/index/eep_app.mk b/index/eep_app.mk
deleted file mode 100644
index 5202c673e..000000000
--- a/index/eep_app.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eep_app
-pkg_eep_app_name = eep_app
-pkg_eep_app_description = Embedded Event Processing
-pkg_eep_app_homepage = https://github.com/darach/eep-erl
-pkg_eep_app_fetch = git
-pkg_eep_app_repo = https://github.com/darach/eep-erl
-pkg_eep_app_commit = master
diff --git a/index/efene.mk b/index/efene.mk
deleted file mode 100644
index 7911cd459..000000000
--- a/index/efene.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += efene
-pkg_efene_name = efene
-pkg_efene_description = Alternative syntax for the Erlang Programming Language focusing on simplicity, ease of use and programmer UX
-pkg_efene_homepage = https://github.com/efene/efene
-pkg_efene_fetch = git
-pkg_efene_repo = https://github.com/efene/efene
-pkg_efene_commit = master
diff --git a/index/egeoip.mk b/index/egeoip.mk
deleted file mode 100644
index 7647431f4..000000000
--- a/index/egeoip.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += egeoip
-pkg_egeoip_name = egeoip
-pkg_egeoip_description = Erlang IP Geolocation module, currently supporting the MaxMind GeoLite City Database.
-pkg_egeoip_homepage = https://github.com/mochi/egeoip
-pkg_egeoip_fetch = git
-pkg_egeoip_repo = https://github.com/mochi/egeoip
-pkg_egeoip_commit = master
diff --git a/index/ehsa.mk b/index/ehsa.mk
deleted file mode 100644
index 98c9f8bc3..000000000
--- a/index/ehsa.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ehsa
-pkg_ehsa_name = ehsa
-pkg_ehsa_description = Erlang HTTP server basic and digest authentication modules
-pkg_ehsa_homepage = https://github.com/a12n/ehsa
-pkg_ehsa_fetch = git
-pkg_ehsa_repo = https://github.com/a12n/ehsa
-pkg_ehsa_commit = master
diff --git a/index/ej.mk b/index/ej.mk
deleted file mode 100644
index 7342074d1..000000000
--- a/index/ej.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ej
-pkg_ej_name = ej
-pkg_ej_description = Helper module for working with Erlang terms representing JSON
-pkg_ej_homepage = https://github.com/seth/ej
-pkg_ej_fetch = git
-pkg_ej_repo = https://github.com/seth/ej
-pkg_ej_commit = master
diff --git a/index/ejabberd.mk b/index/ejabberd.mk
deleted file mode 100644
index 25ca98358..000000000
--- a/index/ejabberd.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ejabberd
-pkg_ejabberd_name = ejabberd
-pkg_ejabberd_description = Robust, ubiquitous and massively scalable Jabber / XMPP Instant Messaging platform
-pkg_ejabberd_homepage = https://github.com/processone/ejabberd
-pkg_ejabberd_fetch = git
-pkg_ejabberd_repo = https://github.com/processone/ejabberd
-pkg_ejabberd_commit = master
diff --git a/index/ejwt.mk b/index/ejwt.mk
deleted file mode 100644
index ead6a55ca..000000000
--- a/index/ejwt.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ejwt
-pkg_ejwt_name = ejwt
-pkg_ejwt_description = erlang library for JSON Web Token
-pkg_ejwt_homepage = https://github.com/artefactop/ejwt
-pkg_ejwt_fetch = git
-pkg_ejwt_repo = https://github.com/artefactop/ejwt
-pkg_ejwt_commit = master
diff --git a/index/ekaf.mk b/index/ekaf.mk
deleted file mode 100644
index 00707ad05..000000000
--- a/index/ekaf.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ekaf
-pkg_ekaf_name = ekaf
-pkg_ekaf_description = A minimal, high-performance Kafka client in Erlang.
-pkg_ekaf_homepage = https://github.com/helpshift/ekaf
-pkg_ekaf_fetch = git
-pkg_ekaf_repo = https://github.com/helpshift/ekaf
-pkg_ekaf_commit = master
diff --git a/index/elarm.mk b/index/elarm.mk
deleted file mode 100644
index 9d3284450..000000000
--- a/index/elarm.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += elarm
-pkg_elarm_name = elarm
-pkg_elarm_description = Alarm Manager for Erlang.
-pkg_elarm_homepage = https://github.com/esl/elarm
-pkg_elarm_fetch = git
-pkg_elarm_repo = https://github.com/esl/elarm
-pkg_elarm_commit = master
diff --git a/index/eleveldb.mk b/index/eleveldb.mk
deleted file mode 100644
index f562a560e..000000000
--- a/index/eleveldb.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eleveldb
-pkg_eleveldb_name = eleveldb
-pkg_eleveldb_description = Erlang LevelDB API
-pkg_eleveldb_homepage = https://github.com/basho/eleveldb
-pkg_eleveldb_fetch = git
-pkg_eleveldb_repo = https://github.com/basho/eleveldb
-pkg_eleveldb_commit = develop
diff --git a/index/elixir.mk b/index/elixir.mk
deleted file mode 100644
index 818a4d335..000000000
--- a/index/elixir.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += elixir
-pkg_elixir_name = elixir
-pkg_elixir_description = Elixir is a dynamic, functional language designed for building scalable and maintainable applications
-pkg_elixir_homepage = https://elixir-lang.org/
-pkg_elixir_fetch = git
-pkg_elixir_repo = https://github.com/elixir-lang/elixir
-pkg_elixir_commit = main
diff --git a/index/elli.mk b/index/elli.mk
deleted file mode 100644
index 1da1f1c09..000000000
--- a/index/elli.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += elli
-pkg_elli_name = elli
-pkg_elli_description = Simple, robust and performant Erlang web server
-pkg_elli_homepage = https://github.com/elli-lib/elli
-pkg_elli_fetch = git
-pkg_elli_repo = https://github.com/elli-lib/elli
-pkg_elli_commit = main
diff --git a/index/elvis.mk b/index/elvis.mk
deleted file mode 100644
index b9ca83d84..000000000
--- a/index/elvis.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += elvis
-pkg_elvis_name = elvis
-pkg_elvis_description = Erlang Style Reviewer
-pkg_elvis_homepage = https://github.com/inaka/elvis
-pkg_elvis_fetch = git
-pkg_elvis_repo = https://github.com/inaka/elvis
-pkg_elvis_commit = master
diff --git a/index/emagick.mk b/index/emagick.mk
deleted file mode 100644
index 223143edf..000000000
--- a/index/emagick.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += emagick
-pkg_emagick_name = emagick
-pkg_emagick_description = Wrapper for Graphics/ImageMagick command line tool.
-pkg_emagick_homepage = https://github.com/kivra/emagick
-pkg_emagick_fetch = git
-pkg_emagick_repo = https://github.com/kivra/emagick
-pkg_emagick_commit = master
diff --git a/index/enm.mk b/index/enm.mk
deleted file mode 100644
index 91bbd3e62..000000000
--- a/index/enm.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += enm
-pkg_enm_name = enm
-pkg_enm_description = Erlang driver for nanomsg
-pkg_enm_homepage = https://github.com/basho/enm
-pkg_enm_fetch = git
-pkg_enm_repo = https://github.com/basho/enm
-pkg_enm_commit = master
diff --git a/index/entop.mk b/index/entop.mk
deleted file mode 100644
index eda448cf0..000000000
--- a/index/entop.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += entop
-pkg_entop_name = entop
-pkg_entop_description = A top-like tool for monitoring an Erlang node
-pkg_entop_homepage = https://github.com/mazenharake/entop
-pkg_entop_fetch = git
-pkg_entop_repo = https://github.com/mazenharake/entop
-pkg_entop_commit = master
diff --git a/index/epcap.mk b/index/epcap.mk
deleted file mode 100644
index 1db65de8b..000000000
--- a/index/epcap.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += epcap
-pkg_epcap_name = epcap
-pkg_epcap_description = Erlang packet capture interface using pcap
-pkg_epcap_homepage = https://github.com/msantos/epcap
-pkg_epcap_fetch = git
-pkg_epcap_repo = https://github.com/msantos/epcap
-pkg_epcap_commit = master
diff --git a/index/eper.mk b/index/eper.mk
deleted file mode 100644
index cded35eaa..000000000
--- a/index/eper.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eper
-pkg_eper_name = eper
-pkg_eper_description = Erlang performance and debugging tools.
-pkg_eper_homepage = https://github.com/massemanet/eper
-pkg_eper_fetch = git
-pkg_eper_repo = https://github.com/massemanet/eper
-pkg_eper_commit = master
diff --git a/index/epgsql.mk b/index/epgsql.mk
deleted file mode 100644
index 65ea0b644..000000000
--- a/index/epgsql.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += epgsql
-pkg_epgsql_name = epgsql
-pkg_epgsql_description = Erlang PostgreSQL client library.
-pkg_epgsql_homepage = https://github.com/epgsql/epgsql
-pkg_epgsql_fetch = git
-pkg_epgsql_repo = https://github.com/epgsql/epgsql
-pkg_epgsql_commit = master
diff --git a/index/episcina.mk b/index/episcina.mk
deleted file mode 100644
index f12b42046..000000000
--- a/index/episcina.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += episcina
-pkg_episcina_name = episcina
-pkg_episcina_description = A simple non intrusive resource pool for connections
-pkg_episcina_homepage = https://github.com/erlware/episcina
-pkg_episcina_fetch = git
-pkg_episcina_repo = https://github.com/erlware/episcina
-pkg_episcina_commit = master
diff --git a/index/eplot.mk b/index/eplot.mk
deleted file mode 100644
index 301b51a92..000000000
--- a/index/eplot.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eplot
-pkg_eplot_name = eplot
-pkg_eplot_description = A plot engine written in erlang.
-pkg_eplot_homepage = https://github.com/psyeugenic/eplot
-pkg_eplot_fetch = git
-pkg_eplot_repo = https://github.com/psyeugenic/eplot
-pkg_eplot_commit = master
diff --git a/index/epocxy.mk b/index/epocxy.mk
deleted file mode 100644
index 11cbd7f77..000000000
--- a/index/epocxy.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += epocxy
-pkg_epocxy_name = epocxy
-pkg_epocxy_description = Erlang Patterns of Concurrency
-pkg_epocxy_homepage = https://github.com/duomark/epocxy
-pkg_epocxy_fetch = git
-pkg_epocxy_repo = https://github.com/duomark/epocxy
-pkg_epocxy_commit = master
diff --git a/index/epubnub.mk b/index/epubnub.mk
deleted file mode 100644
index 11e0a1231..000000000
--- a/index/epubnub.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += epubnub
-pkg_epubnub_name = epubnub
-pkg_epubnub_description = Erlang PubNub API
-pkg_epubnub_homepage = https://github.com/tsloughter/epubnub
-pkg_epubnub_fetch = git
-pkg_epubnub_repo = https://github.com/tsloughter/epubnub
-pkg_epubnub_commit = master
diff --git a/index/eqm.mk b/index/eqm.mk
deleted file mode 100644
index 138966e55..000000000
--- a/index/eqm.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eqm
-pkg_eqm_name = eqm
-pkg_eqm_description = Erlang pub sub with supply-demand channels
-pkg_eqm_homepage = https://github.com/loucash/eqm
-pkg_eqm_fetch = git
-pkg_eqm_repo = https://github.com/loucash/eqm
-pkg_eqm_commit = master
diff --git a/index/eredis.mk b/index/eredis.mk
deleted file mode 100644
index 6e7a430e8..000000000
--- a/index/eredis.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eredis
-pkg_eredis_name = eredis
-pkg_eredis_description = Erlang Redis client
-pkg_eredis_homepage = https://github.com/wooga/eredis
-pkg_eredis_fetch = git
-pkg_eredis_repo = https://github.com/wooga/eredis
-pkg_eredis_commit = master
diff --git a/index/erl_streams.mk b/index/erl_streams.mk
deleted file mode 100644
index baebaed2d..000000000
--- a/index/erl_streams.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erl_streams
-pkg_erl_streams_name = erl_streams
-pkg_erl_streams_description = Streams in Erlang
-pkg_erl_streams_homepage = https://github.com/epappas/erl_streams
-pkg_erl_streams_fetch = git
-pkg_erl_streams_repo = https://github.com/epappas/erl_streams
-pkg_erl_streams_commit = master
diff --git a/index/erlang_localtime.mk b/index/erlang_localtime.mk
deleted file mode 100644
index 93e23988b..000000000
--- a/index/erlang_localtime.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlang_localtime
-pkg_erlang_localtime_name = erlang_localtime
-pkg_erlang_localtime_description = Erlang library for conversion from one local time to another
-pkg_erlang_localtime_homepage = https://github.com/dmitryme/erlang_localtime
-pkg_erlang_localtime_fetch = git
-pkg_erlang_localtime_repo = https://github.com/dmitryme/erlang_localtime
-pkg_erlang_localtime_commit = master
diff --git a/index/erlang_smtp.mk b/index/erlang_smtp.mk
deleted file mode 100644
index 2d5c0fe38..000000000
--- a/index/erlang_smtp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlang_smtp
-pkg_erlang_smtp_name = erlang_smtp
-pkg_erlang_smtp_description = Erlang SMTP and POP3 server code.
-pkg_erlang_smtp_homepage = https://github.com/tonyg/erlang-smtp
-pkg_erlang_smtp_fetch = git
-pkg_erlang_smtp_repo = https://github.com/tonyg/erlang-smtp
-pkg_erlang_smtp_commit = master
diff --git a/index/erlang_term.mk b/index/erlang_term.mk
deleted file mode 100644
index c93b92d3b..000000000
--- a/index/erlang_term.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlang_term
-pkg_erlang_term_name = erlang_term
-pkg_erlang_term_description = Erlang Term Info
-pkg_erlang_term_homepage = https://github.com/okeuday/erlang_term
-pkg_erlang_term_fetch = git
-pkg_erlang_term_repo = https://github.com/okeuday/erlang_term
-pkg_erlang_term_commit = master
diff --git a/index/erlastic_search.mk b/index/erlastic_search.mk
deleted file mode 100644
index 4d7313f4e..000000000
--- a/index/erlastic_search.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlastic_search
-pkg_erlastic_search_name = erlastic_search
-pkg_erlastic_search_description = An Erlang app for communicating with Elastic Search's rest interface.
-pkg_erlastic_search_homepage = https://github.com/tsloughter/erlastic_search
-pkg_erlastic_search_fetch = git
-pkg_erlastic_search_repo = https://github.com/tsloughter/erlastic_search
-pkg_erlastic_search_commit = master
diff --git a/index/erlbrake.mk b/index/erlbrake.mk
deleted file mode 100644
index 090b57cdf..000000000
--- a/index/erlbrake.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlbrake
-pkg_erlbrake_name = erlbrake
-pkg_erlbrake_description = Erlang Airbrake notification client
-pkg_erlbrake_homepage = https://github.com/kenpratt/erlbrake
-pkg_erlbrake_fetch = git
-pkg_erlbrake_repo = https://github.com/kenpratt/erlbrake
-pkg_erlbrake_commit = master
diff --git a/index/erlcloud.mk b/index/erlcloud.mk
deleted file mode 100644
index 91c4ef3ea..000000000
--- a/index/erlcloud.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlcloud
-pkg_erlcloud_name = erlcloud
-pkg_erlcloud_description = Cloud Computing library for erlang (Amazon EC2, S3, SQS, SimpleDB, Mechanical Turk, ELB)
-pkg_erlcloud_homepage = https://github.com/gleber/erlcloud
-pkg_erlcloud_fetch = git
-pkg_erlcloud_repo = https://github.com/gleber/erlcloud
-pkg_erlcloud_commit = master
diff --git a/index/erlcron.mk b/index/erlcron.mk
deleted file mode 100644
index 8495a6502..000000000
--- a/index/erlcron.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlcron
-pkg_erlcron_name = erlcron
-pkg_erlcron_description = Erlang cronish system
-pkg_erlcron_homepage = https://github.com/erlware/erlcron
-pkg_erlcron_fetch = git
-pkg_erlcron_repo = https://github.com/erlware/erlcron
-pkg_erlcron_commit = master
diff --git a/index/erldb.mk b/index/erldb.mk
deleted file mode 100644
index 3f55506d2..000000000
--- a/index/erldb.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erldb
-pkg_erldb_name = erldb
-pkg_erldb_description = ORM (Object-relational mapping) application implemented in Erlang
-pkg_erldb_homepage = http://erldb.org
-pkg_erldb_fetch = git
-pkg_erldb_repo = https://github.com/erldb/erldb
-pkg_erldb_commit = master
diff --git a/index/erldis.mk b/index/erldis.mk
deleted file mode 100644
index f6386990c..000000000
--- a/index/erldis.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erldis
-pkg_erldis_name = erldis
-pkg_erldis_description = redis erlang client library
-pkg_erldis_homepage = https://github.com/cstar/erldis
-pkg_erldis_fetch = git
-pkg_erldis_repo = https://github.com/cstar/erldis
-pkg_erldis_commit = master
diff --git a/index/erldns.mk b/index/erldns.mk
deleted file mode 100644
index 2d4bf5b99..000000000
--- a/index/erldns.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erldns
-pkg_erldns_name = erldns
-pkg_erldns_description = DNS server, in erlang.
-pkg_erldns_homepage = https://github.com/aetrion/erl-dns
-pkg_erldns_fetch = git
-pkg_erldns_repo = https://github.com/aetrion/erl-dns
-pkg_erldns_commit = main
diff --git a/index/erldocker.mk b/index/erldocker.mk
deleted file mode 100644
index d49c47dae..000000000
--- a/index/erldocker.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erldocker
-pkg_erldocker_name = erldocker
-pkg_erldocker_description = Docker Remote API client for Erlang
-pkg_erldocker_homepage = https://github.com/proger/erldocker
-pkg_erldocker_fetch = git
-pkg_erldocker_repo = https://github.com/proger/erldocker
-pkg_erldocker_commit = master
diff --git a/index/erlfsmon.mk b/index/erlfsmon.mk
deleted file mode 100644
index eb13fc2ef..000000000
--- a/index/erlfsmon.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlfsmon
-pkg_erlfsmon_name = erlfsmon
-pkg_erlfsmon_description = Erlang filesystem event watcher for Linux and OSX
-pkg_erlfsmon_homepage = https://github.com/proger/erlfsmon
-pkg_erlfsmon_fetch = git
-pkg_erlfsmon_repo = https://github.com/proger/erlfsmon
-pkg_erlfsmon_commit = master
diff --git a/index/erlgit.mk b/index/erlgit.mk
deleted file mode 100644
index 0e6edcf5a..000000000
--- a/index/erlgit.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlgit
-pkg_erlgit_name = erlgit
-pkg_erlgit_description = Erlang convenience wrapper around git executable
-pkg_erlgit_homepage = https://github.com/gleber/erlgit
-pkg_erlgit_fetch = git
-pkg_erlgit_repo = https://github.com/gleber/erlgit
-pkg_erlgit_commit = master
diff --git a/index/erlguten.mk b/index/erlguten.mk
deleted file mode 100644
index ca3bdfc4b..000000000
--- a/index/erlguten.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlguten
-pkg_erlguten_name = erlguten
-pkg_erlguten_description = ErlGuten is a system for high-quality typesetting, written purely in Erlang.
-pkg_erlguten_homepage = https://github.com/richcarl/erlguten
-pkg_erlguten_fetch = git
-pkg_erlguten_repo = https://github.com/richcarl/erlguten
-pkg_erlguten_commit = master
diff --git a/index/erlmc.mk b/index/erlmc.mk
deleted file mode 100644
index 79ea26803..000000000
--- a/index/erlmc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlmc
-pkg_erlmc_name = erlmc
-pkg_erlmc_description = Erlang memcached binary protocol client
-pkg_erlmc_homepage = https://github.com/jkvor/erlmc
-pkg_erlmc_fetch = git
-pkg_erlmc_repo = https://github.com/jkvor/erlmc
-pkg_erlmc_commit = master
diff --git a/index/erlmongo.mk b/index/erlmongo.mk
deleted file mode 100644
index dc8da8038..000000000
--- a/index/erlmongo.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlmongo
-pkg_erlmongo_name = erlmongo
-pkg_erlmongo_description = Record based Erlang driver for MongoDB with gridfs support
-pkg_erlmongo_homepage = https://github.com/SergejJurecko/erlmongo
-pkg_erlmongo_fetch = git
-pkg_erlmongo_repo = https://github.com/SergejJurecko/erlmongo
-pkg_erlmongo_commit = master
diff --git a/index/erlog.mk b/index/erlog.mk
deleted file mode 100644
index c605fd381..000000000
--- a/index/erlog.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlog
-pkg_erlog_name = erlog
-pkg_erlog_description = Prolog interpreter in and for Erlang
-pkg_erlog_homepage = https://github.com/rvirding/erlog
-pkg_erlog_fetch = git
-pkg_erlog_repo = https://github.com/rvirding/erlog
-pkg_erlog_commit = master
diff --git a/index/erlpass.mk b/index/erlpass.mk
deleted file mode 100644
index 1c587000b..000000000
--- a/index/erlpass.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlpass
-pkg_erlpass_name = erlpass
-pkg_erlpass_description = A library to handle password hashing and changing in a safe manner, independent from any kind of storage whatsoever.
-pkg_erlpass_homepage = https://github.com/ferd/erlpass
-pkg_erlpass_fetch = git
-pkg_erlpass_repo = https://github.com/ferd/erlpass
-pkg_erlpass_commit = master
diff --git a/index/erlsh.mk b/index/erlsh.mk
deleted file mode 100644
index 28bdc75d2..000000000
--- a/index/erlsh.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlsh
-pkg_erlsh_name = erlsh
-pkg_erlsh_description = Erlang shell tools
-pkg_erlsh_homepage = https://github.com/proger/erlsh
-pkg_erlsh_fetch = git
-pkg_erlsh_repo = https://github.com/proger/erlsh
-pkg_erlsh_commit = master
diff --git a/index/erlsha2.mk b/index/erlsha2.mk
deleted file mode 100644
index 7f39a96b3..000000000
--- a/index/erlsha2.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlsha2
-pkg_erlsha2_name = erlsha2
-pkg_erlsha2_description = SHA-224, SHA-256, SHA-384, SHA-512 implemented in Erlang NIFs.
-pkg_erlsha2_homepage = https://github.com/vinoski/erlsha2
-pkg_erlsha2_fetch = git
-pkg_erlsha2_repo = https://github.com/vinoski/erlsha2
-pkg_erlsha2_commit = master
diff --git a/index/erlsom.mk b/index/erlsom.mk
deleted file mode 100644
index 0cf900c27..000000000
--- a/index/erlsom.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlsom
-pkg_erlsom_name = erlsom
-pkg_erlsom_description = XML parser for Erlang
-pkg_erlsom_homepage = https://github.com/willemdj/erlsom
-pkg_erlsom_fetch = git
-pkg_erlsom_repo = https://github.com/willemdj/erlsom
-pkg_erlsom_commit = master
diff --git a/index/erlubi.mk b/index/erlubi.mk
deleted file mode 100644
index c896e9f80..000000000
--- a/index/erlubi.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlubi
-pkg_erlubi_name = erlubi
-pkg_erlubi_description = Ubigraph Erlang Client (and Process Visualizer)
-pkg_erlubi_homepage = https://github.com/krestenkrab/erlubi
-pkg_erlubi_fetch = git
-pkg_erlubi_repo = https://github.com/krestenkrab/erlubi
-pkg_erlubi_commit = master
diff --git a/index/erlvolt.mk b/index/erlvolt.mk
deleted file mode 100644
index f0edda3ba..000000000
--- a/index/erlvolt.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlvolt
-pkg_erlvolt_name = erlvolt
-pkg_erlvolt_description = VoltDB Erlang Client Driver
-pkg_erlvolt_homepage = https://github.com/VoltDB/voltdb-client-erlang
-pkg_erlvolt_fetch = git
-pkg_erlvolt_repo = https://github.com/VoltDB/voltdb-client-erlang
-pkg_erlvolt_commit = master
diff --git a/index/erlware_commons.mk b/index/erlware_commons.mk
deleted file mode 100644
index 4ef76a59e..000000000
--- a/index/erlware_commons.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erlware_commons
-pkg_erlware_commons_name = erlware_commons
-pkg_erlware_commons_description = Erlware Commons is an Erlware project focused on all aspects of reusable Erlang components.
-pkg_erlware_commons_homepage = https://github.com/erlware/erlware_commons
-pkg_erlware_commons_fetch = git
-pkg_erlware_commons_repo = https://github.com/erlware/erlware_commons
-pkg_erlware_commons_commit = master
diff --git a/index/errd.mk b/index/errd.mk
deleted file mode 100644
index e43240543..000000000
--- a/index/errd.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += errd
-pkg_errd_name = errd
-pkg_errd_description = Erlang RRDTool library
-pkg_errd_homepage = https://github.com/archaelus/errd
-pkg_errd_fetch = git
-pkg_errd_repo = https://github.com/archaelus/errd
-pkg_errd_commit = master
diff --git a/index/erserve.mk b/index/erserve.mk
deleted file mode 100644
index cdbc84a4e..000000000
--- a/index/erserve.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += erserve
-pkg_erserve_name = erserve
-pkg_erserve_description = Erlang/Rserve communication interface
-pkg_erserve_homepage = https://github.com/del/erserve
-pkg_erserve_fetch = git
-pkg_erserve_repo = https://github.com/del/erserve
-pkg_erserve_commit = master
diff --git a/index/escalus.mk b/index/escalus.mk
deleted file mode 100644
index bac125362..000000000
--- a/index/escalus.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += escalus
-pkg_escalus_name = escalus
-pkg_escalus_description = An XMPP client library in Erlang for conveniently testing XMPP servers
-pkg_escalus_homepage = https://github.com/esl/escalus
-pkg_escalus_fetch = git
-pkg_escalus_repo = https://github.com/esl/escalus
-pkg_escalus_commit = master
diff --git a/index/esh_mk.mk b/index/esh_mk.mk
deleted file mode 100644
index 4bd44cf55..000000000
--- a/index/esh_mk.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += esh_mk
-pkg_esh_mk_name = esh_mk
-pkg_esh_mk_description = esh template engine plugin for erlang.mk
-pkg_esh_mk_homepage = https://github.com/crownedgrouse/esh.mk
-pkg_esh_mk_fetch = git
-pkg_esh_mk_repo = https://github.com/crownedgrouse/esh.mk.git
-pkg_esh_mk_commit = master
diff --git a/index/espec.mk b/index/espec.mk
deleted file mode 100644
index 1f10ef1af..000000000
--- a/index/espec.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += espec
-pkg_espec_name = espec
-pkg_espec_description = ESpec: Behaviour driven development framework for Erlang
-pkg_espec_homepage = https://github.com/lucaspiller/espec
-pkg_espec_fetch = git
-pkg_espec_repo = https://github.com/lucaspiller/espec
-pkg_espec_commit = master
diff --git a/index/estatsd.mk b/index/estatsd.mk
deleted file mode 100644
index 478be09c1..000000000
--- a/index/estatsd.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += estatsd
-pkg_estatsd_name = estatsd
-pkg_estatsd_description = Erlang stats aggregation app that periodically flushes data to graphite
-pkg_estatsd_homepage = https://github.com/RJ/estatsd
-pkg_estatsd_fetch = git
-pkg_estatsd_repo = https://github.com/RJ/estatsd
-pkg_estatsd_commit = master
diff --git a/index/etap.mk b/index/etap.mk
deleted file mode 100644
index 10679ce90..000000000
--- a/index/etap.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += etap
-pkg_etap_name = etap
-pkg_etap_description = etap is a simple erlang testing library that provides TAP compliant output.
-pkg_etap_homepage = https://github.com/ngerakines/etap
-pkg_etap_fetch = git
-pkg_etap_repo = https://github.com/ngerakines/etap
-pkg_etap_commit = master
diff --git a/index/etest.mk b/index/etest.mk
deleted file mode 100644
index 371a82160..000000000
--- a/index/etest.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += etest
-pkg_etest_name = etest
-pkg_etest_description = A lightweight, convention over configuration test framework for Erlang
-pkg_etest_homepage = https://github.com/wooga/etest
-pkg_etest_fetch = git
-pkg_etest_repo = https://github.com/wooga/etest
-pkg_etest_commit = master
diff --git a/index/etest_http.mk b/index/etest_http.mk
deleted file mode 100644
index d6065a1f3..000000000
--- a/index/etest_http.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += etest_http
-pkg_etest_http_name = etest_http
-pkg_etest_http_description = etest Assertions around HTTP (client-side)
-pkg_etest_http_homepage = https://github.com/wooga/etest_http
-pkg_etest_http_fetch = git
-pkg_etest_http_repo = https://github.com/wooga/etest_http
-pkg_etest_http_commit = master
diff --git a/index/etoml.mk b/index/etoml.mk
deleted file mode 100644
index 75b89857a..000000000
--- a/index/etoml.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += etoml
-pkg_etoml_name = etoml
-pkg_etoml_description = TOML language erlang parser
-pkg_etoml_homepage = https://github.com/kalta/etoml
-pkg_etoml_fetch = git
-pkg_etoml_repo = https://github.com/kalta/etoml
-pkg_etoml_commit = master
diff --git a/index/eunit.mk b/index/eunit.mk
deleted file mode 100644
index 958645f43..000000000
--- a/index/eunit.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eunit
-pkg_eunit_name = eunit
-pkg_eunit_description = The EUnit lightweight unit testing framework for Erlang - this is the canonical development repository.
-pkg_eunit_homepage = https://github.com/richcarl/eunit
-pkg_eunit_fetch = git
-pkg_eunit_repo = https://github.com/richcarl/eunit
-pkg_eunit_commit = master
diff --git a/index/eunit_formatters.mk b/index/eunit_formatters.mk
deleted file mode 100644
index 73cb28bfc..000000000
--- a/index/eunit_formatters.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += eunit_formatters
-pkg_eunit_formatters_name = eunit_formatters
-pkg_eunit_formatters_description = Because eunit's output sucks. Let's make it better.
-pkg_eunit_formatters_homepage = https://github.com/seancribbs/eunit_formatters
-pkg_eunit_formatters_fetch = git
-pkg_eunit_formatters_repo = https://github.com/seancribbs/eunit_formatters
-pkg_eunit_formatters_commit = master
diff --git a/index/euthanasia.mk b/index/euthanasia.mk
deleted file mode 100644
index 7daf5045b..000000000
--- a/index/euthanasia.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += euthanasia
-pkg_euthanasia_name = euthanasia
-pkg_euthanasia_description = Merciful killer for your Erlang processes
-pkg_euthanasia_homepage = https://github.com/doubleyou/euthanasia
-pkg_euthanasia_fetch = git
-pkg_euthanasia_repo = https://github.com/doubleyou/euthanasia
-pkg_euthanasia_commit = master
diff --git a/index/evum.mk b/index/evum.mk
deleted file mode 100644
index 0044582c7..000000000
--- a/index/evum.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += evum
-pkg_evum_name = evum
-pkg_evum_description = Spawn Linux VMs as Erlang processes in the Erlang VM
-pkg_evum_homepage = https://github.com/msantos/evum
-pkg_evum_fetch = git
-pkg_evum_repo = https://github.com/msantos/evum
-pkg_evum_commit = master
diff --git a/index/exec.mk b/index/exec.mk
deleted file mode 100644
index 2a05c420d..000000000
--- a/index/exec.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += exec
-pkg_exec_name = erlexec
-pkg_exec_description = Execute and control OS processes from Erlang/OTP.
-pkg_exec_homepage = http://saleyn.github.com/erlexec
-pkg_exec_fetch = git
-pkg_exec_repo = https://github.com/saleyn/erlexec
-pkg_exec_commit = master
diff --git a/index/exml.mk b/index/exml.mk
deleted file mode 100644
index d43a6407c..000000000
--- a/index/exml.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += exml
-pkg_exml_name = exml
-pkg_exml_description = XML parsing library in Erlang
-pkg_exml_homepage = https://github.com/paulgray/exml
-pkg_exml_fetch = git
-pkg_exml_repo = https://github.com/paulgray/exml
-pkg_exml_commit = master
diff --git a/index/exometer.mk b/index/exometer.mk
deleted file mode 100644
index a579d9700..000000000
--- a/index/exometer.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += exometer
-pkg_exometer_name = exometer
-pkg_exometer_description = Basic measurement objects and probe behavior
-pkg_exometer_homepage = https://github.com/Feuerlabs/exometer
-pkg_exometer_fetch = git
-pkg_exometer_repo = https://github.com/Feuerlabs/exometer
-pkg_exometer_commit = master
diff --git a/index/exs1024.mk b/index/exs1024.mk
deleted file mode 100644
index 1bc33b7e5..000000000
--- a/index/exs1024.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += exs1024
-pkg_exs1024_name = exs1024
-pkg_exs1024_description = Xorshift1024star pseudo random number generator for Erlang.
-pkg_exs1024_homepage = https://github.com/jj1bdx/exs1024
-pkg_exs1024_fetch = git
-pkg_exs1024_repo = https://github.com/jj1bdx/exs1024
-pkg_exs1024_commit = master
diff --git a/index/exsplus116.mk b/index/exsplus116.mk
deleted file mode 100644
index db6b52e9e..000000000
--- a/index/exsplus116.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += exsplus116
-pkg_exsplus116_name = exsplus116
-pkg_exsplus116_description = Xorshift116plus for Erlang
-pkg_exsplus116_homepage = https://github.com/jj1bdx/exsplus116
-pkg_exsplus116_fetch = git
-pkg_exsplus116_repo = https://github.com/jj1bdx/exsplus116
-pkg_exsplus116_commit = master
diff --git a/index/ezmtp.mk b/index/ezmtp.mk
deleted file mode 100644
index bbcbbc1a8..000000000
--- a/index/ezmtp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ezmtp
-pkg_ezmtp_name = ezmtp
-pkg_ezmtp_description = ZMTP protocol in pure Erlang.
-pkg_ezmtp_homepage = https://github.com/a13x/ezmtp
-pkg_ezmtp_fetch = git
-pkg_ezmtp_repo = https://github.com/a13x/ezmtp
-pkg_ezmtp_commit = master
diff --git a/index/fast_disk_log.mk b/index/fast_disk_log.mk
deleted file mode 100644
index 26f63caf7..000000000
--- a/index/fast_disk_log.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += fast_disk_log
-pkg_fast_disk_log_name = fast_disk_log
-pkg_fast_disk_log_description = Pool-based asynchronous Erlang disk logger
-pkg_fast_disk_log_homepage = https://github.com/lpgauth/fast_disk_log
-pkg_fast_disk_log_fetch = git
-pkg_fast_disk_log_repo = https://github.com/lpgauth/fast_disk_log
-pkg_fast_disk_log_commit = master
diff --git a/index/feeder.mk b/index/feeder.mk
deleted file mode 100644
index 38cc4bcf8..000000000
--- a/index/feeder.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += feeder
-pkg_feeder_name = feeder
-pkg_feeder_description = Stream parse RSS and Atom formatted XML feeds.
-pkg_feeder_homepage = https://github.com/michaelnisi/feeder
-pkg_feeder_fetch = git
-pkg_feeder_repo = https://github.com/michaelnisi/feeder
-pkg_feeder_commit = master
diff --git a/index/find_crate.mk b/index/find_crate.mk
deleted file mode 100644
index 0d2a851bf..000000000
--- a/index/find_crate.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += find_crate
-pkg_find_crate_name = find_crate
-pkg_find_crate_description = Find Rust libs and exes in Erlang application priv directory
-pkg_find_crate_homepage = https://github.com/goertzenator/find_crate
-pkg_find_crate_fetch = git
-pkg_find_crate_repo = https://github.com/goertzenator/find_crate
-pkg_find_crate_commit = master
diff --git a/index/fix.mk b/index/fix.mk
deleted file mode 100644
index 332067d54..000000000
--- a/index/fix.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += fix
-pkg_fix_name = fix
-pkg_fix_description = http://fixprotocol.org/ implementation.
-pkg_fix_homepage = https://github.com/maxlapshin/fix
-pkg_fix_fetch = git
-pkg_fix_repo = https://github.com/maxlapshin/fix
-pkg_fix_commit = master
diff --git a/index/flower.mk b/index/flower.mk
deleted file mode 100644
index 4ba08c58a..000000000
--- a/index/flower.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += flower
-pkg_flower_name = flower
-pkg_flower_description = FlowER - a Erlang OpenFlow development platform
-pkg_flower_homepage = https://github.com/travelping/flower
-pkg_flower_fetch = git
-pkg_flower_repo = https://github.com/travelping/flower
-pkg_flower_commit = master
diff --git a/index/fn.mk b/index/fn.mk
deleted file mode 100644
index a937cb53b..000000000
--- a/index/fn.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += fn
-pkg_fn_name = fn
-pkg_fn_description = Function utilities for Erlang
-pkg_fn_homepage = https://github.com/reiddraper/fn
-pkg_fn_fetch = git
-pkg_fn_repo = https://github.com/reiddraper/fn
-pkg_fn_commit = master
diff --git a/index/folsom.mk b/index/folsom.mk
deleted file mode 100644
index 487b22cdf..000000000
--- a/index/folsom.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += folsom
-pkg_folsom_name = folsom
-pkg_folsom_description = Expose Erlang Events and Metrics
-pkg_folsom_homepage = https://github.com/boundary/folsom
-pkg_folsom_fetch = git
-pkg_folsom_repo = https://github.com/boundary/folsom
-pkg_folsom_commit = master
diff --git a/index/folsom_cowboy.mk b/index/folsom_cowboy.mk
deleted file mode 100644
index c0af8b10f..000000000
--- a/index/folsom_cowboy.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += folsom_cowboy
-pkg_folsom_cowboy_name = folsom_cowboy
-pkg_folsom_cowboy_description = A Cowboy based Folsom HTTP Wrapper.
-pkg_folsom_cowboy_homepage = https://github.com/boundary/folsom_cowboy
-pkg_folsom_cowboy_fetch = git
-pkg_folsom_cowboy_repo = https://github.com/boundary/folsom_cowboy
-pkg_folsom_cowboy_commit = master
diff --git a/index/fs.mk b/index/fs.mk
deleted file mode 100644
index 2316c2859..000000000
--- a/index/fs.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += fs
-pkg_fs_name = fs
-pkg_fs_description = Erlang FileSystem Listener
-pkg_fs_homepage = https://github.com/synrc/fs
-pkg_fs_fetch = git
-pkg_fs_repo = https://github.com/synrc/fs
-pkg_fs_commit = master
diff --git a/index/fuse.mk b/index/fuse.mk
deleted file mode 100644
index 2841c34e0..000000000
--- a/index/fuse.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += fuse
-pkg_fuse_name = fuse
-pkg_fuse_description = A Circuit Breaker for Erlang
-pkg_fuse_homepage = https://github.com/jlouis/fuse
-pkg_fuse_fetch = git
-pkg_fuse_repo = https://github.com/jlouis/fuse
-pkg_fuse_commit = master
diff --git a/index/gcm.mk b/index/gcm.mk
deleted file mode 100644
index 6831fe571..000000000
--- a/index/gcm.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gcm
-pkg_gcm_name = gcm
-pkg_gcm_description = An Erlang application for Google Cloud Messaging
-pkg_gcm_homepage = https://github.com/pdincau/gcm-erlang
-pkg_gcm_fetch = git
-pkg_gcm_repo = https://github.com/pdincau/gcm-erlang
-pkg_gcm_commit = master
diff --git a/index/gcprof.mk b/index/gcprof.mk
deleted file mode 100644
index ac5de76a2..000000000
--- a/index/gcprof.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gcprof
-pkg_gcprof_name = gcprof
-pkg_gcprof_description = Garbage Collection profiler for Erlang
-pkg_gcprof_homepage = https://github.com/knutin/gcprof
-pkg_gcprof_fetch = git
-pkg_gcprof_repo = https://github.com/knutin/gcprof
-pkg_gcprof_commit = master
diff --git a/index/geas.mk b/index/geas.mk
deleted file mode 100644
index e3d5ad85f..000000000
--- a/index/geas.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += geas
-pkg_geas_name = geas
-pkg_geas_description = Guess Erlang Application Scattering
-pkg_geas_homepage = https://github.com/crownedgrouse/geas
-pkg_geas_fetch = git
-pkg_geas_repo = https://github.com/crownedgrouse/geas
-pkg_geas_commit = master
diff --git a/index/geef.mk b/index/geef.mk
deleted file mode 100644
index af38dbcdd..000000000
--- a/index/geef.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += geef
-pkg_geef_name = geef
-pkg_geef_description = Git NEEEEF (Erlang NIF)
-pkg_geef_homepage = https://github.com/carlosmn/geef
-pkg_geef_fetch = git
-pkg_geef_repo = https://github.com/carlosmn/geef
-pkg_geef_commit = master
diff --git a/index/gen_coap.mk b/index/gen_coap.mk
deleted file mode 100644
index 58c9799d0..000000000
--- a/index/gen_coap.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_coap
-pkg_gen_coap_name = gen_coap
-pkg_gen_coap_description = Generic Erlang CoAP Client/Server
-pkg_gen_coap_homepage = https://github.com/gotthardp/gen_coap
-pkg_gen_coap_fetch = git
-pkg_gen_coap_repo = https://github.com/gotthardp/gen_coap
-pkg_gen_coap_commit = master
diff --git a/index/gen_cycle.mk b/index/gen_cycle.mk
deleted file mode 100644
index 2a5d91f8a..000000000
--- a/index/gen_cycle.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_cycle
-pkg_gen_cycle_name = gen_cycle
-pkg_gen_cycle_description = Simple, generic OTP behaviour for recurring tasks
-pkg_gen_cycle_homepage = https://github.com/aerosol/gen_cycle
-pkg_gen_cycle_fetch = git
-pkg_gen_cycle_repo = https://github.com/aerosol/gen_cycle
-pkg_gen_cycle_commit = develop
diff --git a/index/gen_icmp.mk b/index/gen_icmp.mk
deleted file mode 100644
index c2a2225d5..000000000
--- a/index/gen_icmp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_icmp
-pkg_gen_icmp_name = gen_icmp
-pkg_gen_icmp_description = Erlang interface to ICMP sockets
-pkg_gen_icmp_homepage = https://github.com/msantos/gen_icmp
-pkg_gen_icmp_fetch = git
-pkg_gen_icmp_repo = https://github.com/msantos/gen_icmp
-pkg_gen_icmp_commit = master
diff --git a/index/gen_leader.mk b/index/gen_leader.mk
deleted file mode 100644
index 9eb495466..000000000
--- a/index/gen_leader.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_leader
-pkg_gen_leader_name = gen_leader
-pkg_gen_leader_description = leader election behavior
-pkg_gen_leader_homepage = https://github.com/garret-smith/gen_leader_revival
-pkg_gen_leader_fetch = git
-pkg_gen_leader_repo = https://github.com/garret-smith/gen_leader_revival
-pkg_gen_leader_commit = master
diff --git a/index/gen_nb_server.mk b/index/gen_nb_server.mk
deleted file mode 100644
index 8746b8f6b..000000000
--- a/index/gen_nb_server.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_nb_server
-pkg_gen_nb_server_name = gen_nb_server
-pkg_gen_nb_server_description = OTP behavior for writing non-blocking servers
-pkg_gen_nb_server_homepage = https://github.com/kevsmith/gen_nb_server
-pkg_gen_nb_server_fetch = git
-pkg_gen_nb_server_repo = https://github.com/kevsmith/gen_nb_server
-pkg_gen_nb_server_commit = master
diff --git a/index/gen_paxos.mk b/index/gen_paxos.mk
deleted file mode 100644
index 94d5803b9..000000000
--- a/index/gen_paxos.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_paxos
-pkg_gen_paxos_name = gen_paxos
-pkg_gen_paxos_description = An Erlang/OTP-style implementation of the PAXOS distributed consensus protocol
-pkg_gen_paxos_homepage = https://github.com/gburd/gen_paxos
-pkg_gen_paxos_fetch = git
-pkg_gen_paxos_repo = https://github.com/gburd/gen_paxos
-pkg_gen_paxos_commit = master
diff --git a/index/gen_rpc.mk b/index/gen_rpc.mk
deleted file mode 100644
index d5b07b4ae..000000000
--- a/index/gen_rpc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_rpc
-pkg_gen_rpc_name = gen_rpc
-pkg_gen_rpc_description = A scalable RPC library for Erlang-VM based languages
-pkg_gen_rpc_homepage = https://github.com/priestjim/gen_rpc.git
-pkg_gen_rpc_fetch = git
-pkg_gen_rpc_repo = https://github.com/priestjim/gen_rpc.git
-pkg_gen_rpc_commit = master
diff --git a/index/gen_smtp.mk b/index/gen_smtp.mk
deleted file mode 100644
index a3e31963b..000000000
--- a/index/gen_smtp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_smtp
-pkg_gen_smtp_name = gen_smtp
-pkg_gen_smtp_description = A generic Erlang SMTP server and client that can be extended via callback modules
-pkg_gen_smtp_homepage = https://github.com/Vagabond/gen_smtp
-pkg_gen_smtp_fetch = git
-pkg_gen_smtp_repo = https://github.com/Vagabond/gen_smtp
-pkg_gen_smtp_commit = master
diff --git a/index/gen_tracker.mk b/index/gen_tracker.mk
deleted file mode 100644
index e9c80bda3..000000000
--- a/index/gen_tracker.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_tracker
-pkg_gen_tracker_name = gen_tracker
-pkg_gen_tracker_description = supervisor with ets handling of children and their metadata
-pkg_gen_tracker_homepage = https://github.com/erlyvideo/gen_tracker
-pkg_gen_tracker_fetch = git
-pkg_gen_tracker_repo = https://github.com/erlyvideo/gen_tracker
-pkg_gen_tracker_commit = master
diff --git a/index/gen_unix.mk b/index/gen_unix.mk
deleted file mode 100644
index d61a85c30..000000000
--- a/index/gen_unix.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gen_unix
-pkg_gen_unix_name = gen_unix
-pkg_gen_unix_description = Erlang Unix socket interface
-pkg_gen_unix_homepage = https://github.com/msantos/gen_unix
-pkg_gen_unix_fetch = git
-pkg_gen_unix_repo = https://github.com/msantos/gen_unix
-pkg_gen_unix_commit = master
diff --git a/index/geode.mk b/index/geode.mk
deleted file mode 100644
index 4eaec341f..000000000
--- a/index/geode.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += geode
-pkg_geode_name = geode
-pkg_geode_description = geohash/proximity lookup in pure, uncut erlang.
-pkg_geode_homepage = https://github.com/bradfordw/geode
-pkg_geode_fetch = git
-pkg_geode_repo = https://github.com/bradfordw/geode
-pkg_geode_commit = master
diff --git a/index/getopt.mk b/index/getopt.mk
deleted file mode 100644
index 0419e13a0..000000000
--- a/index/getopt.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += getopt
-pkg_getopt_name = getopt
-pkg_getopt_description = Module to parse command line arguments using the GNU getopt syntax
-pkg_getopt_homepage = https://github.com/jcomellas/getopt
-pkg_getopt_fetch = git
-pkg_getopt_repo = https://github.com/jcomellas/getopt
-pkg_getopt_commit = master
diff --git a/index/gettext.mk b/index/gettext.mk
deleted file mode 100644
index 1273f508a..000000000
--- a/index/gettext.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gettext
-pkg_gettext_name = gettext
-pkg_gettext_description = Erlang internationalization library.
-pkg_gettext_homepage = https://github.com/etnt/gettext
-pkg_gettext_fetch = git
-pkg_gettext_repo = https://github.com/etnt/gettext
-pkg_gettext_commit = master
diff --git a/index/giallo.mk b/index/giallo.mk
deleted file mode 100644
index 6fbd1b62f..000000000
--- a/index/giallo.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += giallo
-pkg_giallo_name = giallo
-pkg_giallo_description = Small and flexible web framework on top of Cowboy
-pkg_giallo_homepage = https://github.com/kivra/giallo
-pkg_giallo_fetch = git
-pkg_giallo_repo = https://github.com/kivra/giallo
-pkg_giallo_commit = master
diff --git a/index/gin.mk b/index/gin.mk
deleted file mode 100644
index ace94047a..000000000
--- a/index/gin.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gin
-pkg_gin_name = gin
-pkg_gin_description = The guards  and  for Erlang parse_transform
-pkg_gin_homepage = https://github.com/mad-cocktail/gin
-pkg_gin_fetch = git
-pkg_gin_repo = https://github.com/mad-cocktail/gin
-pkg_gin_commit = master
diff --git a/index/gitty.mk b/index/gitty.mk
deleted file mode 100644
index 6a7e6ae26..000000000
--- a/index/gitty.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gitty
-pkg_gitty_name = gitty
-pkg_gitty_description = Git access in erlang
-pkg_gitty_homepage = https://github.com/maxlapshin/gitty
-pkg_gitty_fetch = git
-pkg_gitty_repo = https://github.com/maxlapshin/gitty
-pkg_gitty_commit = master
diff --git a/index/gproc.mk b/index/gproc.mk
deleted file mode 100644
index 8ca84aef6..000000000
--- a/index/gproc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += gproc
-pkg_gproc_name = gproc
-pkg_gproc_description = Extended process registry for Erlang
-pkg_gproc_homepage = https://github.com/uwiger/gproc
-pkg_gproc_fetch = git
-pkg_gproc_repo = https://github.com/uwiger/gproc
-pkg_gproc_commit = master
diff --git a/index/grapherl.mk b/index/grapherl.mk
deleted file mode 100644
index cf1fcc91b..000000000
--- a/index/grapherl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += grapherl
-pkg_grapherl_name = grapherl
-pkg_grapherl_description = Create graphs of Erlang systems and programs
-pkg_grapherl_homepage = https://github.com/eproxus/grapherl
-pkg_grapherl_fetch = git
-pkg_grapherl_repo = https://github.com/eproxus/grapherl
-pkg_grapherl_commit = master
diff --git a/index/grpc.mk b/index/grpc.mk
deleted file mode 100644
index 1bb3fd764..000000000
--- a/index/grpc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += grpc
-pkg_grpc_name = grpc
-pkg_grpc_description = gRPC server in Erlang
-pkg_grpc_homepage = https://github.com/Bluehouse-Technology/grpc
-pkg_grpc_fetch = git
-pkg_grpc_repo = https://github.com/Bluehouse-Technology/grpc
-pkg_grpc_commit = master
diff --git a/index/grpc_client.mk b/index/grpc_client.mk
deleted file mode 100644
index 613fae139..000000000
--- a/index/grpc_client.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += grpc_client
-pkg_grpc_client_name = grpc_client
-pkg_grpc_client_description = gRPC client in Erlang
-pkg_grpc_client_homepage = https://github.com/Bluehouse-Technology/grpc_client
-pkg_grpc_client_fetch = git
-pkg_grpc_client_repo = https://github.com/Bluehouse-Technology/grpc_client
-pkg_grpc_client_commit = master
diff --git a/index/hackney.mk b/index/hackney.mk
deleted file mode 100644
index 8d89604b8..000000000
--- a/index/hackney.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += hackney
-pkg_hackney_name = hackney
-pkg_hackney_description = simple HTTP client in Erlang
-pkg_hackney_homepage = https://github.com/benoitc/hackney
-pkg_hackney_fetch = git
-pkg_hackney_repo = https://github.com/benoitc/hackney
-pkg_hackney_commit = master
diff --git a/index/hamcrest.mk b/index/hamcrest.mk
deleted file mode 100644
index d87e5dbdc..000000000
--- a/index/hamcrest.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += hamcrest
-pkg_hamcrest_name = hamcrest
-pkg_hamcrest_description = Erlang port of Hamcrest
-pkg_hamcrest_homepage = https://github.com/hyperthunk/hamcrest-erlang
-pkg_hamcrest_fetch = git
-pkg_hamcrest_repo = https://github.com/hyperthunk/hamcrest-erlang
-pkg_hamcrest_commit = master
diff --git a/index/hex_core.mk b/index/hex_core.mk
new file mode 100644
index 000000000..741c7dc0e
--- /dev/null
+++ b/index/hex_core.mk
@@ -0,0 +1,8 @@
+PACKAGES += hex_core
+pkg_hex_core_name = hex_core
+pkg_hex_core_description = Reference implementation of Hex specifications
+pkg_hex_core_homepage = https://github.com/hexpm/hex_core
+pkg_hex_core_fetch = git
+HEX_CORE_GIT ?= https://github.com/hexpm/hex_core
+pkg_hex_core_repo = $(HEX_CORE_GIT)
+pkg_hex_core_commit = e57b4fb15cde710b3ae09b1d18f148f6999a63cc
diff --git a/index/hottub.mk b/index/hottub.mk
deleted file mode 100644
index 18ee1205f..000000000
--- a/index/hottub.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += hottub
-pkg_hottub_name = hottub
-pkg_hottub_description = Permanent Erlang Worker Pool
-pkg_hottub_homepage = https://github.com/bfrog/hottub
-pkg_hottub_fetch = git
-pkg_hottub_repo = https://github.com/bfrog/hottub
-pkg_hottub_commit = master
diff --git a/index/hpack.mk b/index/hpack.mk
deleted file mode 100644
index 00c330c79..000000000
--- a/index/hpack.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += hpack
-pkg_hpack_name = hpack
-pkg_hpack_description = HPACK Implementation for Erlang
-pkg_hpack_homepage = https://github.com/joedevivo/hpack
-pkg_hpack_fetch = git
-pkg_hpack_repo = https://github.com/joedevivo/hpack
-pkg_hpack_commit = master
diff --git a/index/hyper.mk b/index/hyper.mk
deleted file mode 100644
index d165cff15..000000000
--- a/index/hyper.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += hyper
-pkg_hyper_name = hyper
-pkg_hyper_description = Erlang implementation of HyperLogLog
-pkg_hyper_homepage = https://github.com/GameAnalytics/hyper
-pkg_hyper_fetch = git
-pkg_hyper_repo = https://github.com/GameAnalytics/hyper
-pkg_hyper_commit = master
diff --git a/index/i18n.mk b/index/i18n.mk
deleted file mode 100644
index f3f2c890a..000000000
--- a/index/i18n.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += i18n
-pkg_i18n_name = i18n
-pkg_i18n_description = International components for unicode from Erlang (unicode, date, string, number, format, locale, localization, transliteration, icu4e)
-pkg_i18n_homepage = https://github.com/erlang-unicode/i18n
-pkg_i18n_fetch = git
-pkg_i18n_repo = https://github.com/erlang-unicode/i18n
-pkg_i18n_commit = master
diff --git a/index/ibrowse.mk b/index/ibrowse.mk
deleted file mode 100644
index fe7de42bd..000000000
--- a/index/ibrowse.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ibrowse
-pkg_ibrowse_name = ibrowse
-pkg_ibrowse_description = Erlang HTTP client
-pkg_ibrowse_homepage = https://github.com/cmullaparthi/ibrowse
-pkg_ibrowse_fetch = git
-pkg_ibrowse_repo = https://github.com/cmullaparthi/ibrowse
-pkg_ibrowse_commit = master
diff --git a/index/idna.mk b/index/idna.mk
deleted file mode 100644
index 1cf88c017..000000000
--- a/index/idna.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += idna
-pkg_idna_name = idna
-pkg_idna_description = Erlang IDNA lib
-pkg_idna_homepage = https://github.com/benoitc/erlang-idna
-pkg_idna_fetch = git
-pkg_idna_repo = https://github.com/benoitc/erlang-idna
-pkg_idna_commit = master
diff --git a/index/irc_lib.mk b/index/irc_lib.mk
deleted file mode 100644
index 3bf44b114..000000000
--- a/index/irc_lib.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += irc_lib
-pkg_irc_lib_name = irc_lib
-pkg_irc_lib_description = Erlang irc client library
-pkg_irc_lib_homepage = https://github.com/OtpChatBot/irc_lib
-pkg_irc_lib_fetch = git
-pkg_irc_lib_repo = https://github.com/OtpChatBot/irc_lib
-pkg_irc_lib_commit = master
diff --git a/index/ircd.mk b/index/ircd.mk
deleted file mode 100644
index 2e31fdfb4..000000000
--- a/index/ircd.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ircd
-pkg_ircd_name = ircd
-pkg_ircd_description = A pluggable IRC daemon application/library for Erlang.
-pkg_ircd_homepage = https://github.com/tonyg/erlang-ircd
-pkg_ircd_fetch = git
-pkg_ircd_repo = https://github.com/tonyg/erlang-ircd
-pkg_ircd_commit = master
diff --git a/index/iris.mk b/index/iris.mk
deleted file mode 100644
index 810b25571..000000000
--- a/index/iris.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += iris
-pkg_iris_name = iris
-pkg_iris_description = Iris Erlang binding
-pkg_iris_homepage = https://github.com/project-iris/iris-erl
-pkg_iris_fetch = git
-pkg_iris_repo = https://github.com/project-iris/iris-erl
-pkg_iris_commit = master
diff --git a/index/iso8601.mk b/index/iso8601.mk
deleted file mode 100644
index a1abe1b40..000000000
--- a/index/iso8601.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += iso8601
-pkg_iso8601_name = iso8601
-pkg_iso8601_description = Erlang ISO 8601 date formatter/parser
-pkg_iso8601_homepage = https://github.com/seansawyer/erlang_iso8601
-pkg_iso8601_fetch = git
-pkg_iso8601_repo = https://github.com/seansawyer/erlang_iso8601
-pkg_iso8601_commit = master
diff --git a/index/jamdb_sybase.mk b/index/jamdb_sybase.mk
deleted file mode 100644
index 54230f37c..000000000
--- a/index/jamdb_sybase.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += jamdb_sybase
-pkg_jamdb_sybase_name = jamdb_sybase
-pkg_jamdb_sybase_description = Erlang driver for SAP Sybase ASE
-pkg_jamdb_sybase_homepage = https://github.com/erlangbureau/jamdb_sybase
-pkg_jamdb_sybase_fetch = git
-pkg_jamdb_sybase_repo = https://github.com/erlangbureau/jamdb_sybase
-pkg_jamdb_sybase_commit = master
diff --git a/index/jesse.mk b/index/jesse.mk
deleted file mode 100644
index b36b699fb..000000000
--- a/index/jesse.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += jesse
-pkg_jesse_name = jesse
-pkg_jesse_description = jesse (JSon Schema Erlang) is an implementation of a json schema validator for Erlang.
-pkg_jesse_homepage = https://github.com/for-GET/jesse
-pkg_jesse_fetch = git
-pkg_jesse_repo = https://github.com/for-GET/jesse
-pkg_jesse_commit = master
diff --git a/index/jiffy.mk b/index/jiffy.mk
deleted file mode 100644
index 95aea1d2b..000000000
--- a/index/jiffy.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += jiffy
-pkg_jiffy_name = jiffy
-pkg_jiffy_description = JSON NIFs for Erlang.
-pkg_jiffy_homepage = https://github.com/davisp/jiffy
-pkg_jiffy_fetch = git
-pkg_jiffy_repo = https://github.com/davisp/jiffy
-pkg_jiffy_commit = master
diff --git a/index/jiffy_v.mk b/index/jiffy_v.mk
deleted file mode 100644
index ae25b4bc0..000000000
--- a/index/jiffy_v.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += jiffy_v
-pkg_jiffy_v_name = jiffy_v
-pkg_jiffy_v_description = JSON validation utility
-pkg_jiffy_v_homepage = https://github.com/shizzard/jiffy-v
-pkg_jiffy_v_fetch = git
-pkg_jiffy_v_repo = https://github.com/shizzard/jiffy-v
-pkg_jiffy_v_commit = master
diff --git a/index/jobs.mk b/index/jobs.mk
deleted file mode 100644
index 97d157684..000000000
--- a/index/jobs.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += jobs
-pkg_jobs_name = jobs
-pkg_jobs_description = Job scheduler for load regulation
-pkg_jobs_homepage = https://github.com/uwiger/jobs
-pkg_jobs_fetch = git
-pkg_jobs_repo = https://github.com/uwiger/jobs
-pkg_jobs_commit = master
diff --git a/index/joxa.mk b/index/joxa.mk
deleted file mode 100644
index e7871fb34..000000000
--- a/index/joxa.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += joxa
-pkg_joxa_name = joxa
-pkg_joxa_description = A Modern Lisp for the Erlang VM
-pkg_joxa_homepage = https://github.com/joxa/joxa
-pkg_joxa_fetch = git
-pkg_joxa_repo = https://github.com/joxa/joxa
-pkg_joxa_commit = master
diff --git a/index/json_rec.mk b/index/json_rec.mk
deleted file mode 100644
index 02619e08f..000000000
--- a/index/json_rec.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += json_rec
-pkg_json_rec_name = json_rec
-pkg_json_rec_description = JSON to erlang record
-pkg_json_rec_homepage = https://github.com/justinkirby/json_rec
-pkg_json_rec_fetch = git
-pkg_json_rec_repo = https://github.com/justinkirby/json_rec
-pkg_json_rec_commit = master
diff --git a/index/jsone.mk b/index/jsone.mk
deleted file mode 100644
index cf7378e5e..000000000
--- a/index/jsone.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += jsone
-pkg_jsone_name = jsone
-pkg_jsone_description = An Erlang library for encoding, decoding JSON data.
-pkg_jsone_homepage = https://github.com/sile/jsone.git
-pkg_jsone_fetch = git
-pkg_jsone_repo = https://github.com/sile/jsone.git
-pkg_jsone_commit = master
diff --git a/index/jsonpath.mk b/index/jsonpath.mk
deleted file mode 100644
index 0eb069c5a..000000000
--- a/index/jsonpath.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += jsonpath
-pkg_jsonpath_name = jsonpath
-pkg_jsonpath_description = Fast Erlang JSON data retrieval and updates via javascript-like notation
-pkg_jsonpath_homepage = https://github.com/GeneStevens/jsonpath
-pkg_jsonpath_fetch = git
-pkg_jsonpath_repo = https://github.com/GeneStevens/jsonpath
-pkg_jsonpath_commit = master
diff --git a/index/jsonx.mk b/index/jsonx.mk
deleted file mode 100644
index ddc037318..000000000
--- a/index/jsonx.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += jsonx
-pkg_jsonx_name = jsonx
-pkg_jsonx_description = JSONX is an Erlang library for efficient decode and encode JSON, written in C.
-pkg_jsonx_homepage = https://github.com/iskra/jsonx
-pkg_jsonx_fetch = git
-pkg_jsonx_repo = https://github.com/iskra/jsonx
-pkg_jsonx_commit = master
diff --git a/index/jsx.mk b/index/jsx.mk
deleted file mode 100644
index f40f29140..000000000
--- a/index/jsx.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += jsx
-pkg_jsx_name = jsx
-pkg_jsx_description = An Erlang application for consuming, producing and manipulating JSON.
-pkg_jsx_homepage = https://github.com/talentdeficit/jsx
-pkg_jsx_fetch = git
-pkg_jsx_repo = https://github.com/talentdeficit/jsx
-pkg_jsx_commit = main
diff --git a/index/kafka_protocol.mk b/index/kafka_protocol.mk
deleted file mode 100644
index 426e81519..000000000
--- a/index/kafka_protocol.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += kafka_protocol
-pkg_kafka_protocol_name = kafka_protocol
-pkg_kafka_protocol_description = Kafka protocol Erlang library
-pkg_kafka_protocol_homepage = https://github.com/kafka4beam/kafka_protocol
-pkg_kafka_protocol_fetch = git
-pkg_kafka_protocol_repo = https://github.com/kafka4beam/kafka_protocol
-pkg_kafka_protocol_commit = master
diff --git a/index/kai.mk b/index/kai.mk
deleted file mode 100644
index ce34274c0..000000000
--- a/index/kai.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += kai
-pkg_kai_name = kai
-pkg_kai_description = DHT storage by Takeshi Inoue
-pkg_kai_homepage = https://github.com/synrc/kai
-pkg_kai_fetch = git
-pkg_kai_repo = https://github.com/synrc/kai
-pkg_kai_commit = master
diff --git a/index/katja.mk b/index/katja.mk
deleted file mode 100644
index c602db73b..000000000
--- a/index/katja.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += katja
-pkg_katja_name = katja
-pkg_katja_description = A simple Riemann client written in Erlang.
-pkg_katja_homepage = https://github.com/nifoc/katja
-pkg_katja_fetch = git
-pkg_katja_repo = https://github.com/nifoc/katja
-pkg_katja_commit = master
diff --git a/index/key2value.mk b/index/key2value.mk
deleted file mode 100644
index 812bda871..000000000
--- a/index/key2value.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += key2value
-pkg_key2value_name = key2value
-pkg_key2value_description = Erlang 2-way map
-pkg_key2value_homepage = https://github.com/okeuday/key2value
-pkg_key2value_fetch = git
-pkg_key2value_repo = https://github.com/okeuday/key2value
-pkg_key2value_commit = master
diff --git a/index/keys1value.mk b/index/keys1value.mk
deleted file mode 100644
index f88ec2aa0..000000000
--- a/index/keys1value.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += keys1value
-pkg_keys1value_name = keys1value
-pkg_keys1value_description = Erlang set associative map for key lists
-pkg_keys1value_homepage = https://github.com/okeuday/keys1value
-pkg_keys1value_fetch = git
-pkg_keys1value_repo = https://github.com/okeuday/keys1value
-pkg_keys1value_commit = master
diff --git a/index/kinetic.mk b/index/kinetic.mk
deleted file mode 100644
index 8f622b461..000000000
--- a/index/kinetic.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += kinetic
-pkg_kinetic_name = kinetic
-pkg_kinetic_description = Erlang Kinesis Client
-pkg_kinetic_homepage = https://github.com/AdRoll/kinetic
-pkg_kinetic_fetch = git
-pkg_kinetic_repo = https://github.com/AdRoll/kinetic
-pkg_kinetic_commit = main
diff --git a/index/kjell.mk b/index/kjell.mk
deleted file mode 100644
index 62d647352..000000000
--- a/index/kjell.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += kjell
-pkg_kjell_name = kjell
-pkg_kjell_description = Erlang Shell
-pkg_kjell_homepage = https://github.com/karlll/kjell
-pkg_kjell_fetch = git
-pkg_kjell_repo = https://github.com/karlll/kjell
-pkg_kjell_commit = master
diff --git a/index/kraken.mk b/index/kraken.mk
deleted file mode 100644
index faebc3a03..000000000
--- a/index/kraken.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += kraken
-pkg_kraken_name = kraken
-pkg_kraken_description = Distributed Pubsub Server for Realtime Apps
-pkg_kraken_homepage = https://github.com/Asana/kraken
-pkg_kraken_fetch = git
-pkg_kraken_repo = https://github.com/Asana/kraken
-pkg_kraken_commit = master
diff --git a/index/kucumberl.mk b/index/kucumberl.mk
deleted file mode 100644
index 8c68c066b..000000000
--- a/index/kucumberl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += kucumberl
-pkg_kucumberl_name = kucumberl
-pkg_kucumberl_description = A pure-erlang, open-source, implementation of Cucumber
-pkg_kucumberl_homepage = https://github.com/openshine/kucumberl
-pkg_kucumberl_fetch = git
-pkg_kucumberl_repo = https://github.com/openshine/kucumberl
-pkg_kucumberl_commit = master
diff --git a/index/kvc.mk b/index/kvc.mk
deleted file mode 100644
index 42d7457e5..000000000
--- a/index/kvc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += kvc
-pkg_kvc_name = kvc
-pkg_kvc_description = KVC - Key Value Coding for Erlang data structures
-pkg_kvc_homepage = https://github.com/etrepum/kvc
-pkg_kvc_fetch = git
-pkg_kvc_repo = https://github.com/etrepum/kvc
-pkg_kvc_commit = master
diff --git a/index/kvlists.mk b/index/kvlists.mk
deleted file mode 100644
index fa00ab937..000000000
--- a/index/kvlists.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += kvlists
-pkg_kvlists_name = kvlists
-pkg_kvlists_description = Lists of key-value pairs (decoded JSON) in Erlang
-pkg_kvlists_homepage = https://github.com/jcomellas/kvlists
-pkg_kvlists_fetch = git
-pkg_kvlists_repo = https://github.com/jcomellas/kvlists
-pkg_kvlists_commit = master
diff --git a/index/kvs.mk b/index/kvs.mk
deleted file mode 100644
index 3d35aa63f..000000000
--- a/index/kvs.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += kvs
-pkg_kvs_name = kvs
-pkg_kvs_description = Container and Iterator
-pkg_kvs_homepage = https://github.com/synrc/kvs
-pkg_kvs_fetch = git
-pkg_kvs_repo = https://github.com/synrc/kvs
-pkg_kvs_commit = master
diff --git a/index/lager.mk b/index/lager.mk
deleted file mode 100644
index da0b245e6..000000000
--- a/index/lager.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += lager
-pkg_lager_name = lager
-pkg_lager_description = A logging framework for Erlang/OTP.
-pkg_lager_homepage = https://github.com/erlang-lager/lager
-pkg_lager_fetch = git
-pkg_lager_repo = https://github.com/erlang-lager/lager
-pkg_lager_commit = master
diff --git a/index/lager_syslog.mk b/index/lager_syslog.mk
deleted file mode 100644
index bef239b2a..000000000
--- a/index/lager_syslog.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += lager_syslog
-pkg_lager_syslog_name = lager_syslog
-pkg_lager_syslog_description = Syslog backend for lager
-pkg_lager_syslog_homepage = https://github.com/erlang-lager/lager_syslog
-pkg_lager_syslog_fetch = git
-pkg_lager_syslog_repo = https://github.com/erlang-lager/lager_syslog
-pkg_lager_syslog_commit = master
diff --git a/index/lasse.mk b/index/lasse.mk
deleted file mode 100644
index e5410b32d..000000000
--- a/index/lasse.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += lasse
-pkg_lasse_name = lasse
-pkg_lasse_description = SSE handler for Cowboy
-pkg_lasse_homepage = https://github.com/inaka/lasse
-pkg_lasse_fetch = git
-pkg_lasse_repo = https://github.com/inaka/lasse
-pkg_lasse_commit = master
diff --git a/index/ldap.mk b/index/ldap.mk
deleted file mode 100644
index 9492ccb88..000000000
--- a/index/ldap.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ldap
-pkg_ldap_name = ldap
-pkg_ldap_description = LDAP server written in Erlang
-pkg_ldap_homepage = https://github.com/spawnproc/ldap
-pkg_ldap_fetch = git
-pkg_ldap_repo = https://github.com/spawnproc/ldap
-pkg_ldap_commit = master
diff --git a/index/lfe.mk b/index/lfe.mk
deleted file mode 100644
index 21d87b939..000000000
--- a/index/lfe.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += lfe
-pkg_lfe_name = lfe
-pkg_lfe_description = Lisp Flavoured Erlang (LFE)
-pkg_lfe_homepage = https://github.com/rvirding/lfe
-pkg_lfe_fetch = git
-pkg_lfe_repo = https://github.com/rvirding/lfe
-pkg_lfe_commit = master
diff --git a/index/live.mk b/index/live.mk
deleted file mode 100644
index 06d35f301..000000000
--- a/index/live.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += live
-pkg_live_name = live
-pkg_live_description = Automated module and configuration reloader.
-pkg_live_homepage = http://ninenines.eu
-pkg_live_fetch = git
-pkg_live_repo = https://github.com/ninenines/live
-pkg_live_commit = master
diff --git a/index/locker.mk b/index/locker.mk
deleted file mode 100644
index eaef7986e..000000000
--- a/index/locker.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += locker
-pkg_locker_name = locker
-pkg_locker_description = Atomic distributed 'check and set' for short-lived keys
-pkg_locker_homepage = https://github.com/wooga/locker
-pkg_locker_fetch = git
-pkg_locker_repo = https://github.com/wooga/locker
-pkg_locker_commit = master
diff --git a/index/locks.mk b/index/locks.mk
deleted file mode 100644
index 64513128b..000000000
--- a/index/locks.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += locks
-pkg_locks_name = locks
-pkg_locks_description = A scalable, deadlock-resolving resource locker
-pkg_locks_homepage = https://github.com/uwiger/locks
-pkg_locks_fetch = git
-pkg_locks_repo = https://github.com/uwiger/locks
-pkg_locks_commit = master
diff --git a/index/log4erl.mk b/index/log4erl.mk
deleted file mode 100644
index c567d592f..000000000
--- a/index/log4erl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += log4erl
-pkg_log4erl_name = log4erl
-pkg_log4erl_description = A logger for erlang in the spirit of Log4J.
-pkg_log4erl_homepage = https://github.com/ahmednawras/log4erl
-pkg_log4erl_fetch = git
-pkg_log4erl_repo = https://github.com/ahmednawras/log4erl
-pkg_log4erl_commit = master
diff --git a/index/lol.mk b/index/lol.mk
deleted file mode 100644
index 89c2e33f3..000000000
--- a/index/lol.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += lol
-pkg_lol_name = lol
-pkg_lol_description = Lisp on erLang, and programming is fun again
-pkg_lol_homepage = https://github.com/b0oh/lol
-pkg_lol_fetch = git
-pkg_lol_repo = https://github.com/b0oh/lol
-pkg_lol_commit = master
diff --git a/index/lucid.mk b/index/lucid.mk
deleted file mode 100644
index 14d659801..000000000
--- a/index/lucid.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += lucid
-pkg_lucid_name = lucid
-pkg_lucid_description = HTTP/2 server written in Erlang
-pkg_lucid_homepage = https://github.com/tatsuhiro-t/lucid
-pkg_lucid_fetch = git
-pkg_lucid_repo = https://github.com/tatsuhiro-t/lucid
-pkg_lucid_commit = master
diff --git a/index/luerl.mk b/index/luerl.mk
deleted file mode 100644
index 2e32be2ca..000000000
--- a/index/luerl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += luerl
-pkg_luerl_name = luerl
-pkg_luerl_description = Lua in Erlang
-pkg_luerl_homepage = https://github.com/rvirding/luerl
-pkg_luerl_fetch = git
-pkg_luerl_repo = https://github.com/rvirding/luerl
-pkg_luerl_commit = develop
diff --git a/index/lux.mk b/index/lux.mk
deleted file mode 100644
index ae08293e3..000000000
--- a/index/lux.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += lux
-pkg_lux_name = lux
-pkg_lux_description = Lux (LUcid eXpect scripting) simplifies test automation and provides an Expect-style execution of commands
-pkg_lux_homepage = https://github.com/hawk/lux
-pkg_lux_fetch = git
-pkg_lux_repo = https://github.com/hawk/lux
-pkg_lux_commit = master
diff --git a/index/mad.mk b/index/mad.mk
deleted file mode 100644
index 5134c03bb..000000000
--- a/index/mad.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mad
-pkg_mad_name = mad
-pkg_mad_description = Small and Fast Rebar Replacement
-pkg_mad_homepage = https://github.com/synrc/mad
-pkg_mad_fetch = git
-pkg_mad_repo = https://github.com/synrc/mad
-pkg_mad_commit = master
diff --git a/index/marina.mk b/index/marina.mk
deleted file mode 100644
index b54f75a23..000000000
--- a/index/marina.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += marina
-pkg_marina_name = marina
-pkg_marina_description = Non-blocking Erlang Cassandra CQL3 client
-pkg_marina_homepage = https://github.com/lpgauth/marina
-pkg_marina_fetch = git
-pkg_marina_repo = https://github.com/lpgauth/marina
-pkg_marina_commit = master
diff --git a/index/mavg.mk b/index/mavg.mk
deleted file mode 100644
index ce1869e22..000000000
--- a/index/mavg.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mavg
-pkg_mavg_name = mavg
-pkg_mavg_description = Erlang :: Exponential moving average library
-pkg_mavg_homepage = https://github.com/EchoTeam/mavg
-pkg_mavg_fetch = git
-pkg_mavg_repo = https://github.com/EchoTeam/mavg
-pkg_mavg_commit = master
diff --git a/index/meck.mk b/index/meck.mk
deleted file mode 100644
index cb470c6be..000000000
--- a/index/meck.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += meck
-pkg_meck_name = meck
-pkg_meck_description = A mocking library for Erlang
-pkg_meck_homepage = https://github.com/eproxus/meck
-pkg_meck_fetch = git
-pkg_meck_repo = https://github.com/eproxus/meck
-pkg_meck_commit = master
diff --git a/index/mekao.mk b/index/mekao.mk
deleted file mode 100644
index 70bf74c76..000000000
--- a/index/mekao.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mekao
-pkg_mekao_name = mekao
-pkg_mekao_description = SQL constructor
-pkg_mekao_homepage = https://github.com/ddosia/mekao
-pkg_mekao_fetch = git
-pkg_mekao_repo = https://github.com/ddosia/mekao
-pkg_mekao_commit = master
diff --git a/index/merl.mk b/index/merl.mk
deleted file mode 100644
index 254069faf..000000000
--- a/index/merl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += merl
-pkg_merl_name = merl
-pkg_merl_description = Metaprogramming in Erlang
-pkg_merl_homepage = https://github.com/richcarl/merl
-pkg_merl_fetch = git
-pkg_merl_repo = https://github.com/richcarl/merl
-pkg_merl_commit = master
diff --git a/index/mimerl.mk b/index/mimerl.mk
deleted file mode 100644
index 6a613d139..000000000
--- a/index/mimerl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mimerl
-pkg_mimerl_name = mimerl
-pkg_mimerl_description = library to handle mimetypes
-pkg_mimerl_homepage = https://github.com/benoitc/mimerl
-pkg_mimerl_fetch = git
-pkg_mimerl_repo = https://github.com/benoitc/mimerl
-pkg_mimerl_commit = master
diff --git a/index/mimetypes.mk b/index/mimetypes.mk
deleted file mode 100644
index 4f532754e..000000000
--- a/index/mimetypes.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mimetypes
-pkg_mimetypes_name = mimetypes
-pkg_mimetypes_description = Erlang MIME types library
-pkg_mimetypes_homepage = https://github.com/spawngrid/mimetypes
-pkg_mimetypes_fetch = git
-pkg_mimetypes_repo = https://github.com/spawngrid/mimetypes
-pkg_mimetypes_commit = master
diff --git a/index/mixer.mk b/index/mixer.mk
deleted file mode 100644
index 4eb41055d..000000000
--- a/index/mixer.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mixer
-pkg_mixer_name = mixer
-pkg_mixer_description = Mix in functions from other modules
-pkg_mixer_homepage = https://github.com/chef/mixer
-pkg_mixer_fetch = git
-pkg_mixer_repo = https://github.com/chef/mixer
-pkg_mixer_commit = main
diff --git a/index/mochiweb.mk b/index/mochiweb.mk
deleted file mode 100644
index a2a451a57..000000000
--- a/index/mochiweb.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mochiweb
-pkg_mochiweb_name = mochiweb
-pkg_mochiweb_description = MochiWeb is an Erlang library for building lightweight HTTP servers.
-pkg_mochiweb_homepage = https://github.com/mochi/mochiweb
-pkg_mochiweb_fetch = git
-pkg_mochiweb_repo = https://github.com/mochi/mochiweb
-pkg_mochiweb_commit = main
diff --git a/index/mochiweb_xpath.mk b/index/mochiweb_xpath.mk
deleted file mode 100644
index 4f1380778..000000000
--- a/index/mochiweb_xpath.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mochiweb_xpath
-pkg_mochiweb_xpath_name = mochiweb_xpath
-pkg_mochiweb_xpath_description = XPath support for mochiweb's html parser
-pkg_mochiweb_xpath_homepage = https://github.com/retnuh/mochiweb_xpath
-pkg_mochiweb_xpath_fetch = git
-pkg_mochiweb_xpath_repo = https://github.com/retnuh/mochiweb_xpath
-pkg_mochiweb_xpath_commit = master
diff --git a/index/mockgyver.mk b/index/mockgyver.mk
deleted file mode 100644
index 309c4dd1b..000000000
--- a/index/mockgyver.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mockgyver
-pkg_mockgyver_name = mockgyver
-pkg_mockgyver_description = A mocking library for Erlang
-pkg_mockgyver_homepage = https://github.com/klajo/mockgyver
-pkg_mockgyver_fetch = git
-pkg_mockgyver_repo = https://github.com/klajo/mockgyver
-pkg_mockgyver_commit = master
diff --git a/index/modlib.mk b/index/modlib.mk
deleted file mode 100644
index d6cb24737..000000000
--- a/index/modlib.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += modlib
-pkg_modlib_name = modlib
-pkg_modlib_description = Web framework based on Erlang's inets httpd
-pkg_modlib_homepage = https://github.com/gar1t/modlib
-pkg_modlib_fetch = git
-pkg_modlib_repo = https://github.com/gar1t/modlib
-pkg_modlib_commit = master
diff --git a/index/mongodb.mk b/index/mongodb.mk
deleted file mode 100644
index 247bb5ddf..000000000
--- a/index/mongodb.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mongodb
-pkg_mongodb_name = mongodb
-pkg_mongodb_description = MongoDB driver for Erlang
-pkg_mongodb_homepage = https://github.com/comtihon/mongodb-erlang
-pkg_mongodb_fetch = git
-pkg_mongodb_repo = https://github.com/comtihon/mongodb-erlang
-pkg_mongodb_commit = master
diff --git a/index/mongooseim.mk b/index/mongooseim.mk
deleted file mode 100644
index a959807a4..000000000
--- a/index/mongooseim.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mongooseim
-pkg_mongooseim_name = mongooseim
-pkg_mongooseim_description = Jabber / XMPP server with focus on performance and scalability, by Erlang Solutions
-pkg_mongooseim_homepage = https://www.erlang-solutions.com/products/mongooseim-massively-scalable-ejabberd-platform
-pkg_mongooseim_fetch = git
-pkg_mongooseim_repo = https://github.com/esl/MongooseIM
-pkg_mongooseim_commit = master
diff --git a/index/moyo.mk b/index/moyo.mk
deleted file mode 100644
index a8653ae07..000000000
--- a/index/moyo.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += moyo
-pkg_moyo_name = moyo
-pkg_moyo_description = Erlang utility functions library
-pkg_moyo_homepage = https://github.com/dwango/moyo
-pkg_moyo_fetch = git
-pkg_moyo_repo = https://github.com/dwango/moyo
-pkg_moyo_commit = master
diff --git a/index/msgpack.mk b/index/msgpack.mk
deleted file mode 100644
index e9b014510..000000000
--- a/index/msgpack.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += msgpack
-pkg_msgpack_name = msgpack
-pkg_msgpack_description = MessagePack (de)serializer implementation for Erlang
-pkg_msgpack_homepage = https://github.com/msgpack/msgpack-erlang
-pkg_msgpack_fetch = git
-pkg_msgpack_repo = https://github.com/msgpack/msgpack-erlang
-pkg_msgpack_commit = master
diff --git a/index/mu2.mk b/index/mu2.mk
deleted file mode 100644
index 6b8750497..000000000
--- a/index/mu2.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mu2
-pkg_mu2_name = mu2
-pkg_mu2_description = Erlang mutation testing tool
-pkg_mu2_homepage = https://github.com/ramsay-t/mu2
-pkg_mu2_fetch = git
-pkg_mu2_repo = https://github.com/ramsay-t/mu2
-pkg_mu2_commit = master
diff --git a/index/mustache.mk b/index/mustache.mk
deleted file mode 100644
index 444fcc6a3..000000000
--- a/index/mustache.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mustache
-pkg_mustache_name = mustache
-pkg_mustache_description = Mustache template engine for Erlang.
-pkg_mustache_homepage = https://github.com/mojombo/mustache.erl
-pkg_mustache_fetch = git
-pkg_mustache_repo = https://github.com/mojombo/mustache.erl
-pkg_mustache_commit = master
diff --git a/index/myproto.mk b/index/myproto.mk
deleted file mode 100644
index 24d9f8599..000000000
--- a/index/myproto.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += myproto
-pkg_myproto_name = myproto
-pkg_myproto_description = MySQL Server Protocol in Erlang
-pkg_myproto_homepage = https://github.com/altenwald/myproto
-pkg_myproto_fetch = git
-pkg_myproto_repo = https://github.com/altenwald/myproto
-pkg_myproto_commit = master
diff --git a/index/mysql.mk b/index/mysql.mk
deleted file mode 100644
index 2e3177107..000000000
--- a/index/mysql.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += mysql
-pkg_mysql_name = mysql
-pkg_mysql_description = MySQL client library for Erlang/OTP
-pkg_mysql_homepage = https://github.com/mysql-otp/mysql-otp
-pkg_mysql_fetch = git
-pkg_mysql_repo = https://github.com/mysql-otp/mysql-otp
-pkg_mysql_commit = 1.7.0
diff --git a/index/n2o.mk b/index/n2o.mk
deleted file mode 100644
index 903dac5a1..000000000
--- a/index/n2o.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += n2o
-pkg_n2o_name = n2o
-pkg_n2o_description = WebSocket Application Server
-pkg_n2o_homepage = https://github.com/5HT/n2o
-pkg_n2o_fetch = git
-pkg_n2o_repo = https://github.com/5HT/n2o
-pkg_n2o_commit = master
diff --git a/index/nat_upnp.mk b/index/nat_upnp.mk
deleted file mode 100644
index a336953e4..000000000
--- a/index/nat_upnp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += nat_upnp
-pkg_nat_upnp_name = nat_upnp
-pkg_nat_upnp_description = Erlang library to map your internal port to an external using UNP IGD
-pkg_nat_upnp_homepage = https://github.com/benoitc/nat_upnp
-pkg_nat_upnp_fetch = git
-pkg_nat_upnp_repo = https://github.com/benoitc/nat_upnp
-pkg_nat_upnp_commit = master
diff --git a/index/neo4j.mk b/index/neo4j.mk
deleted file mode 100644
index c65f6a1a4..000000000
--- a/index/neo4j.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += neo4j
-pkg_neo4j_name = neo4j
-pkg_neo4j_description = Erlang client library for Neo4J.
-pkg_neo4j_homepage = https://github.com/dmitriid/neo4j-erlang
-pkg_neo4j_fetch = git
-pkg_neo4j_repo = https://github.com/dmitriid/neo4j-erlang
-pkg_neo4j_commit = master
diff --git a/index/neotoma.mk b/index/neotoma.mk
deleted file mode 100644
index fcf0a7e1b..000000000
--- a/index/neotoma.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += neotoma
-pkg_neotoma_name = neotoma
-pkg_neotoma_description = Erlang library and packrat parser-generator for parsing expression grammars.
-pkg_neotoma_homepage = https://github.com/seancribbs/neotoma
-pkg_neotoma_fetch = git
-pkg_neotoma_repo = https://github.com/seancribbs/neotoma
-pkg_neotoma_commit = master
diff --git a/index/nifty.mk b/index/nifty.mk
deleted file mode 100644
index c5233ca40..000000000
--- a/index/nifty.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += nifty
-pkg_nifty_name = nifty
-pkg_nifty_description = Erlang NIF wrapper generator
-pkg_nifty_homepage = https://github.com/parapluu/nifty
-pkg_nifty_fetch = git
-pkg_nifty_repo = https://github.com/parapluu/nifty
-pkg_nifty_commit = master
diff --git a/index/nitrogen_core.mk b/index/nitrogen_core.mk
deleted file mode 100644
index 42b1946e4..000000000
--- a/index/nitrogen_core.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += nitrogen_core
-pkg_nitrogen_core_name = nitrogen_core
-pkg_nitrogen_core_description = The core Nitrogen library.
-pkg_nitrogen_core_homepage = http://nitrogenproject.com/
-pkg_nitrogen_core_fetch = git
-pkg_nitrogen_core_repo = https://github.com/nitrogen/nitrogen_core
-pkg_nitrogen_core_commit = master
diff --git a/index/nkpacket.mk b/index/nkpacket.mk
deleted file mode 100644
index 42e3ee6a6..000000000
--- a/index/nkpacket.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += nkpacket
-pkg_nkpacket_name = nkpacket
-pkg_nkpacket_description = Generic Erlang transport layer
-pkg_nkpacket_homepage = https://github.com/Nekso/nkpacket
-pkg_nkpacket_fetch = git
-pkg_nkpacket_repo = https://github.com/Nekso/nkpacket
-pkg_nkpacket_commit = master
diff --git a/index/nksip.mk b/index/nksip.mk
deleted file mode 100644
index b74ccfc9e..000000000
--- a/index/nksip.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += nksip
-pkg_nksip_name = nksip
-pkg_nksip_description = Erlang SIP application server
-pkg_nksip_homepage = https://github.com/kalta/nksip
-pkg_nksip_fetch = git
-pkg_nksip_repo = https://github.com/kalta/nksip
-pkg_nksip_commit = master
diff --git a/index/nodefinder.mk b/index/nodefinder.mk
deleted file mode 100644
index ee9d21175..000000000
--- a/index/nodefinder.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += nodefinder
-pkg_nodefinder_name = nodefinder
-pkg_nodefinder_description = automatic node discovery via UDP multicast
-pkg_nodefinder_homepage = https://github.com/erlanger/nodefinder
-pkg_nodefinder_fetch = git
-pkg_nodefinder_repo = https://github.com/okeuday/nodefinder
-pkg_nodefinder_commit = master
diff --git a/index/nprocreg.mk b/index/nprocreg.mk
deleted file mode 100644
index 6f2526966..000000000
--- a/index/nprocreg.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += nprocreg
-pkg_nprocreg_name = nprocreg
-pkg_nprocreg_description = Minimal Distributed Erlang Process Registry
-pkg_nprocreg_homepage = http://nitrogenproject.com/
-pkg_nprocreg_fetch = git
-pkg_nprocreg_repo = https://github.com/nitrogen/nprocreg
-pkg_nprocreg_commit = master
diff --git a/index/oauth.mk b/index/oauth.mk
deleted file mode 100644
index 026f7c594..000000000
--- a/index/oauth.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += oauth
-pkg_oauth_name = oauth
-pkg_oauth_description = An Erlang OAuth 1.0 implementation
-pkg_oauth_homepage = https://github.com/tim/erlang-oauth
-pkg_oauth_fetch = git
-pkg_oauth_repo = https://github.com/tim/erlang-oauth
-pkg_oauth_commit = main
diff --git a/index/oauth2.mk b/index/oauth2.mk
deleted file mode 100644
index 6ac00bc32..000000000
--- a/index/oauth2.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += oauth2
-pkg_oauth2_name = oauth2
-pkg_oauth2_description = Erlang Oauth2 implementation
-pkg_oauth2_homepage = https://github.com/kivra/oauth2
-pkg_oauth2_fetch = git
-pkg_oauth2_repo = https://github.com/kivra/oauth2
-pkg_oauth2_commit = master
diff --git a/index/observer_cli.mk b/index/observer_cli.mk
deleted file mode 100644
index 91ca0bc38..000000000
--- a/index/observer_cli.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += observer_cli
-pkg_observer_cli_name = observer_cli
-pkg_observer_cli_description = Visualize Erlang/Elixir Nodes On The Command Line
-pkg_observer_cli_homepage = http://zhongwencool.github.io/observer_cli
-pkg_observer_cli_fetch = git
-pkg_observer_cli_repo = https://github.com/zhongwencool/observer_cli
-pkg_observer_cli_commit = master
diff --git a/index/octopus.mk b/index/octopus.mk
deleted file mode 100644
index 2aa288e13..000000000
--- a/index/octopus.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += octopus
-pkg_octopus_name = octopus
-pkg_octopus_description = Small and flexible pool manager written in Erlang
-pkg_octopus_homepage = https://github.com/erlangbureau/octopus
-pkg_octopus_fetch = git
-pkg_octopus_repo = https://github.com/erlangbureau/octopus
-pkg_octopus_commit = master
diff --git a/index/openflow.mk b/index/openflow.mk
deleted file mode 100644
index 9439d0dd2..000000000
--- a/index/openflow.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += openflow
-pkg_openflow_name = openflow
-pkg_openflow_description = An OpenFlow controller written in pure erlang
-pkg_openflow_homepage = https://github.com/renatoaguiar/erlang-openflow
-pkg_openflow_fetch = git
-pkg_openflow_repo = https://github.com/renatoaguiar/erlang-openflow
-pkg_openflow_commit = master
diff --git a/index/openid.mk b/index/openid.mk
deleted file mode 100644
index 7370d48e1..000000000
--- a/index/openid.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += openid
-pkg_openid_name = openid
-pkg_openid_description = Erlang OpenID
-pkg_openid_homepage = https://github.com/brendonh/erl_openid
-pkg_openid_fetch = git
-pkg_openid_repo = https://github.com/brendonh/erl_openid
-pkg_openid_commit = master
diff --git a/index/openpoker.mk b/index/openpoker.mk
deleted file mode 100644
index 54b76a3b6..000000000
--- a/index/openpoker.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += openpoker
-pkg_openpoker_name = openpoker
-pkg_openpoker_description = Genesis Texas hold'em Game Server
-pkg_openpoker_homepage = https://github.com/hpyhacking/openpoker
-pkg_openpoker_fetch = git
-pkg_openpoker_repo = https://github.com/hpyhacking/openpoker
-pkg_openpoker_commit = master
diff --git a/index/otpbp.mk b/index/otpbp.mk
deleted file mode 100644
index ff7717a9b..000000000
--- a/index/otpbp.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += otpbp
-pkg_otpbp_name = otpbp
-pkg_otpbp_description = Parse transformer for use new OTP functions in old Erlang/OTP releases (R15, R16, 17, 18, 19)
-pkg_otpbp_homepage = https://github.com/Ledest/otpbp
-pkg_otpbp_fetch = git
-pkg_otpbp_repo = https://github.com/Ledest/otpbp
-pkg_otpbp_commit = master
diff --git a/index/pal.mk b/index/pal.mk
deleted file mode 100644
index e69907ae0..000000000
--- a/index/pal.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pal
-pkg_pal_name = pal
-pkg_pal_description = Pragmatic Authentication Library
-pkg_pal_homepage = https://github.com/manifest/pal
-pkg_pal_fetch = git
-pkg_pal_repo = https://github.com/manifest/pal
-pkg_pal_commit = master
diff --git a/index/parse_trans.mk b/index/parse_trans.mk
deleted file mode 100644
index 2ac20f5b9..000000000
--- a/index/parse_trans.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += parse_trans
-pkg_parse_trans_name = parse_trans
-pkg_parse_trans_description = Parse transform utilities for Erlang
-pkg_parse_trans_homepage = https://github.com/uwiger/parse_trans
-pkg_parse_trans_fetch = git
-pkg_parse_trans_repo = https://github.com/uwiger/parse_trans
-pkg_parse_trans_commit = master
diff --git a/index/parsexml.mk b/index/parsexml.mk
deleted file mode 100644
index dd9a65c07..000000000
--- a/index/parsexml.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += parsexml
-pkg_parsexml_name = parsexml
-pkg_parsexml_description = Simple DOM XML parser with convenient and very simple API
-pkg_parsexml_homepage = https://github.com/maxlapshin/parsexml
-pkg_parsexml_fetch = git
-pkg_parsexml_repo = https://github.com/maxlapshin/parsexml
-pkg_parsexml_commit = master
diff --git a/index/partisan.mk b/index/partisan.mk
deleted file mode 100644
index 13d6ae180..000000000
--- a/index/partisan.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += partisan
-pkg_partisan_name = partisan
-pkg_partisan_description = High-performance, high-scalability distributed computing with Erlang and Elixir.
-pkg_partisan_homepage = http://partisan.cloud
-pkg_partisan_fetch = git
-pkg_partisan_repo = https://github.com/lasp-lang/partisan
-pkg_partisan_commit = master
diff --git a/index/pegjs.mk b/index/pegjs.mk
deleted file mode 100644
index f507b8ee5..000000000
--- a/index/pegjs.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pegjs
-pkg_pegjs_name = pegjs
-pkg_pegjs_description = An implementation of PEG.js grammar for Erlang.
-pkg_pegjs_homepage = https://github.com/dmitriid/pegjs
-pkg_pegjs_fetch = git
-pkg_pegjs_repo = https://github.com/dmitriid/pegjs
-pkg_pegjs_commit = master
diff --git a/index/percept2.mk b/index/percept2.mk
deleted file mode 100644
index 5c1cf0b1d..000000000
--- a/index/percept2.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += percept2
-pkg_percept2_name = percept2
-pkg_percept2_description = Concurrent profiling tool for Erlang
-pkg_percept2_homepage = https://github.com/huiqing/percept2
-pkg_percept2_fetch = git
-pkg_percept2_repo = https://github.com/huiqing/percept2
-pkg_percept2_commit = master
diff --git a/index/pgo.mk b/index/pgo.mk
deleted file mode 100644
index 1510d01e2..000000000
--- a/index/pgo.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pgo
-pkg_pgo_name = pgo
-pkg_pgo_description = Erlang Postgres client and connection pool
-pkg_pgo_homepage = https://github.com/erleans/pgo.git
-pkg_pgo_fetch = git
-pkg_pgo_repo = https://github.com/erleans/pgo.git
-pkg_pgo_commit = main
diff --git a/index/pgsql.mk b/index/pgsql.mk
deleted file mode 100644
index cd69c9177..000000000
--- a/index/pgsql.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pgsql
-pkg_pgsql_name = pgsql
-pkg_pgsql_description = Erlang PostgreSQL driver
-pkg_pgsql_homepage = https://github.com/semiocast/pgsql
-pkg_pgsql_fetch = git
-pkg_pgsql_repo = https://github.com/semiocast/pgsql
-pkg_pgsql_commit = master
diff --git a/index/pkgx.mk b/index/pkgx.mk
deleted file mode 100644
index c38a6d9b3..000000000
--- a/index/pkgx.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pkgx
-pkg_pkgx_name = pkgx
-pkg_pkgx_description = Build .deb packages from Erlang releases
-pkg_pkgx_homepage = https://github.com/arjan/pkgx
-pkg_pkgx_fetch = git
-pkg_pkgx_repo = https://github.com/arjan/pkgx
-pkg_pkgx_commit = master
diff --git a/index/pkt.mk b/index/pkt.mk
deleted file mode 100644
index 9160ebd0a..000000000
--- a/index/pkt.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pkt
-pkg_pkt_name = pkt
-pkg_pkt_description = Erlang network protocol library
-pkg_pkt_homepage = https://github.com/msantos/pkt
-pkg_pkt_fetch = git
-pkg_pkt_repo = https://github.com/msantos/pkt
-pkg_pkt_commit = master
diff --git a/index/plain_fsm.mk b/index/plain_fsm.mk
deleted file mode 100644
index b141addc9..000000000
--- a/index/plain_fsm.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += plain_fsm
-pkg_plain_fsm_name = plain_fsm
-pkg_plain_fsm_description = A behaviour/support library for writing plain Erlang FSMs.
-pkg_plain_fsm_homepage = https://github.com/uwiger/plain_fsm
-pkg_plain_fsm_fetch = git
-pkg_plain_fsm_repo = https://github.com/uwiger/plain_fsm
-pkg_plain_fsm_commit = master
diff --git a/index/pmod_transform.mk b/index/pmod_transform.mk
deleted file mode 100644
index c620936bf..000000000
--- a/index/pmod_transform.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pmod_transform
-pkg_pmod_transform_name = pmod_transform
-pkg_pmod_transform_description = Parse transform for parameterized modules
-pkg_pmod_transform_homepage = https://github.com/erlang/pmod_transform
-pkg_pmod_transform_fetch = git
-pkg_pmod_transform_repo = https://github.com/erlang/pmod_transform
-pkg_pmod_transform_commit = master
diff --git a/index/pobox.mk b/index/pobox.mk
deleted file mode 100644
index 94dff89a5..000000000
--- a/index/pobox.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pobox
-pkg_pobox_name = pobox
-pkg_pobox_description = External buffer processes to protect against mailbox overflow in Erlang
-pkg_pobox_homepage = https://github.com/ferd/pobox
-pkg_pobox_fetch = git
-pkg_pobox_repo = https://github.com/ferd/pobox
-pkg_pobox_commit = master
diff --git a/index/ponos.mk b/index/ponos.mk
deleted file mode 100644
index 6cbe8b9b6..000000000
--- a/index/ponos.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ponos
-pkg_ponos_name = ponos
-pkg_ponos_description = ponos is a simple yet powerful load generator written in erlang
-pkg_ponos_homepage = https://github.com/klarna/ponos
-pkg_ponos_fetch = git
-pkg_ponos_repo = https://github.com/klarna/ponos
-pkg_ponos_commit = master
diff --git a/index/poolboy.mk b/index/poolboy.mk
deleted file mode 100644
index 2534ae4e6..000000000
--- a/index/poolboy.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += poolboy
-pkg_poolboy_name = poolboy
-pkg_poolboy_description = A hunky Erlang worker pool factory
-pkg_poolboy_homepage = https://github.com/devinus/poolboy
-pkg_poolboy_fetch = git
-pkg_poolboy_repo = https://github.com/devinus/poolboy
-pkg_poolboy_commit = master
diff --git a/index/pooler.mk b/index/pooler.mk
deleted file mode 100644
index c7cda5009..000000000
--- a/index/pooler.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pooler
-pkg_pooler_name = pooler
-pkg_pooler_description = An OTP Process Pool Application
-pkg_pooler_homepage = https://github.com/seth/pooler
-pkg_pooler_fetch = git
-pkg_pooler_repo = https://github.com/seth/pooler
-pkg_pooler_commit = master
diff --git a/index/pqueue.mk b/index/pqueue.mk
deleted file mode 100644
index 1338806f6..000000000
--- a/index/pqueue.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += pqueue
-pkg_pqueue_name = pqueue
-pkg_pqueue_description = Erlang Priority Queues
-pkg_pqueue_homepage = https://github.com/okeuday/pqueue
-pkg_pqueue_fetch = git
-pkg_pqueue_repo = https://github.com/okeuday/pqueue
-pkg_pqueue_commit = master
diff --git a/index/procket.mk b/index/procket.mk
deleted file mode 100644
index 8b1197ba3..000000000
--- a/index/procket.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += procket
-pkg_procket_name = procket
-pkg_procket_description = Erlang interface to low level socket operations
-pkg_procket_homepage = http://blog.listincomprehension.com/search/label/procket
-pkg_procket_fetch = git
-pkg_procket_repo = https://github.com/msantos/procket
-pkg_procket_commit = master
diff --git a/index/prometheus.mk b/index/prometheus.mk
deleted file mode 100644
index d8e2592ba..000000000
--- a/index/prometheus.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += prometheus
-pkg_prometheus_name = prometheus
-pkg_prometheus_description = Prometheus.io client in Erlang
-pkg_prometheus_homepage = https://github.com/deadtrickster/prometheus.erl
-pkg_prometheus_fetch = git
-pkg_prometheus_repo = https://github.com/deadtrickster/prometheus.erl
-pkg_prometheus_commit = master
diff --git a/index/prop.mk b/index/prop.mk
deleted file mode 100644
index cb2a74fb9..000000000
--- a/index/prop.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += prop
-pkg_prop_name = prop
-pkg_prop_description = An Erlang code scaffolding and generator system.
-pkg_prop_homepage = https://github.com/nuex/prop
-pkg_prop_fetch = git
-pkg_prop_repo = https://github.com/nuex/prop
-pkg_prop_commit = master
diff --git a/index/props.mk b/index/props.mk
deleted file mode 100644
index 55f856417..000000000
--- a/index/props.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += props
-pkg_props_name = props
-pkg_props_description = Property structure library
-pkg_props_homepage = https://github.com/greyarea/props
-pkg_props_fetch = git
-pkg_props_repo = https://github.com/greyarea/props
-pkg_props_commit = master
diff --git a/index/protobuffs.mk b/index/protobuffs.mk
deleted file mode 100644
index aa4934b26..000000000
--- a/index/protobuffs.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += protobuffs
-pkg_protobuffs_name = protobuffs
-pkg_protobuffs_description = An implementation of Google's Protocol Buffers for Erlang, based on ngerakines/erlang_protobuffs.
-pkg_protobuffs_homepage = https://github.com/basho/erlang_protobuffs
-pkg_protobuffs_fetch = git
-pkg_protobuffs_repo = https://github.com/basho/erlang_protobuffs
-pkg_protobuffs_commit = master
diff --git a/index/psycho.mk b/index/psycho.mk
deleted file mode 100644
index 232c6ae76..000000000
--- a/index/psycho.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += psycho
-pkg_psycho_name = psycho
-pkg_psycho_description = HTTP server that provides a WSGI-like interface for applications and middleware.
-pkg_psycho_homepage = https://github.com/gar1t/psycho
-pkg_psycho_fetch = git
-pkg_psycho_repo = https://github.com/gar1t/psycho
-pkg_psycho_commit = master
diff --git a/index/purity.mk b/index/purity.mk
deleted file mode 100644
index 2472f6856..000000000
--- a/index/purity.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += purity
-pkg_purity_name = purity
-pkg_purity_description = A side-effect analyzer for Erlang
-pkg_purity_homepage = https://github.com/mpitid/purity
-pkg_purity_fetch = git
-pkg_purity_repo = https://github.com/mpitid/purity
-pkg_purity_commit = master
diff --git a/index/qdate.mk b/index/qdate.mk
deleted file mode 100644
index 679158a20..000000000
--- a/index/qdate.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += qdate
-pkg_qdate_name = qdate
-pkg_qdate_description = Date, time, and timezone parsing, formatting, and conversion for Erlang.
-pkg_qdate_homepage = https://github.com/choptastic/qdate
-pkg_qdate_fetch = git
-pkg_qdate_repo = https://github.com/choptastic/qdate
-pkg_qdate_commit = master
diff --git a/index/qrcode.mk b/index/qrcode.mk
deleted file mode 100644
index c703552e1..000000000
--- a/index/qrcode.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += qrcode
-pkg_qrcode_name = qrcode
-pkg_qrcode_description = QR Code encoder in Erlang
-pkg_qrcode_homepage = https://github.com/komone/qrcode
-pkg_qrcode_fetch = git
-pkg_qrcode_repo = https://github.com/komone/qrcode
-pkg_qrcode_commit = master
diff --git a/index/quest.mk b/index/quest.mk
deleted file mode 100644
index 5833197ed..000000000
--- a/index/quest.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += quest
-pkg_quest_name = quest
-pkg_quest_description = Learn Erlang through this set of challenges. An interactive system for getting to know Erlang.
-pkg_quest_homepage = https://github.com/eriksoe/ErlangQuest
-pkg_quest_fetch = git
-pkg_quest_repo = https://github.com/eriksoe/ErlangQuest
-pkg_quest_commit = master
diff --git a/index/quickrand.mk b/index/quickrand.mk
deleted file mode 100644
index e65da71e5..000000000
--- a/index/quickrand.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += quickrand
-pkg_quickrand_name = quickrand
-pkg_quickrand_description = Quick Erlang Random Number Generation
-pkg_quickrand_homepage = https://github.com/okeuday/quickrand
-pkg_quickrand_fetch = git
-pkg_quickrand_repo = https://github.com/okeuday/quickrand
-pkg_quickrand_commit = master
diff --git a/index/rabbit_exchange_type_riak.mk b/index/rabbit_exchange_type_riak.mk
deleted file mode 100644
index 5f7f27759..000000000
--- a/index/rabbit_exchange_type_riak.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += rabbit_exchange_type_riak
-pkg_rabbit_exchange_type_riak_name = rabbit_exchange_type_riak
-pkg_rabbit_exchange_type_riak_description = Custom RabbitMQ exchange type for sticking messages in Riak
-pkg_rabbit_exchange_type_riak_homepage = https://github.com/jbrisbin/riak-exchange
-pkg_rabbit_exchange_type_riak_fetch = git
-pkg_rabbit_exchange_type_riak_repo = https://github.com/jbrisbin/riak-exchange
-pkg_rabbit_exchange_type_riak_commit = master
diff --git a/index/rack.mk b/index/rack.mk
deleted file mode 100644
index b78e1dafb..000000000
--- a/index/rack.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += rack
-pkg_rack_name = rack
-pkg_rack_description = Rack handler for erlang
-pkg_rack_homepage = https://github.com/erlyvideo/rack
-pkg_rack_fetch = git
-pkg_rack_repo = https://github.com/erlyvideo/rack
-pkg_rack_commit = master
diff --git a/index/radierl.mk b/index/radierl.mk
deleted file mode 100644
index 61ffb38d6..000000000
--- a/index/radierl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += radierl
-pkg_radierl_name = radierl
-pkg_radierl_description = RADIUS protocol stack implemented in Erlang.
-pkg_radierl_homepage = https://github.com/vances/radierl
-pkg_radierl_fetch = git
-pkg_radierl_repo = https://github.com/vances/radierl
-pkg_radierl_commit = master
diff --git a/index/ranch.mk b/index/ranch.mk
index f3c0f9850..b4027a54b 100644
--- a/index/ranch.mk
+++ b/index/ranch.mk
@@ -4,4 +4,4 @@ pkg_ranch_description = Socket acceptor pool for TCP protocols.
 pkg_ranch_homepage = http://ninenines.eu
 pkg_ranch_fetch = git
 pkg_ranch_repo = https://github.com/ninenines/ranch
-pkg_ranch_commit = 1.2.1
+pkg_ranch_commit = master
diff --git a/index/rbeacon.mk b/index/rbeacon.mk
deleted file mode 100644
index b2cf45f0c..000000000
--- a/index/rbeacon.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += rbeacon
-pkg_rbeacon_name = rbeacon
-pkg_rbeacon_description = LAN discovery and presence in Erlang.
-pkg_rbeacon_homepage = https://github.com/refuge/rbeacon
-pkg_rbeacon_fetch = git
-pkg_rbeacon_repo = https://github.com/refuge/rbeacon
-pkg_rbeacon_commit = master
diff --git a/index/re2.mk b/index/re2.mk
deleted file mode 100644
index 03c3f674f..000000000
--- a/index/re2.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += re2
-pkg_re2_name = re2
-pkg_re2_description = Erlang NIF bindings for RE2 regex library
-pkg_re2_homepage = https://github.com/dukesoferl/re2
-pkg_re2_fetch = git
-pkg_re2_repo = https://github.com/dukesoferl/re2
-pkg_re2_commit = master
diff --git a/index/rebus.mk b/index/rebus.mk
deleted file mode 100644
index fe793b070..000000000
--- a/index/rebus.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += rebus
-pkg_rebus_name = rebus
-pkg_rebus_description = A stupid simple, internal, pub/sub event bus written in- and for Erlang.
-pkg_rebus_homepage = https://github.com/olle/rebus
-pkg_rebus_fetch = git
-pkg_rebus_repo = https://github.com/olle/rebus
-pkg_rebus_commit = master
diff --git a/index/rec2json.mk b/index/rec2json.mk
deleted file mode 100644
index e5f12b1c6..000000000
--- a/index/rec2json.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += rec2json
-pkg_rec2json_name = rec2json
-pkg_rec2json_description = Compile erlang record definitions into modules to convert them to/from json easily.
-pkg_rec2json_homepage = https://github.com/lordnull/rec2json
-pkg_rec2json_fetch = git
-pkg_rec2json_repo = https://github.com/lordnull/rec2json
-pkg_rec2json_commit = master
diff --git a/index/recon.mk b/index/recon.mk
deleted file mode 100644
index 4ea85877a..000000000
--- a/index/recon.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += recon
-pkg_recon_name = recon
-pkg_recon_description = Collection of functions and scripts to debug Erlang in production.
-pkg_recon_homepage = https://github.com/ferd/recon
-pkg_recon_fetch = git
-pkg_recon_repo = https://github.com/ferd/recon
-pkg_recon_commit = master
diff --git a/index/record_info.mk b/index/record_info.mk
deleted file mode 100644
index 28c0ff58f..000000000
--- a/index/record_info.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += record_info
-pkg_record_info_name = record_info
-pkg_record_info_description = Convert between record and proplist
-pkg_record_info_homepage = https://github.com/bipthelin/erlang-record_info
-pkg_record_info_fetch = git
-pkg_record_info_repo = https://github.com/bipthelin/erlang-record_info
-pkg_record_info_commit = master
diff --git a/index/redgrid.mk b/index/redgrid.mk
deleted file mode 100644
index 7951538c1..000000000
--- a/index/redgrid.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += redgrid
-pkg_redgrid_name = redgrid
-pkg_redgrid_description = automatic Erlang node discovery via redis
-pkg_redgrid_homepage = https://github.com/jkvor/redgrid
-pkg_redgrid_fetch = git
-pkg_redgrid_repo = https://github.com/jkvor/redgrid
-pkg_redgrid_commit = master
diff --git a/index/redo.mk b/index/redo.mk
deleted file mode 100644
index f7940df77..000000000
--- a/index/redo.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += redo
-pkg_redo_name = redo
-pkg_redo_description = pipelined erlang redis client
-pkg_redo_homepage = https://github.com/jkvor/redo
-pkg_redo_fetch = git
-pkg_redo_repo = https://github.com/jkvor/redo
-pkg_redo_commit = master
diff --git a/index/reload_mk.mk b/index/reload_mk.mk
deleted file mode 100644
index fc0ca2c73..000000000
--- a/index/reload_mk.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += reload_mk
-pkg_reload_mk_name = reload_mk
-pkg_reload_mk_description = Live reload plugin for erlang.mk.
-pkg_reload_mk_homepage = https://github.com/bullno1/reload.mk
-pkg_reload_mk_fetch = git
-pkg_reload_mk_repo = https://github.com/bullno1/reload.mk
-pkg_reload_mk_commit = master
diff --git a/index/reltool_util.mk b/index/reltool_util.mk
deleted file mode 100644
index d85a940e0..000000000
--- a/index/reltool_util.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += reltool_util
-pkg_reltool_util_name = reltool_util
-pkg_reltool_util_description = Erlang reltool utility functionality application
-pkg_reltool_util_homepage = https://github.com/okeuday/reltool_util
-pkg_reltool_util_fetch = git
-pkg_reltool_util_repo = https://github.com/okeuday/reltool_util
-pkg_reltool_util_commit = master
diff --git a/index/resource_discovery.mk b/index/resource_discovery.mk
deleted file mode 100644
index 424e23c69..000000000
--- a/index/resource_discovery.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += resource_discovery
-pkg_resource_discovery_name = resource_discovery
-pkg_resource_discovery_description = An application used to dynamically discover resources present in an Erlang node cluster.
-pkg_resource_discovery_homepage = http://erlware.org/
-pkg_resource_discovery_fetch = git
-pkg_resource_discovery_repo = https://github.com/erlware/resource_discovery
-pkg_resource_discovery_commit = master
diff --git a/index/restc.mk b/index/restc.mk
deleted file mode 100644
index 115ad8d7b..000000000
--- a/index/restc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += restc
-pkg_restc_name = restc
-pkg_restc_description = Erlang Rest Client
-pkg_restc_homepage = https://github.com/kivra/restclient
-pkg_restc_fetch = git
-pkg_restc_repo = https://github.com/kivra/restclient
-pkg_restc_commit = master
diff --git a/index/rfc4627_jsonrpc.mk b/index/rfc4627_jsonrpc.mk
deleted file mode 100644
index a680ef002..000000000
--- a/index/rfc4627_jsonrpc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += rfc4627_jsonrpc
-pkg_rfc4627_jsonrpc_name = rfc4627_jsonrpc
-pkg_rfc4627_jsonrpc_description = Erlang RFC4627 (JSON) codec and JSON-RPC server implementation.
-pkg_rfc4627_jsonrpc_homepage = https://github.com/tonyg/erlang-rfc4627
-pkg_rfc4627_jsonrpc_fetch = git
-pkg_rfc4627_jsonrpc_repo = https://github.com/tonyg/erlang-rfc4627
-pkg_rfc4627_jsonrpc_commit = master
diff --git a/index/riak_core.mk b/index/riak_core.mk
deleted file mode 100644
index a30d4cd2d..000000000
--- a/index/riak_core.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += riak_core
-pkg_riak_core_name = riak_core
-pkg_riak_core_description = Distributed systems infrastructure used by Riak.
-pkg_riak_core_homepage = https://github.com/basho/riak_core
-pkg_riak_core_fetch = git
-pkg_riak_core_repo = https://github.com/basho/riak_core
-pkg_riak_core_commit = develop
diff --git a/index/riak_dt.mk b/index/riak_dt.mk
deleted file mode 100644
index f12a3a5d4..000000000
--- a/index/riak_dt.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += riak_dt
-pkg_riak_dt_name = riak_dt
-pkg_riak_dt_description = Convergent replicated datatypes in Erlang
-pkg_riak_dt_homepage = https://github.com/basho/riak_dt
-pkg_riak_dt_fetch = git
-pkg_riak_dt_repo = https://github.com/basho/riak_dt
-pkg_riak_dt_commit = master
diff --git a/index/riak_ensemble.mk b/index/riak_ensemble.mk
deleted file mode 100644
index f2402750d..000000000
--- a/index/riak_ensemble.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += riak_ensemble
-pkg_riak_ensemble_name = riak_ensemble
-pkg_riak_ensemble_description = Multi-Paxos framework in Erlang
-pkg_riak_ensemble_homepage = https://github.com/basho/riak_ensemble
-pkg_riak_ensemble_fetch = git
-pkg_riak_ensemble_repo = https://github.com/basho/riak_ensemble
-pkg_riak_ensemble_commit = develop
diff --git a/index/riak_kv.mk b/index/riak_kv.mk
deleted file mode 100644
index 0718f793e..000000000
--- a/index/riak_kv.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += riak_kv
-pkg_riak_kv_name = riak_kv
-pkg_riak_kv_description = Riak Key/Value Store
-pkg_riak_kv_homepage = https://github.com/basho/riak_kv
-pkg_riak_kv_fetch = git
-pkg_riak_kv_repo = https://github.com/basho/riak_kv
-pkg_riak_kv_commit = develop
diff --git a/index/riak_pipe.mk b/index/riak_pipe.mk
deleted file mode 100644
index f82c6b8ac..000000000
--- a/index/riak_pipe.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += riak_pipe
-pkg_riak_pipe_name = riak_pipe
-pkg_riak_pipe_description = Riak Pipelines
-pkg_riak_pipe_homepage = https://github.com/basho/riak_pipe
-pkg_riak_pipe_fetch = git
-pkg_riak_pipe_repo = https://github.com/basho/riak_pipe
-pkg_riak_pipe_commit = develop
diff --git a/index/riak_sysmon.mk b/index/riak_sysmon.mk
deleted file mode 100644
index 917edc520..000000000
--- a/index/riak_sysmon.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += riak_sysmon
-pkg_riak_sysmon_name = riak_sysmon
-pkg_riak_sysmon_description = Simple OTP app for managing Erlang VM system_monitor event messages
-pkg_riak_sysmon_homepage = https://github.com/basho/riak_sysmon
-pkg_riak_sysmon_fetch = git
-pkg_riak_sysmon_repo = https://github.com/basho/riak_sysmon
-pkg_riak_sysmon_commit = master
diff --git a/index/riakc.mk b/index/riakc.mk
deleted file mode 100644
index 0e9aa7ef8..000000000
--- a/index/riakc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += riakc
-pkg_riakc_name = riakc
-pkg_riakc_description = Erlang clients for Riak.
-pkg_riakc_homepage = https://github.com/basho/riak-erlang-client
-pkg_riakc_fetch = git
-pkg_riakc_repo = https://github.com/basho/riak-erlang-client
-pkg_riakc_commit = master
diff --git a/index/rlimit.mk b/index/rlimit.mk
deleted file mode 100644
index 2f9593e7e..000000000
--- a/index/rlimit.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += rlimit
-pkg_rlimit_name = rlimit
-pkg_rlimit_description = Magnus Klaar's rate limiter code from etorrent
-pkg_rlimit_homepage = https://github.com/jlouis/rlimit
-pkg_rlimit_fetch = git
-pkg_rlimit_repo = https://github.com/jlouis/rlimit
-pkg_rlimit_commit = master
diff --git a/index/rust_mk.mk b/index/rust_mk.mk
deleted file mode 100644
index c0d0c37cd..000000000
--- a/index/rust_mk.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += rust_mk
-pkg_rust_mk_name = rust_mk
-pkg_rust_mk_description = Build Rust crates in an Erlang application
-pkg_rust_mk_homepage = https://github.com/goertzenator/rust.mk
-pkg_rust_mk_fetch = git
-pkg_rust_mk_repo = https://github.com/goertzenator/rust.mk
-pkg_rust_mk_commit = master
diff --git a/index/safetyvalve.mk b/index/safetyvalve.mk
deleted file mode 100644
index bb1028d06..000000000
--- a/index/safetyvalve.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += safetyvalve
-pkg_safetyvalve_name = safetyvalve
-pkg_safetyvalve_description = A safety valve for your erlang node
-pkg_safetyvalve_homepage = https://github.com/jlouis/safetyvalve
-pkg_safetyvalve_fetch = git
-pkg_safetyvalve_repo = https://github.com/jlouis/safetyvalve
-pkg_safetyvalve_commit = master
diff --git a/index/seestar.mk b/index/seestar.mk
deleted file mode 100644
index 8f3194bc5..000000000
--- a/index/seestar.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += seestar
-pkg_seestar_name = seestar
-pkg_seestar_description = The Erlang client for Cassandra 1.2+ binary protocol
-pkg_seestar_homepage = https://github.com/iamaleksey/seestar
-pkg_seestar_fetch = git
-pkg_seestar_repo = https://github.com/iamaleksey/seestar
-pkg_seestar_commit = master
diff --git a/index/setup.mk b/index/setup.mk
deleted file mode 100644
index 4daf28184..000000000
--- a/index/setup.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += setup
-pkg_setup_name = setup
-pkg_setup_description = Generic setup utility for Erlang-based systems
-pkg_setup_homepage = https://github.com/uwiger/setup
-pkg_setup_fetch = git
-pkg_setup_repo = https://github.com/uwiger/setup
-pkg_setup_commit = master
diff --git a/index/sext.mk b/index/sext.mk
deleted file mode 100644
index 9cbd8722c..000000000
--- a/index/sext.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += sext
-pkg_sext_name = sext
-pkg_sext_description = Sortable Erlang Term Serialization
-pkg_sext_homepage = https://github.com/uwiger/sext
-pkg_sext_fetch = git
-pkg_sext_repo = https://github.com/uwiger/sext
-pkg_sext_commit = master
diff --git a/index/sfmt.mk b/index/sfmt.mk
deleted file mode 100644
index e6710be7e..000000000
--- a/index/sfmt.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += sfmt
-pkg_sfmt_name = sfmt
-pkg_sfmt_description = SFMT pseudo random number generator for Erlang.
-pkg_sfmt_homepage = https://github.com/jj1bdx/sfmt-erlang
-pkg_sfmt_fetch = git
-pkg_sfmt_repo = https://github.com/jj1bdx/sfmt-erlang
-pkg_sfmt_commit = master
diff --git a/index/sgte.mk b/index/sgte.mk
deleted file mode 100644
index 0ef4cd947..000000000
--- a/index/sgte.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += sgte
-pkg_sgte_name = sgte
-pkg_sgte_description = A simple Erlang Template Engine
-pkg_sgte_homepage = https://github.com/filippo/sgte
-pkg_sgte_fetch = git
-pkg_sgte_repo = https://github.com/filippo/sgte
-pkg_sgte_commit = master
diff --git a/index/sheriff.mk b/index/sheriff.mk
deleted file mode 100644
index 3753478dd..000000000
--- a/index/sheriff.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += sheriff
-pkg_sheriff_name = sheriff
-pkg_sheriff_description = Parse transform for type based validation.
-pkg_sheriff_homepage = http://ninenines.eu
-pkg_sheriff_fetch = git
-pkg_sheriff_repo = https://github.com/extend/sheriff
-pkg_sheriff_commit = master
diff --git a/index/shotgun.mk b/index/shotgun.mk
deleted file mode 100644
index 6ff7e51e1..000000000
--- a/index/shotgun.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += shotgun
-pkg_shotgun_name = shotgun
-pkg_shotgun_description = better than just a gun
-pkg_shotgun_homepage = https://github.com/inaka/shotgun
-pkg_shotgun_fetch = git
-pkg_shotgun_repo = https://github.com/inaka/shotgun
-pkg_shotgun_commit = master
diff --git a/index/sidejob.mk b/index/sidejob.mk
deleted file mode 100644
index c173e1836..000000000
--- a/index/sidejob.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += sidejob
-pkg_sidejob_name = sidejob
-pkg_sidejob_description = Parallel worker and capacity limiting library for Erlang
-pkg_sidejob_homepage = https://github.com/basho/sidejob
-pkg_sidejob_fetch = git
-pkg_sidejob_repo = https://github.com/basho/sidejob
-pkg_sidejob_commit = develop
diff --git a/index/sieve.mk b/index/sieve.mk
deleted file mode 100644
index b71bfbeab..000000000
--- a/index/sieve.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += sieve
-pkg_sieve_name = sieve
-pkg_sieve_description = sieve is a simple TCP routing proxy (layer 7) in erlang
-pkg_sieve_homepage = https://github.com/benoitc/sieve
-pkg_sieve_fetch = git
-pkg_sieve_repo = https://github.com/benoitc/sieve
-pkg_sieve_commit = master
diff --git a/index/simhash.mk b/index/simhash.mk
deleted file mode 100644
index fbfab42b3..000000000
--- a/index/simhash.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += simhash
-pkg_simhash_name = simhash
-pkg_simhash_description = Simhashing for Erlang -- hashing algorithm to find near-duplicates in binary data.
-pkg_simhash_homepage = https://github.com/ferd/simhash
-pkg_simhash_fetch = git
-pkg_simhash_repo = https://github.com/ferd/simhash
-pkg_simhash_commit = master
diff --git a/index/simple_bridge.mk b/index/simple_bridge.mk
deleted file mode 100644
index fbdc2095c..000000000
--- a/index/simple_bridge.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += simple_bridge
-pkg_simple_bridge_name = simple_bridge
-pkg_simple_bridge_description = A simple, standardized interface library to Erlang HTTP Servers.
-pkg_simple_bridge_homepage = https://github.com/nitrogen/simple_bridge
-pkg_simple_bridge_fetch = git
-pkg_simple_bridge_repo = https://github.com/nitrogen/simple_bridge
-pkg_simple_bridge_commit = master
diff --git a/index/simple_oauth2.mk b/index/simple_oauth2.mk
deleted file mode 100644
index 1aa43ec18..000000000
--- a/index/simple_oauth2.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += simple_oauth2
-pkg_simple_oauth2_name = simple_oauth2
-pkg_simple_oauth2_description = Simple erlang OAuth2 client module for any http server framework (Google, Facebook, Yandex, Vkontakte are preconfigured)
-pkg_simple_oauth2_homepage = https://github.com/virtan/simple_oauth2
-pkg_simple_oauth2_fetch = git
-pkg_simple_oauth2_repo = https://github.com/virtan/simple_oauth2
-pkg_simple_oauth2_commit = master
diff --git a/index/skel.mk b/index/skel.mk
deleted file mode 100644
index e31a131f3..000000000
--- a/index/skel.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += skel
-pkg_skel_name = skel
-pkg_skel_description = A Streaming Process-based Skeleton Library for Erlang
-pkg_skel_homepage = https://github.com/ParaPhrase/skel
-pkg_skel_fetch = git
-pkg_skel_repo = https://github.com/ParaPhrase/skel
-pkg_skel_commit = master
diff --git a/index/slack.mk b/index/slack.mk
deleted file mode 100644
index a38fe534f..000000000
--- a/index/slack.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += slack
-pkg_slack_name = slack
-pkg_slack_description = Minimal slack notification OTP library.
-pkg_slack_homepage = https://github.com/DonBranson/slack
-pkg_slack_fetch = git
-pkg_slack_repo = https://github.com/DonBranson/slack.git
-pkg_slack_commit = master
diff --git a/index/snappyer.mk b/index/snappyer.mk
deleted file mode 100644
index 061e54457..000000000
--- a/index/snappyer.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += snappyer
-pkg_snappyer_name = snappyer
-pkg_snappyer_description = Snappy as nif for Erlang
-pkg_snappyer_homepage = https://github.com/zmstone/snappyer
-pkg_snappyer_fetch = git
-pkg_snappyer_repo = https://github.com/zmstone/snappyer.git
-pkg_snappyer_commit = master
diff --git a/index/social.mk b/index/social.mk
deleted file mode 100644
index 27dbc14d8..000000000
--- a/index/social.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += social
-pkg_social_name = social
-pkg_social_description = Cowboy handler for social login via OAuth2 providers
-pkg_social_homepage = https://github.com/dvv/social
-pkg_social_fetch = git
-pkg_social_repo = https://github.com/dvv/social
-pkg_social_commit = master
diff --git a/index/sqerl.mk b/index/sqerl.mk
deleted file mode 100644
index 66f8e5669..000000000
--- a/index/sqerl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += sqerl
-pkg_sqerl_name = sqerl
-pkg_sqerl_description = An Erlang-flavoured SQL DSL
-pkg_sqerl_homepage = https://github.com/hairyhum/sqerl
-pkg_sqerl_fetch = git
-pkg_sqerl_repo = https://github.com/hairyhum/sqerl
-pkg_sqerl_commit = master
diff --git a/index/srly.mk b/index/srly.mk
deleted file mode 100644
index 5385e1f77..000000000
--- a/index/srly.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += srly
-pkg_srly_name = srly
-pkg_srly_description = Native Erlang Unix serial interface
-pkg_srly_homepage = https://github.com/msantos/srly
-pkg_srly_fetch = git
-pkg_srly_repo = https://github.com/msantos/srly
-pkg_srly_commit = master
diff --git a/index/sshrpc.mk b/index/sshrpc.mk
deleted file mode 100644
index 0ea76835e..000000000
--- a/index/sshrpc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += sshrpc
-pkg_sshrpc_name = sshrpc
-pkg_sshrpc_description = Erlang SSH RPC module (experimental)
-pkg_sshrpc_homepage = https://github.com/jj1bdx/sshrpc
-pkg_sshrpc_fetch = git
-pkg_sshrpc_repo = https://github.com/jj1bdx/sshrpc
-pkg_sshrpc_commit = master
diff --git a/index/stable.mk b/index/stable.mk
deleted file mode 100644
index 63887b86a..000000000
--- a/index/stable.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += stable
-pkg_stable_name = stable
-pkg_stable_description = Library of assorted helpers for Cowboy web server.
-pkg_stable_homepage = https://github.com/dvv/stable
-pkg_stable_fetch = git
-pkg_stable_repo = https://github.com/dvv/stable
-pkg_stable_commit = master
diff --git a/index/statebox.mk b/index/statebox.mk
deleted file mode 100644
index cb80cde97..000000000
--- a/index/statebox.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += statebox
-pkg_statebox_name = statebox
-pkg_statebox_description = Erlang state monad with merge/conflict-resolution capabilities. Useful for Riak.
-pkg_statebox_homepage = https://github.com/mochi/statebox
-pkg_statebox_fetch = git
-pkg_statebox_repo = https://github.com/mochi/statebox
-pkg_statebox_commit = master
diff --git a/index/statman.mk b/index/statman.mk
deleted file mode 100644
index 8ac43c7fd..000000000
--- a/index/statman.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += statman
-pkg_statman_name = statman
-pkg_statman_description = Efficiently collect massive volumes of metrics inside the Erlang VM
-pkg_statman_homepage = https://github.com/knutin/statman
-pkg_statman_fetch = git
-pkg_statman_repo = https://github.com/knutin/statman
-pkg_statman_commit = master
diff --git a/index/statsderl.mk b/index/statsderl.mk
deleted file mode 100644
index 9e398fad3..000000000
--- a/index/statsderl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += statsderl
-pkg_statsderl_name = statsderl
-pkg_statsderl_description = StatsD client (erlang)
-pkg_statsderl_homepage = https://github.com/lpgauth/statsderl
-pkg_statsderl_fetch = git
-pkg_statsderl_repo = https://github.com/lpgauth/statsderl
-pkg_statsderl_commit = master
diff --git a/index/stdinout_pool.mk b/index/stdinout_pool.mk
deleted file mode 100644
index f3755b54e..000000000
--- a/index/stdinout_pool.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += stdinout_pool
-pkg_stdinout_pool_name = stdinout_pool
-pkg_stdinout_pool_description = stdinout_pool    : stuff goes in, stuff goes out. there's never any miscommunication.
-pkg_stdinout_pool_homepage = https://github.com/mattsta/erlang-stdinout-pool
-pkg_stdinout_pool_fetch = git
-pkg_stdinout_pool_repo = https://github.com/mattsta/erlang-stdinout-pool
-pkg_stdinout_pool_commit = master
diff --git a/index/stockdb.mk b/index/stockdb.mk
deleted file mode 100644
index d850fcd6d..000000000
--- a/index/stockdb.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += stockdb
-pkg_stockdb_name = stockdb
-pkg_stockdb_description = Database for storing Stock Exchange quotes in erlang
-pkg_stockdb_homepage = https://github.com/maxlapshin/stockdb
-pkg_stockdb_fetch = git
-pkg_stockdb_repo = https://github.com/maxlapshin/stockdb
-pkg_stockdb_commit = master
diff --git a/index/subproc.mk b/index/subproc.mk
deleted file mode 100644
index a920bd1aa..000000000
--- a/index/subproc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += subproc
-pkg_subproc_name = subproc
-pkg_subproc_description = unix subprocess manager with {active,once|false} modes
-pkg_subproc_homepage = http://dozzie.jarowit.net/trac/wiki/subproc
-pkg_subproc_fetch = git
-pkg_subproc_repo = https://github.com/dozzie/subproc
-pkg_subproc_commit = v0.1.0
diff --git a/index/supervisor3.mk b/index/supervisor3.mk
deleted file mode 100644
index 09356f63f..000000000
--- a/index/supervisor3.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += supervisor3
-pkg_supervisor3_name = supervisor3
-pkg_supervisor3_description = OTP supervisor with additional strategies
-pkg_supervisor3_homepage = https://github.com/klarna/supervisor3
-pkg_supervisor3_fetch = git
-pkg_supervisor3_repo = https://github.com/klarna/supervisor3.git
-pkg_supervisor3_commit = master
diff --git a/index/swab.mk b/index/swab.mk
deleted file mode 100644
index 8c99fd59e..000000000
--- a/index/swab.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += swab
-pkg_swab_name = swab
-pkg_swab_description = General purpose buffer handling module
-pkg_swab_homepage = https://github.com/crownedgrouse/swab
-pkg_swab_fetch = git
-pkg_swab_repo = https://github.com/crownedgrouse/swab
-pkg_swab_commit = master
diff --git a/index/swarm.mk b/index/swarm.mk
deleted file mode 100644
index 513da9ab6..000000000
--- a/index/swarm.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += swarm
-pkg_swarm_name = swarm
-pkg_swarm_description = Fast and simple acceptor pool for Erlang
-pkg_swarm_homepage = https://github.com/jeremey/swarm
-pkg_swarm_fetch = git
-pkg_swarm_repo = https://github.com/jeremey/swarm
-pkg_swarm_commit = master
diff --git a/index/switchboard.mk b/index/switchboard.mk
deleted file mode 100644
index 4124619f6..000000000
--- a/index/switchboard.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += switchboard
-pkg_switchboard_name = switchboard
-pkg_switchboard_description = A framework for processing email using worker plugins.
-pkg_switchboard_homepage = https://github.com/thusfresh/switchboard
-pkg_switchboard_fetch = git
-pkg_switchboard_repo = https://github.com/thusfresh/switchboard
-pkg_switchboard_commit = master
diff --git a/index/syn.mk b/index/syn.mk
deleted file mode 100644
index f107eb972..000000000
--- a/index/syn.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += syn
-pkg_syn_name = syn
-pkg_syn_description = A global Process Registry and Process Group manager for Erlang.
-pkg_syn_homepage = https://github.com/ostinelli/syn
-pkg_syn_fetch = git
-pkg_syn_repo = https://github.com/ostinelli/syn
-pkg_syn_commit = master
diff --git a/index/sync.mk b/index/sync.mk
deleted file mode 100644
index b7e91f7f7..000000000
--- a/index/sync.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += sync
-pkg_sync_name = sync
-pkg_sync_description = On-the-fly recompiling and reloading in Erlang.
-pkg_sync_homepage = https://github.com/rustyio/sync
-pkg_sync_fetch = git
-pkg_sync_repo = https://github.com/rustyio/sync
-pkg_sync_commit = master
diff --git a/index/syntaxerl.mk b/index/syntaxerl.mk
deleted file mode 100644
index 37b0cdd8e..000000000
--- a/index/syntaxerl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += syntaxerl
-pkg_syntaxerl_name = syntaxerl
-pkg_syntaxerl_description = Syntax checker for Erlang
-pkg_syntaxerl_homepage = https://github.com/ten0s/syntaxerl
-pkg_syntaxerl_fetch = git
-pkg_syntaxerl_repo = https://github.com/ten0s/syntaxerl
-pkg_syntaxerl_commit = master
diff --git a/index/syslog.mk b/index/syslog.mk
deleted file mode 100644
index 1575138f5..000000000
--- a/index/syslog.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += syslog
-pkg_syslog_name = syslog
-pkg_syslog_description = Erlang port driver for interacting with syslog via syslog(3)
-pkg_syslog_homepage = https://github.com/Vagabond/erlang-syslog
-pkg_syslog_fetch = git
-pkg_syslog_repo = https://github.com/Vagabond/erlang-syslog
-pkg_syslog_commit = master
diff --git a/index/taskforce.mk b/index/taskforce.mk
deleted file mode 100644
index b558e91b0..000000000
--- a/index/taskforce.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += taskforce
-pkg_taskforce_name = taskforce
-pkg_taskforce_description = Erlang worker pools for controlled parallelisation of arbitrary tasks.
-pkg_taskforce_homepage = https://github.com/g-andrade/taskforce
-pkg_taskforce_fetch = git
-pkg_taskforce_repo = https://github.com/g-andrade/taskforce
-pkg_taskforce_commit = master
diff --git a/index/tddreloader.mk b/index/tddreloader.mk
deleted file mode 100644
index 0ea4f264e..000000000
--- a/index/tddreloader.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += tddreloader
-pkg_tddreloader_name = tddreloader
-pkg_tddreloader_description = Shell utility for recompiling, reloading, and testing code as it changes
-pkg_tddreloader_homepage = https://github.com/version2beta/tddreloader
-pkg_tddreloader_fetch = git
-pkg_tddreloader_repo = https://github.com/version2beta/tddreloader
-pkg_tddreloader_commit = master
diff --git a/index/tempo.mk b/index/tempo.mk
deleted file mode 100644
index 50ec46c66..000000000
--- a/index/tempo.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += tempo
-pkg_tempo_name = tempo
-pkg_tempo_description = NIF-based date and time parsing and formatting for Erlang.
-pkg_tempo_homepage = https://github.com/selectel/tempo
-pkg_tempo_fetch = git
-pkg_tempo_repo = https://github.com/selectel/tempo
-pkg_tempo_commit = master
diff --git a/index/tinymq.mk b/index/tinymq.mk
deleted file mode 100644
index da02a9623..000000000
--- a/index/tinymq.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += tinymq
-pkg_tinymq_name = tinymq
-pkg_tinymq_description = TinyMQ - a diminutive, in-memory message queue
-pkg_tinymq_homepage = https://github.com/ChicagoBoss/tinymq
-pkg_tinymq_fetch = git
-pkg_tinymq_repo = https://github.com/ChicagoBoss/tinymq
-pkg_tinymq_commit = master
diff --git a/index/tinymt.mk b/index/tinymt.mk
deleted file mode 100644
index 942e1a803..000000000
--- a/index/tinymt.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += tinymt
-pkg_tinymt_name = tinymt
-pkg_tinymt_description = TinyMT pseudo random number generator for Erlang.
-pkg_tinymt_homepage = https://github.com/jj1bdx/tinymt-erlang
-pkg_tinymt_fetch = git
-pkg_tinymt_repo = https://github.com/jj1bdx/tinymt-erlang
-pkg_tinymt_commit = master
diff --git a/index/tirerl.mk b/index/tirerl.mk
deleted file mode 100644
index 7504b9f19..000000000
--- a/index/tirerl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += tirerl
-pkg_tirerl_name = tirerl
-pkg_tirerl_description = Erlang interface to Elastic Search
-pkg_tirerl_homepage = https://github.com/inaka/tirerl
-pkg_tirerl_fetch = git
-pkg_tirerl_repo = https://github.com/inaka/tirerl
-pkg_tirerl_commit = master
diff --git a/index/toml.mk b/index/toml.mk
deleted file mode 100644
index 1078610d8..000000000
--- a/index/toml.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += toml
-pkg_toml_name = toml
-pkg_toml_description = TOML (0.4.0) config parser
-pkg_toml_homepage = http://dozzie.jarowit.net/trac/wiki/TOML
-pkg_toml_fetch = git
-pkg_toml_repo = https://github.com/dozzie/toml
-pkg_toml_commit = v0.2.0
diff --git a/index/traffic_tools.mk b/index/traffic_tools.mk
deleted file mode 100644
index 2c99a108c..000000000
--- a/index/traffic_tools.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += traffic_tools
-pkg_traffic_tools_name = traffic_tools
-pkg_traffic_tools_description = Simple traffic limiting library
-pkg_traffic_tools_homepage = https://github.com/systra/traffic_tools
-pkg_traffic_tools_fetch = git
-pkg_traffic_tools_repo = https://github.com/systra/traffic_tools
-pkg_traffic_tools_commit = master
diff --git a/index/trails.mk b/index/trails.mk
deleted file mode 100644
index dec709fb2..000000000
--- a/index/trails.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += trails
-pkg_trails_name = trails
-pkg_trails_description = A couple of improvements over Cowboy Routes
-pkg_trails_homepage = http://inaka.github.io/cowboy-trails/
-pkg_trails_fetch = git
-pkg_trails_repo = https://github.com/inaka/cowboy-trails
-pkg_trails_commit = master
diff --git a/index/trane.mk b/index/trane.mk
deleted file mode 100644
index cc12cdb6a..000000000
--- a/index/trane.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += trane
-pkg_trane_name = trane
-pkg_trane_description = SAX style broken HTML parser in Erlang
-pkg_trane_homepage = https://github.com/massemanet/trane
-pkg_trane_fetch = git
-pkg_trane_repo = https://github.com/massemanet/trane
-pkg_trane_commit = master
diff --git a/index/trie.mk b/index/trie.mk
deleted file mode 100644
index 4a5fc2d17..000000000
--- a/index/trie.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += trie
-pkg_trie_name = trie
-pkg_trie_description = Erlang Trie Implementation
-pkg_trie_homepage = https://github.com/okeuday/trie
-pkg_trie_fetch = git
-pkg_trie_repo = https://github.com/okeuday/trie
-pkg_trie_commit = master
diff --git a/index/tunctl.mk b/index/tunctl.mk
deleted file mode 100644
index e660f050d..000000000
--- a/index/tunctl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += tunctl
-pkg_tunctl_name = tunctl
-pkg_tunctl_description = Erlang TUN/TAP interface
-pkg_tunctl_homepage = https://github.com/msantos/tunctl
-pkg_tunctl_fetch = git
-pkg_tunctl_repo = https://github.com/msantos/tunctl
-pkg_tunctl_commit = master
diff --git a/index/unicorn.mk b/index/unicorn.mk
deleted file mode 100644
index 1465229e7..000000000
--- a/index/unicorn.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += unicorn
-pkg_unicorn_name = unicorn
-pkg_unicorn_description = Generic configuration server
-pkg_unicorn_homepage = https://github.com/shizzard/unicorn
-pkg_unicorn_fetch = git
-pkg_unicorn_repo = https://github.com/shizzard/unicorn
-pkg_unicorn_commit = master
diff --git a/index/unsplit.mk b/index/unsplit.mk
deleted file mode 100644
index c98ddc68b..000000000
--- a/index/unsplit.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += unsplit
-pkg_unsplit_name = unsplit
-pkg_unsplit_description = Resolves conflicts in Mnesia after network splits
-pkg_unsplit_homepage = https://github.com/uwiger/unsplit
-pkg_unsplit_fetch = git
-pkg_unsplit_repo = https://github.com/uwiger/unsplit
-pkg_unsplit_commit = master
diff --git a/index/uuid.mk b/index/uuid.mk
deleted file mode 100644
index baa88bfef..000000000
--- a/index/uuid.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += uuid
-pkg_uuid_name = uuid
-pkg_uuid_description = Erlang UUID Implementation
-pkg_uuid_homepage = https://github.com/okeuday/uuid
-pkg_uuid_fetch = git
-pkg_uuid_repo = https://github.com/okeuday/uuid
-pkg_uuid_commit = master
diff --git a/index/ux.mk b/index/ux.mk
deleted file mode 100644
index 059d0d977..000000000
--- a/index/ux.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += ux
-pkg_ux_name = ux
-pkg_ux_description = Unicode eXtention for Erlang (Strings, Collation)
-pkg_ux_homepage = https://github.com/erlang-unicode/ux
-pkg_ux_fetch = git
-pkg_ux_repo = https://github.com/erlang-unicode/ux
-pkg_ux_commit = master
diff --git a/index/verx.mk b/index/verx.mk
deleted file mode 100644
index 1c058b24e..000000000
--- a/index/verx.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += verx
-pkg_verx_name = verx
-pkg_verx_description = Erlang implementation of the libvirtd remote protocol
-pkg_verx_homepage = https://github.com/msantos/verx
-pkg_verx_fetch = git
-pkg_verx_repo = https://github.com/msantos/verx
-pkg_verx_commit = master
diff --git a/index/vmq_bridge.mk b/index/vmq_bridge.mk
deleted file mode 100644
index 8ad39d53e..000000000
--- a/index/vmq_bridge.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += vmq_bridge
-pkg_vmq_bridge_name = vmq_bridge
-pkg_vmq_bridge_description = Component of VerneMQ: A distributed MQTT message broker
-pkg_vmq_bridge_homepage = https://verne.mq/
-pkg_vmq_bridge_fetch = git
-pkg_vmq_bridge_repo = https://github.com/erlio/vmq_bridge
-pkg_vmq_bridge_commit = master
diff --git a/index/vmstats.mk b/index/vmstats.mk
deleted file mode 100644
index 60071d6cc..000000000
--- a/index/vmstats.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += vmstats
-pkg_vmstats_name = vmstats
-pkg_vmstats_description = tiny Erlang app that works in conjunction with statsderl in order to generate information on the Erlang VM for graphite logs.
-pkg_vmstats_homepage = https://github.com/ferd/vmstats
-pkg_vmstats_fetch = git
-pkg_vmstats_repo = https://github.com/ferd/vmstats
-pkg_vmstats_commit = master
diff --git a/index/walrus.mk b/index/walrus.mk
deleted file mode 100644
index 73dc0cb77..000000000
--- a/index/walrus.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += walrus
-pkg_walrus_name = walrus
-pkg_walrus_description = Walrus - Mustache-like Templating
-pkg_walrus_homepage = https://github.com/devinus/walrus
-pkg_walrus_fetch = git
-pkg_walrus_repo = https://github.com/devinus/walrus
-pkg_walrus_commit = master
diff --git a/index/webmachine.mk b/index/webmachine.mk
deleted file mode 100644
index 1900af844..000000000
--- a/index/webmachine.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += webmachine
-pkg_webmachine_name = webmachine
-pkg_webmachine_description = A REST-based system for building web applications.
-pkg_webmachine_homepage = https://github.com/basho/webmachine
-pkg_webmachine_fetch = git
-pkg_webmachine_repo = https://github.com/basho/webmachine
-pkg_webmachine_commit = master
diff --git a/index/websocket_client.mk b/index/websocket_client.mk
deleted file mode 100644
index 61e886d85..000000000
--- a/index/websocket_client.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += websocket_client
-pkg_websocket_client_name = websocket_client
-pkg_websocket_client_description = Erlang websocket client (ws and wss supported)
-pkg_websocket_client_homepage = https://github.com/jeremyong/websocket_client
-pkg_websocket_client_fetch = git
-pkg_websocket_client_repo = https://github.com/jeremyong/websocket_client
-pkg_websocket_client_commit = master
diff --git a/index/worker_pool.mk b/index/worker_pool.mk
deleted file mode 100644
index 26341f36f..000000000
--- a/index/worker_pool.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += worker_pool
-pkg_worker_pool_name = worker_pool
-pkg_worker_pool_description = a simple erlang worker pool
-pkg_worker_pool_homepage = https://github.com/inaka/worker_pool
-pkg_worker_pool_fetch = git
-pkg_worker_pool_repo = https://github.com/inaka/worker_pool
-pkg_worker_pool_commit = main
diff --git a/index/wrangler.mk b/index/wrangler.mk
deleted file mode 100644
index e6bd979d7..000000000
--- a/index/wrangler.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += wrangler
-pkg_wrangler_name = wrangler
-pkg_wrangler_description = Import of the Wrangler svn repository.
-pkg_wrangler_homepage = http://www.cs.kent.ac.uk/projects/wrangler/Home.html
-pkg_wrangler_fetch = git
-pkg_wrangler_repo = https://github.com/RefactoringTools/wrangler
-pkg_wrangler_commit = master
diff --git a/index/wsock.mk b/index/wsock.mk
deleted file mode 100644
index bb5fec671..000000000
--- a/index/wsock.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += wsock
-pkg_wsock_name = wsock
-pkg_wsock_description = Erlang library to build WebSocket clients and servers
-pkg_wsock_homepage = https://github.com/madtrick/wsock
-pkg_wsock_fetch = git
-pkg_wsock_repo = https://github.com/madtrick/wsock
-pkg_wsock_commit = master
diff --git a/index/xhttpc.mk b/index/xhttpc.mk
deleted file mode 100644
index b48ae37f6..000000000
--- a/index/xhttpc.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += xhttpc
-pkg_xhttpc_name = xhttpc
-pkg_xhttpc_description = Extensible HTTP Client for Erlang
-pkg_xhttpc_homepage = https://github.com/seriyps/xhttpc
-pkg_xhttpc_fetch = git
-pkg_xhttpc_repo = https://github.com/seriyps/xhttpc
-pkg_xhttpc_commit = master
diff --git a/index/xref_runner.mk b/index/xref_runner.mk
deleted file mode 100644
index ded9a6f79..000000000
--- a/index/xref_runner.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += xref_runner
-pkg_xref_runner_name = xref_runner
-pkg_xref_runner_description = Erlang Xref Runner (inspired in rebar xref)
-pkg_xref_runner_homepage = https://github.com/inaka/xref_runner
-pkg_xref_runner_fetch = git
-pkg_xref_runner_repo = https://github.com/inaka/xref_runner
-pkg_xref_runner_commit = master
diff --git a/index/yamerl.mk b/index/yamerl.mk
deleted file mode 100644
index 9c8423179..000000000
--- a/index/yamerl.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += yamerl
-pkg_yamerl_name = yamerl
-pkg_yamerl_description = YAML 1.2 parser in pure Erlang
-pkg_yamerl_homepage = https://github.com/yakaz/yamerl
-pkg_yamerl_fetch = git
-pkg_yamerl_repo = https://github.com/yakaz/yamerl
-pkg_yamerl_commit = master
diff --git a/index/yamler.mk b/index/yamler.mk
deleted file mode 100644
index 324f68ac8..000000000
--- a/index/yamler.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += yamler
-pkg_yamler_name = yamler
-pkg_yamler_description = libyaml-based yaml loader for Erlang
-pkg_yamler_homepage = https://github.com/goertzenator/yamler
-pkg_yamler_fetch = git
-pkg_yamler_repo = https://github.com/goertzenator/yamler
-pkg_yamler_commit = master
diff --git a/index/yaws.mk b/index/yaws.mk
deleted file mode 100644
index 9173508fa..000000000
--- a/index/yaws.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += yaws
-pkg_yaws_name = yaws
-pkg_yaws_description = Yaws webserver
-pkg_yaws_homepage = http://yaws.hyber.org
-pkg_yaws_fetch = git
-pkg_yaws_repo = https://github.com/klacke/yaws
-pkg_yaws_commit = master
diff --git a/index/zippers.mk b/index/zippers.mk
deleted file mode 100644
index 66910c4f9..000000000
--- a/index/zippers.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += zippers
-pkg_zippers_name = zippers
-pkg_zippers_description = A library for functional zipper data structures in Erlang. Read more on zippers
-pkg_zippers_homepage = https://github.com/ferd/zippers
-pkg_zippers_fetch = git
-pkg_zippers_repo = https://github.com/ferd/zippers
-pkg_zippers_commit = master
diff --git a/index/zlists.mk b/index/zlists.mk
deleted file mode 100644
index af56de355..000000000
--- a/index/zlists.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += zlists
-pkg_zlists_name = zlists
-pkg_zlists_description = Erlang lazy lists library.
-pkg_zlists_homepage = https://github.com/vjache/erlang-zlists
-pkg_zlists_fetch = git
-pkg_zlists_repo = https://github.com/vjache/erlang-zlists
-pkg_zlists_commit = master
diff --git a/index/zucchini.mk b/index/zucchini.mk
deleted file mode 100644
index 9334f4218..000000000
--- a/index/zucchini.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGES += zucchini
-pkg_zucchini_name = zucchini
-pkg_zucchini_description = An Erlang INI parser
-pkg_zucchini_homepage = https://github.com/devinus/zucchini
-pkg_zucchini_fetch = git
-pkg_zucchini_repo = https://github.com/devinus/zucchini
-pkg_zucchini_commit = master
diff --git a/packages.v2.tsv b/packages.v2.tsv
deleted file mode 100644
index 5edc65782..000000000
--- a/packages.v2.tsv
+++ /dev/null
@@ -1,3 +0,0 @@
-Please update erlang.mk. :-)
-Run: make erlang-mk
-Enjoy!
diff --git a/pkg_add.sh b/pkg_add.sh
deleted file mode 100755
index 1ebc84586..000000000
--- a/pkg_add.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1$2$3$4$5$6" ]
-then
-	echo "Missing arguments" 1>&2
-	exit 1
-fi
-
-T=`echo "$1" | grep "\." | wc -l `
-if [ "$T" -eq "1" ]
-then
-	echo "Invalid dot character in name. Consider replacing with an underscore." 1>&2
-	exit 1
-fi
-
-PKG_FILE="index/$1.mk"
-CONTENTS="PACKAGES += $1
-pkg_$1_name = $1
-pkg_$1_description = $6
-pkg_$1_homepage = $5
-pkg_$1_fetch = $2
-pkg_$1_repo = $3
-pkg_$1_commit = $4
-"
-COMMIT="Add package $1 to the index"
-
-printf "$CONTENTS" > $PKG_FILE
-git add $PKG_FILE
-git commit -m "$COMMIT" $PKG_FILE
diff --git a/plugins/ci.mk b/plugins/ci.mk
index b97c08713..17110a52a 100644
--- a/plugins/ci.mk
+++ b/plugins/ci.mk
@@ -19,7 +19,7 @@ ci-setup::
 ci-extra::
 	$(verbose) :
 
-ci_verbose_0 = @echo " CI    " $(1);
+ci_verbose_0 = @echo " CI    " $1;
 ci_verbose = $(ci_verbose_$(V))
 
 define ci_target
diff --git a/plugins/hex.mk b/plugins/hex.mk
index b0a5339be..e7c58effb 100644
--- a/plugins/hex.mk
+++ b/plugins/hex.mk
@@ -1,37 +1,6 @@
 # Copyright (c) 2020, Loïc Hoguin <essen@ninenines.eu>
 # This file is part of erlang.mk and subject to the terms of the ISC License.
 
-HEX_CORE_GIT ?= https://github.com/hexpm/hex_core
-HEX_CORE_COMMIT ?= v0.7.0
-
-PACKAGES += hex_core
-pkg_hex_core_name = hex_core
-pkg_hex_core_description = Reference implementation of Hex specifications
-pkg_hex_core_homepage = $(HEX_CORE_GIT)
-pkg_hex_core_fetch = git
-pkg_hex_core_repo = $(HEX_CORE_GIT)
-pkg_hex_core_commit = $(HEX_CORE_COMMIT)
-
-# We automatically depend on hex_core when the project isn't already.
-$(if $(filter hex_core,$(DEPS) $(BUILD_DEPS) $(DOC_DEPS) $(REL_DEPS) $(TEST_DEPS)),,\
-	$(eval $(call dep_target,hex_core)))
-
-hex-core: $(DEPS_DIR)/hex_core
-	$(verbose) if [ ! -e $(DEPS_DIR)/hex_core/ebin/dep_built ]; then \
-		$(MAKE) -C $(DEPS_DIR)/hex_core IS_DEP=1; \
-		touch $(DEPS_DIR)/hex_core/ebin/dep_built; \
-	fi
-
-# @todo This must also apply to fetching.
-HEX_CONFIG ?=
-
-define hex_config.erl
-	begin
-		Config0 = hex_core:default_config(),
-		Config0$(HEX_CONFIG)
-	end
-endef
-
 define hex_user_create.erl
 	{ok, _} = application:ensure_all_started(ssl),
 	{ok, _} = application:ensure_all_started(inets),
diff --git a/test/Makefile b/test/Makefile
index 169cfd036..524011513 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -125,13 +125,19 @@ endef
 
 .PHONY: all clean init
 
-all:: core
+all::
+	$t :
 
 clean::
-	$t rm -rf erl_crash.dump packages/ $(filter-out test_rebar_git/,$(wildcard test_*/))
+	$t rm -rf erl_crash.dump packages/ $(filter-out test_hex_core_git/ test_rebar_git/,$(wildcard test_*/))
 
 init: clean
-	$i "Prefetch Rebar if necessary"
+	$i "Prefetch hex_core if necessary"
+	$t if [ ! -d test_hex_core_git ]; then \
+		git clone -q -n -- https://github.com/hexpm/hex_core test_hex_core_git; \
+	fi
+
+	$i "Prefetch rebar if necessary"
 	$t if [ ! -d test_rebar_git ]; then \
 		git clone -q -n -- https://github.com/erlang/rebar3 test_rebar_git; \
 	fi
@@ -139,6 +145,9 @@ init: clean
 	$i "Generate a bleeding edge Erlang.mk"
 	$t cd .. && $(MAKE) $v
 
+HEX_CORE_GIT = file://$(CURDIR)/test_hex_core_git
+export HEX_CORE_GIT
+
 REBAR3_GIT = file://$(CURDIR)/test_rebar_git
 export REBAR3_GIT
 
@@ -146,11 +155,14 @@ export REBAR3_GIT
 
 .PHONY: core
 
-define include_core
-core:: core-$1
+CORE_TARGETS :=
+PLUGINS_TARGETS :=
 
+define include_core
 include core_$1.mk
 
+CORE_TARGETS += $$(core_$1_TARGETS)
+
 endef
 
 $(eval $(foreach t,$(patsubst %.mk,%,$(patsubst core_%,%,$(wildcard core_*.mk))),$(call include_core,$t)))
@@ -158,14 +170,18 @@ $(eval $(foreach t,$(patsubst %.mk,%,$(patsubst core_%,%,$(wildcard core_*.mk)))
 # Plugins.
 
 define include_plugin
-all:: $1
-
 include plugin_$1.mk
 
+PLUGINS_TARGETS += $$($1_TARGETS)
+
 endef
 
 $(eval $(foreach t,$(patsubst %.mk,%,$(patsubst plugin_%,%,$(wildcard plugin_*.mk))),$(call include_plugin,$t)))
 
+core:: $(CORE_TARGETS)
+
+all:: $(CORE_TARGETS) $(PLUGINS_TARGETS)
+
 # Packages.
 
 PACKAGES = $(foreach pkg,$(sort $(wildcard ../index/*.mk)),$(notdir $(basename $(pkg))))
diff --git a/test/core_app.mk b/test/core_app.mk
index 7d270e3f8..7c9c0466c 100644
--- a/test/core_app.mk
+++ b/test/core_app.mk
@@ -1,10 +1,10 @@
 # Core: Building applications.
 
-CORE_APP_TARGETS = $(call list_targets,core-app)
+core_app_TARGETS = $(call list_targets,core-app)
 
-.PHONY: core-app $(CORE_APP_TARGETS)
+.PHONY: core-app $(core_app_TARGETS)
 
-core-app: $(CORE_APP_TARGETS)
+core-app: $(core_app_TARGETS)
 
 ifdef LEGACY
 core-app-appsrc-change: init
diff --git a/test/core_apps.mk b/test/core_apps.mk
index 72466b20d..8e2223eba 100644
--- a/test/core_apps.mk
+++ b/test/core_apps.mk
@@ -1,10 +1,10 @@
 # Core: Multi-applications.
 
-CORE_APPS_TARGETS = $(call list_targets,core-apps)
+core_apps_TARGETS = $(call list_targets,core-apps)
 
-.PHONY: core-apps $(CORE_APPS_TARGETS)
+.PHONY: core-apps $(core_apps_TARGETS)
 
-core-apps: $(CORE_APPS_TARGETS)
+core-apps: $(core_apps_TARGETS)
 
 core-apps-build: init
 
@@ -444,7 +444,7 @@ core-apps-local-deps: init
 	$t $(MAKE) -C $(APP) new-app in=my_app_1 $v
 
 	$i "Add Lager to the list of dependencies of my_app_1, and add the lager parse_transform"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_1/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_1/Makefile
 
 	$i "Add a lager:error/2 call to my_app_1_app.erl that will fail if the parse_transform doesn't run"
 	$t perl -ni.bak -e 'print;if (/^-export/){print "\n-export([log/0]).\n"} if (eof) {print "\nlog() -> lager:error(\"test\", []).\n"}' $(APP)/apps/my_app_1/src/my_app_1_app.erl
@@ -485,7 +485,7 @@ core-apps-local-deps: init
 
 	$i "Add Lager to the list of dependencies of my_app_2, and add the lager parse_transform"
 	$t mv $(APP)/apps/my_app_2/Makefile.bak $(APP)/apps/my_app_2/Makefile
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_2/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_2/Makefile
 
 	$i "Build the application"
 	$t $(MAKE) -C $(APP) $v
diff --git a/test/core_autopatch.mk b/test/core_autopatch.mk
index 2624f7917..2112f3bef 100644
--- a/test/core_autopatch.mk
+++ b/test/core_autopatch.mk
@@ -1,10 +1,10 @@
 # Core: Autopatch.
 
-CORE_AUTOPATCH_TARGETS = $(call list_targets,core-autopatch)
+core_autopatch_TARGETS = $(call list_targets,core-autopatch)
 
-.PHONY: core-autopatch $(CORE_AUTOPATCH_TARGETS)
+.PHONY: core-autopatch $(core_autopatch_TARGETS)
 
-core-autopatch: $(CORE_AUTOPATCH_TARGETS)
+core-autopatch: $(core_autopatch_TARGETS)
 
 core-autopatch-extended: init
 
@@ -34,7 +34,7 @@ core-autopatch-extended-erlc-opts: init
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
 	$i "Add couchbeam to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = couchbeam\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = couchbeam\ndep_couchbeam = git https://github.com/benoitc/couchbeam master\n"}' $(APP)/Makefile
 
 	$i "Extend autopatch-couchbeam to add options to its ERLC_OPTS"
 	$t echo "autopatch-couchbeam:: ; echo >> \$$(DEPS_DIR)/couchbeam/Makefile; echo 'ERLC_OPTS += -DWITH_JIFFY' >> \$$(DEPS_DIR)/couchbeam/Makefile" >> $(APP)/Makefile
@@ -93,7 +93,7 @@ core-autopatch-no-autopatch-erlang-mk: init
 #	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 #
 #	$i "Add Lager to the list of dependencies and to the NO_AUTOPATCH list"
-#	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\nNO_AUTOPATCH = lager\n"}' $(APP)/Makefile
+#	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\nNO_AUTOPATCH = lager\n"}' $(APP)/Makefile
 #
 #	$i "Build the application"
 #	$t $(MAKE) -C $(APP) $v
@@ -151,7 +151,7 @@ core-autopatch-rebar: init
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
 	$i "Add erlsha2 to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = erlsha2\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = erlsha2\ndep_erlsha2 = git https://github.com/vinoski/erlsha2 master\n"}' $(APP)/Makefile
 
 	$i "Build the application"
 	$t $(MAKE) -C $(APP) $v
@@ -172,7 +172,7 @@ core-autopatch-two-rebar: init
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
 	$i "Add two Rebar projects to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = epgsql mochiweb\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = epgsql mochiweb\ndep_epgsql = git https://github.com/epgsql/epgsql devel\ndep_mochiweb = git https://github.com/mochi/mochiweb main\n"}' $(APP)/Makefile
 
 	$i "Build the application"
 	$t $(MAKE) -C $(APP) $v
diff --git a/test/core_compat.mk b/test/core_compat.mk
index b759a2bd0..c8c570d83 100644
--- a/test/core_compat.mk
+++ b/test/core_compat.mk
@@ -2,13 +2,13 @@
 #
 # Note: autopatch functionality is covered separately.
 
-CORE_COMPAT_TARGETS = $(call list_targets,core-compat)
+core_compat_TARGETS = $(call list_targets,core-compat)
 
 REBAR3_BINARY = https://s3.amazonaws.com/rebar3/rebar3
 
-.PHONY: core-compat $(CORE_COMPAT_TARGETS)
+.PHONY: core-compat $(core_compat_TARGETS)
 
-core-compat: $(CORE_COMPAT_TARGETS)
+core-compat: $(core_compat_TARGETS)
 
 core-compat-auto-rebar: init
 
@@ -195,7 +195,7 @@ core-compat-rebar-deps-hex: init
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
 	$i "Add Cowboy as a dependency"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy = hex 1.0.0\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy = hex 2.12.0\n"}' $(APP)/Makefile
 
 	$i "Run 'make rebar.config'"
 	$t $(MAKE) -C $(APP) rebar.config $v
@@ -206,7 +206,7 @@ core-compat-rebar-deps-hex: init
 	$i "Check that Cowboy is listed in rebar.config"
 	$t $(ERL) -eval " \
 		{ok, C} = file:consult(\"$(APP)/rebar.config\"), \
-		{_, [{cowboy, \"1.0.0\"}]} = lists:keyfind(deps, 1, C), \
+		{_, [{cowboy, \"2.12.0\"}]} = lists:keyfind(deps, 1, C), \
 		halt()"
 
 	$i "Distclean the application"
@@ -312,7 +312,7 @@ core-compat-rebar-pt: init
 	$t echo "-module(girl)." > $(APP)/src/girl.erl
 
 	$i "Add lager to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\n"}' $(APP)/Makefile
 
 	$i "Add the lager_transform parse_transform to ERLC_OPTS"
 	$t echo "ERLC_OPTS += +'{parse_transform, lager_transform}' +'{lager_truncation_size, 1234}'" >> $(APP)/Makefile
diff --git a/test/core_deps.mk b/test/core_deps.mk
index 0308e0c58..dd052e537 100644
--- a/test/core_deps.mk
+++ b/test/core_deps.mk
@@ -1,10 +1,10 @@
 # Core: Packages and dependencies.
 
-CORE_DEPS_TARGETS = $(call list_targets,core-deps)
+core_deps_TARGETS = $(call list_targets,core-deps)
 
-.PHONY: core-deps $(CORE_DEPS_TARGETS)
+.PHONY: core-deps $(core_deps_TARGETS)
 
-core-deps: $(CORE_DEPS_TARGETS)
+core-deps: $(core_deps_TARGETS)
 
 ifneq ($(PLATFORM),msys2)
 core-deps-build-c-8cc: init
@@ -401,8 +401,8 @@ core-deps-dep-commit: init
 	$t cp ../erlang.mk $(APP)/
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
-	$i "Add Cowboy 1.0.0 to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 1.0.0\n"}' $(APP)/Makefile
+	$i "Add Cowboy 2.12.0 to the list of dependencies"
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile
 
 ifdef LEGACY
 	$i "Add Cowboy to the applications key in the .app.src file"
@@ -422,7 +422,7 @@ endif
 		[ok = application:load(App) || App <- [$(APP), cowboy, cowlib, ranch]], \
 		{ok, Deps} = application:get_key($(APP), applications), \
 		true = lists:member(cowboy, Deps), \
-		{ok, \"1.0.0\"} = application:get_key(cowboy, vsn), \
+		{ok, \"2.12.0\"} = application:get_key(cowboy, vsn), \
 		halt()"
 
 core-deps-dir: init
@@ -467,7 +467,7 @@ core-deps-doc: init
 	$t echo "-module(girl)." > $(APP)/src/girl.erl
 
 	$i "Add Edown as a documentation building dependency"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DOC_DEPS = edown\nEDOC_OPTS = {doclet, edown_doclet}\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DOC_DEPS = edown\ndep_edown = git https://github.com/uwiger/edown master\nEDOC_OPTS = {doclet, edown_doclet}\n"}' $(APP)/Makefile
 
 	$i "Build the application"
 	$t $(MAKE) -C $(APP) $v
@@ -586,8 +586,8 @@ core-deps-fetch-git: init
 	$t cp ../erlang.mk $(APP)/
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
-	$i "Add Cowboy 1.0.0 to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy = git https://github.com/ninenines/cowboy 1.0.0\n"}' $(APP)/Makefile
+	$i "Add Cowboy 2.12.0 to the list of dependencies"
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile
 
 ifdef LEGACY
 	$i "Add Cowboy to the applications key in the .app.src file"
@@ -607,7 +607,7 @@ endif
 		[ok = application:load(App) || App <- [$(APP), cowboy, cowlib, ranch]], \
 		{ok, Deps} = application:get_key($(APP), applications), \
 		true = lists:member(cowboy, Deps), \
-		{ok, \"1.0.0\"} = application:get_key(cowboy, vsn), \
+		{ok, \"2.12.0\"} = application:get_key(cowboy, vsn), \
 		halt()"
 
 core-deps-fetch-git-subfolder: init
@@ -712,8 +712,8 @@ core-deps-fetch-hex: init
 	$t cp ../erlang.mk $(APP)/
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
-	$i "Add Cowboy 1.0.0 and SystemD 0.6.0 to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy systemd\ndep_cowboy = hex 1.0.0\ndep_systemd = hex 0.6.0\n"}' $(APP)/Makefile
+	$i "Add Cowboy 2.12.0 and SystemD 0.6.0 to the list of dependencies"
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy systemd\ndep_cowboy = hex 2.12.0\ndep_systemd = hex 0.6.0\n"}' $(APP)/Makefile
 
 ifdef LEGACY
 	$i "Add Cowboy and SystemD to the applications key in the .app.src file"
@@ -736,7 +736,7 @@ endif
 		{ok, Deps} = application:get_key($(APP), applications), \
 		true = lists:member(cowboy, Deps), \
 		true = lists:member(systemd, Deps), \
-		{ok, \"1.0.0\"} = application:get_key(cowboy, vsn), \
+		{ok, \"2.12.0\"} = application:get_key(cowboy, vsn), \
 		{ok, \"0.6.0\"} = application:get_key(systemd, vsn), \
 		halt()"
 
@@ -770,23 +770,6 @@ endif
 #		{ok, \"4.0.3\"} = application:get_key(ehsa, vsn), \
 #		halt()"
 
-# Legacy must fail for the top-level application, but work for dependencies.
-core-deps-fetch-legacy: init
-
-	$i "Bootstrap a new OTP library named $(APP)"
-	$t mkdir $(APP)/
-	$t cp ../erlang.mk $(APP)/
-	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
-
-	$i "Add Cowlib as a dependency using a non-existing fetch method named oops"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib = https://github.com/ninenines/cowlib 1.0.0\n"}' $(APP)/Makefile
-
-	$i "Check that building the application fails"
-	$t ! $(MAKE) -C $(APP) $v
-
-	$i "Check that building the application works with IS_DEP=1"
-	$t $(MAKE) -C $(APP) IS_DEP=1 $v
-
 core-deps-fetch-ln: init
 
 	$i "Bootstrap a new OTP library named $(APP)"
@@ -1223,7 +1206,7 @@ core-deps-mv-rebar: init
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
 	$i "Add Lager to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\n"}' $(APP)/Makefile
 
 	$i "Build the application"
 	$t $(MAKE) -C $(APP) $v
@@ -1401,7 +1384,7 @@ core-deps-rel: init
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib bootstrap-rel $v
 
 	$i "Add Recon to the list of release dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "REL_DEPS = recon\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "REL_DEPS = recon\ndep_recon = git https://github.com/ferd/recon master\n"}' $(APP)/Makefile
 
 	$i "Add Recon to the relx.config file"
 	$t $(ERL) -eval " \
diff --git a/test/core_makedep.mk b/test/core_makedep.mk
index 077df6b3a..6efb2df4c 100644
--- a/test/core_makedep.mk
+++ b/test/core_makedep.mk
@@ -1,10 +1,10 @@
 # Core: COMPILE_FIRST dependencies generation.
 
-CORE_MAKEDEP_TARGETS = $(call list_targets,core-makedep)
+core_makedep_TARGETS = $(call list_targets,core-makedep)
 
-.PHONY: core-makedep $(CORE_MAKEDEP_TARGETS)
+.PHONY: core-makedep $(core_makedep_TARGETS)
 
-core-makedep: $(CORE_MAKEDEP_TARGETS)
+core-makedep: $(core_makedep_TARGETS)
 
 core-makedep-behavior: init
 
diff --git a/test/core_misc.mk b/test/core_misc.mk
index 9b7aa9278..3cd856209 100644
--- a/test/core_misc.mk
+++ b/test/core_misc.mk
@@ -2,11 +2,11 @@
 #
 # The miscellaneous tests use the prefix "core-", not "core-misc-".
 
-CORE_MISC_TARGETS = $(filter-out core-misc,$(call list_targets,core))
+core_misc_TARGETS = $(filter-out core-misc,$(call list_targets,core))
 
-.PHONY: core-misc $(CORE_MISC_TARGETS)
+.PHONY: core-misc $(core_misc_TARGETS)
 
-core-misc: $(CORE_MISC_TARGETS)
+core-misc: $(core_misc_TARGETS)
 
 core-clean-crash-dump: init
 
diff --git a/test/core_plugins.mk b/test/core_plugins.mk
index f8fbff3a9..dcffb9a57 100644
--- a/test/core_plugins.mk
+++ b/test/core_plugins.mk
@@ -1,10 +1,10 @@
 # Core: External plugins.
 
-CORE_PLUGINS_TARGETS = $(call list_targets,core-plugins)
+core_plugins_TARGETS = $(call list_targets,core-plugins)
 
-.PHONY: core-plugins $(CORE_PLUGINS_TARGETS)
+.PHONY: core-plugins $(core_plugins_TARGETS)
 
-core-plugins: $(CORE_PLUGINS_TARGETS)
+core-plugins: $(core_plugins_TARGETS)
 
 core-plugins-all: init
 
diff --git a/test/core_query.mk b/test/core_query.mk
index 85e863f7f..394652a8d 100644
--- a/test/core_query.mk
+++ b/test/core_query.mk
@@ -1,10 +1,10 @@
 # Core: Querying dependencies.
 
-CORE_QUERY_TARGETS = $(call list_targets,core-query)
+core_query_TARGETS = $(call list_targets,core-query)
 
-.PHONY: core-query $(CORE_QUERY_TARGETS)
+.PHONY: core-query $(core_query_TARGETS)
 
-core-query: $(CORE_QUERY_TARGETS)
+core-query: $(core_query_TARGETS)
 
 core-query-deps: init
 
diff --git a/test/core_upgrade.mk b/test/core_upgrade.mk
index 84ff54a63..f165098f2 100644
--- a/test/core_upgrade.mk
+++ b/test/core_upgrade.mk
@@ -1,10 +1,10 @@
 # Core: Erlang.mk upgrade.
 
-CORE_UPGRADE_TARGETS = $(call list_targets,core-upgrade)
+core_upgrade_TARGETS = $(call list_targets,core-upgrade)
 
-.PHONY: core-upgrade $(CORE_UPGRADE_TARGETS)
+.PHONY: core-upgrade $(core_upgrade_TARGETS)
 
-core-upgrade: $(CORE_UPGRADE_TARGETS)
+core-upgrade: $(core_upgrade_TARGETS)
 
 core-upgrade-changelog: init
 
diff --git a/test/plugin_asciidoc.mk b/test/plugin_asciidoc.mk
index 29dfd07a0..b2240ce98 100644
--- a/test/plugin_asciidoc.mk
+++ b/test/plugin_asciidoc.mk
@@ -1,10 +1,10 @@
 # AsciiDoc plugin.
 
-ASCIIDOC_TARGETS = $(call list_targets,asciidoc)
+asciidoc_TARGETS = $(call list_targets,asciidoc)
 
-.PHONY: asciidoc $(ASCIIDOC_TARGETS)
+.PHONY: asciidoc $(asciidoc_TARGETS)
 
-asciidoc: $(ASCIIDOC_TARGETS)
+asciidoc: $(asciidoc_TARGETS)
 
 # Disable the Asciidoc tests requiring the DocBook toolchain
 # when Asciidoc is not installed. The toolchain is too heavy for CI.
diff --git a/test/plugin_bootstrap.mk b/test/plugin_bootstrap.mk
index 7093fceed..ac10ca0ef 100644
--- a/test/plugin_bootstrap.mk
+++ b/test/plugin_bootstrap.mk
@@ -1,10 +1,10 @@
 # Bootstrap plugin.
 
-BOOTSTRAP_TARGETS = $(call list_targets,bootstrap)
+bootstrap_TARGETS = $(call list_targets,bootstrap)
 
-.PHONY: bootstrap $(BOOTSTRAP_TARGETS)
+.PHONY: bootstrap $(bootstrap_TARGETS)
 
-bootstrap: $(BOOTSTRAP_TARGETS)
+bootstrap: $(bootstrap_TARGETS)
 
 bootstrap-app: init
 
diff --git a/test/plugin_c_src.mk b/test/plugin_c_src.mk
index 91422d359..533045295 100644
--- a/test/plugin_c_src.mk
+++ b/test/plugin_c_src.mk
@@ -1,10 +1,10 @@
 # C source plugin.
 
-C_SRC_TARGETS = $(call list_targets,c-src)
+c_src_TARGETS = $(call list_targets,c-src)
 
-.PHONY: c-src $(C_SRC_TARGETS)
+.PHONY: c-src $(c_src_TARGETS)
 
-c-src: $(C_SRC_TARGETS)
+c-src: $(c_src_TARGETS)
 c_src: c-src
 
 ifeq ($(PLATFORM),msys2)
diff --git a/test/plugin_concuerror.mk b/test/plugin_concuerror.mk
index f1b92884e..5bd42318c 100644
--- a/test/plugin_concuerror.mk
+++ b/test/plugin_concuerror.mk
@@ -1,10 +1,10 @@
 # Concuerror plugin.
 
-CONCUERROR_TARGETS = $(call list_targets,concuerror)
+concuerror_TARGETS = $(call list_targets,concuerror)
 
-.PHONY: concuerror $(CONCUERROR_TARGETS)
+.PHONY: concuerror $(concuerror_TARGETS)
 
-concuerror: $(CONCUERROR_TARGETS)
+concuerror: $(concuerror_TARGETS)
 
 concuerror-app: init
 
diff --git a/test/plugin_cover.mk b/test/plugin_cover.mk
index 2ad8ef410..0883fa085 100644
--- a/test/plugin_cover.mk
+++ b/test/plugin_cover.mk
@@ -1,10 +1,10 @@
 # Common Test plugin.
 
-COVER_TARGETS = $(call list_targets,cover)
+cover_TARGETS = $(call list_targets,cover)
 
-.PHONY: cover $(COVER_TARGETS)
+.PHONY: cover $(cover_TARGETS)
 
-cover: $(COVER_TARGETS)
+cover: $(cover_TARGETS)
 
 cover-ct: init
 
@@ -151,8 +151,8 @@ cover-ct-incl-deps: init
 	$t cp ../erlang.mk $(APP)/
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v
 
-	$i "Add Cowboy 1.0.0 to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 1.0.0\n"}' $(APP)/Makefile
+	$i "Add Cowboy 2.12.0 to the list of dependencies"
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile
 
 ifdef LEGACY
 	$i "Add Cowboy to the applications key in the .app.src file"
@@ -437,8 +437,8 @@ cover-eunit-incl-deps: init
 	$t cp ../erlang.mk $(APP)/
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v
 
-	$i "Add Cowboy 1.0.0 to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 1.0.0\n"}' $(APP)/Makefile
+	$i "Add Cowboy 2.12.0 to the list of dependencies"
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile
 
 ifdef LEGACY
 	$i "Add Cowboy to the applications key in the .app.src file"
diff --git a/test/plugin_ct.mk b/test/plugin_ct.mk
index 6c31f496d..a1ecf829e 100644
--- a/test/plugin_ct.mk
+++ b/test/plugin_ct.mk
@@ -1,10 +1,10 @@
 # Common Test plugin.
 
-CT_TARGETS = $(call list_targets,ct)
+ct_TARGETS = $(call list_targets,ct)
 
-.PHONY: ct $(CT_TARGETS)
+.PHONY: ct $(ct_TARGETS)
 
-ct: $(CT_TARGETS)
+ct: $(ct_TARGETS)
 
 ct-all: init
 
diff --git a/test/plugin_dialyzer.mk b/test/plugin_dialyzer.mk
index 732f568b4..e4240d72f 100644
--- a/test/plugin_dialyzer.mk
+++ b/test/plugin_dialyzer.mk
@@ -1,14 +1,27 @@
 # Dialyzer plugin.
 
-DIALYZER_TARGETS = $(call list_targets,dialyzer)
+dialyzer_TARGETS = $(call list_targets,dialyzer)
+
+dialyzer_TARGETS_SET_1 = dialyzer-app dialyzer-apps-only dialyzer-apps-with-local-deps
+dialyzer_TARGETS_SET_2 = dialyzer-beam dialyzer-check dialyzer-custom-plt dialyzer-deps
+dialyzer_TARGETS_SET_3 = dialyzer-erlc-opts dialyzer-local-deps dialyzer-opts dialyzer-plt-apps
+dialyzer_TARGETS_SET_4 = dialyzer-plt-ebin-only dialyzer-plt-swallow-warnings dialyzer-pt
+
+ifneq ($(filter-out $(dialyzer_TARGETS_SET_1) $(dialyzer_TARGETS_SET_2) $(dialyzer_TARGETS_SET_3) $(dialyzer_TARGETS_SET_4),$(dialyzer_TARGETS)),)
+$(error Dialyzer target missing from dialyzer_TARGETS_SET_* variables.)
+endif
+
+ifdef SET
+dialyzer_TARGETS := $(dialyzer_TARGETS_SET_$(SET))
+endif
 
 ifneq ($(shell which sem 2>/dev/null),)
 	DIALYZER_MUTEX = sem --fg --id dialyzer
 endif
 
-.PHONY: dialyzer $(DIALYZER_TARGETS)
+.PHONY: dialyzer $(dialyzer_TARGETS)
 
-dialyzer: $(DIALYZER_TARGETS)
+dialyzer: $(dialyzer_TARGETS)
 
 dialyzer-app: init
 
@@ -105,7 +118,7 @@ dialyzer-beam: init
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v
 
 	$i "Add lager to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\ndep_lager = git https://github.com/erlang-lager/lager master\n"}' $(APP)/Makefile
 
 	$i "Add lager_transform to ERLC_OPTS"
 	$t echo "ERLC_OPTS += +'{parse_transform, lager_transform}'" >> $(APP)/Makefile
@@ -285,6 +298,10 @@ dialyzer-plt-ebin-only: init
 	$i "Build the application"
 	$t $(MAKE) -C $(APP) $v
 
+# @todo Temporary measure to make CACHE_DEPS=1 tests work again.
+	$i "Patch Cowlib's Erlang.mk"
+	$t cp ../erlang.mk $(APP)/deps/cowlib/
+
 	$i "Build Cowlib for tests to fetch autopatched dependencies"
 	$t $(MAKE) -C $(APP)/deps/cowlib test-build $v
 
@@ -308,7 +325,7 @@ dialyzer-plt-swallow-warnings: init
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v
 
 	$i "Add LFE version referring to a missing function to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lfe\ndep_lfe_commit = d656987dc5f5e08306531ad1ce13bf9ca9ec9e5a\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lfe\ndep_lfe = git https://github.com/rvirding/lfe d656987dc5f5e08306531ad1ce13bf9ca9ec9e5a\n"}' $(APP)/Makefile
 
 	$i "Create the PLT file"
 	$t $(DIALYZER_MUTEX) $(MAKE) -C $(APP) plt $v
diff --git a/test/plugin_edoc.mk b/test/plugin_edoc.mk
index 575f6df1d..ca2fce7e8 100644
--- a/test/plugin_edoc.mk
+++ b/test/plugin_edoc.mk
@@ -1,10 +1,10 @@
 # EDoc plugin.
 
-EDOC_TARGETS = $(call list_targets,edoc)
+edoc_TARGETS = $(call list_targets,edoc)
 
-.PHONY: edoc $(EDOC_TARGETS)
+.PHONY: edoc $(edoc_TARGETS)
 
-edoc: $(EDOC_TARGETS)
+edoc: $(edoc_TARGETS)
 
 edoc-build: init
 
@@ -100,7 +100,7 @@ edoc-opts: init
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap $v
 
 	$i "Add edown doclet for EDoc"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DOC_DEPS = edown\nEDOC_OPTS = {doclet, edown_doclet}\n"}' $(APP)/Makefile
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DOC_DEPS = edown\ndep_edown = git https://github.com/uwiger/edown master\nEDOC_OPTS = {doclet, edown_doclet}\n"}' $(APP)/Makefile
 
 	$i "Run EDoc"
 	$t $(MAKE) -C $(APP) edoc $v
diff --git a/test/plugin_erlydtl.mk b/test/plugin_erlydtl.mk
index 1dac6e1b8..0cc077490 100644
--- a/test/plugin_erlydtl.mk
+++ b/test/plugin_erlydtl.mk
@@ -1,10 +1,10 @@
 # ErlyDTL plugin.
 
-ERLYDTL_TARGETS = $(call list_targets,erlydtl)
+erlydtl_TARGETS = $(call list_targets,erlydtl)
 
-.PHONY: erlydtl $(ERLYDTL_TARGETS)
+.PHONY: erlydtl $(erlydtl_TARGETS)
 
-erlydtl: $(ERLYDTL_TARGETS)
+erlydtl: $(erlydtl_TARGETS)
 
 erlydtl-compile: init
 
diff --git a/test/plugin_escript.mk b/test/plugin_escript.mk
index 6479e3fe0..d2dd1e686 100644
--- a/test/plugin_escript.mk
+++ b/test/plugin_escript.mk
@@ -1,10 +1,10 @@
 # Escript plugin.
 
-ESCRIPT_TARGETS = $(call list_targets,escript)
+escript_TARGETS = $(call list_targets,escript)
 
-.PHONY: escript $(ESCRIPT_TARGETS)
+.PHONY: escript $(escript_TARGETS)
 
-escript: $(ESCRIPT_TARGETS)
+escript: $(escript_TARGETS)
 
 escript-build: init
 
@@ -97,8 +97,8 @@ escript-deps-with-deps: init
 	$t cp ../erlang.mk $(APP)/
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
-	$i "Add Cowboy 1.0.0 to the list of dependencies"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 1.0.0\n"}' $(APP)/Makefile
+	$i "Add Cowboy 2.12.0 to the list of dependencies"
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy_commit = 2.12.0\n"}' $(APP)/Makefile
 
 	$i "Generate a module containing a function main/1"
 	$t printf "%s\n" \
diff --git a/test/plugin_eunit.mk b/test/plugin_eunit.mk
index 823f619e6..ba3b192fa 100644
--- a/test/plugin_eunit.mk
+++ b/test/plugin_eunit.mk
@@ -1,10 +1,10 @@
 # EUnit plugin.
 
-EUNIT_TARGETS = $(call list_targets,eunit)
+eunit_TARGETS = $(call list_targets,eunit)
 
-.PHONY: eunit $(EUNIT_TARGETS)
+.PHONY: eunit $(eunit_TARGETS)
 
-eunit: $(EUNIT_TARGETS)
+eunit: $(eunit_TARGETS)
 
 eunit-all: init
 
diff --git a/test/plugin_hex.mk b/test/plugin_hex.mk
index 66bf6fc8c..88ee25992 100644
--- a/test/plugin_hex.mk
+++ b/test/plugin_hex.mk
@@ -4,11 +4,11 @@
 # be started and available on port 4000, and the HEX=1 variable
 # must be set.
 
-HEX_TARGETS = $(call list_targets,hex)
+hex_TARGETS = $(call list_targets,hex)
 
-.PHONY: hex $(HEX_TARGETS)
+.PHONY: hex $(hex_TARGETS)
 
-hex: $(HEX_TARGETS)
+hex: $(hex_TARGETS)
 
 ifeq ($(shell netcat -z localhost 4000 && echo ok),ok)
 hex-user-create: init
diff --git a/test/plugin_proper.mk b/test/plugin_proper.mk
index 108b6e454..42a324d73 100644
--- a/test/plugin_proper.mk
+++ b/test/plugin_proper.mk
@@ -1,10 +1,10 @@
 # PropEr plugin.
 
-PROPER_TARGETS = $(call list_targets,proper)
+proper_TARGETS = $(call list_targets,proper)
 
-.PHONY: proper $(PROPER_TARGETS)
+.PHONY: proper $(proper_TARGETS)
 
-proper: $(PROPER_TARGETS)
+proper: $(proper_TARGETS)
 
 proper-test-dir: init
 
diff --git a/test/plugin_protobuffs.mk b/test/plugin_protobuffs.mk
index 31198f556..2daadf1f7 100644
--- a/test/plugin_protobuffs.mk
+++ b/test/plugin_protobuffs.mk
@@ -1,10 +1,10 @@
 # Protocol buffers plugin.
 
-PROTOBUFFS_TARGETS = $(call list_targets,protobuffs)
+protobuffs_TARGETS = $(call list_targets,protobuffs)
 
-.PHONY: protobuffs $(PROTOBUFFS_TARGETS)
+.PHONY: protobuffs $(protobuffs_TARGETS)
 
-protobuffs: $(PROTOBUFFS_TARGETS)
+protobuffs: $(protobuffs_TARGETS)
 
 PROTOBUFFS_URL = https://raw.githubusercontent.com/basho/erlang_protobuffs/master/test/erlang_protobuffs_SUITE_data
 
@@ -47,7 +47,7 @@ protobuffs-compile-imports: init
 	$t cp ../erlang.mk $(APP)/
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
-	$i "Add protobuffs to the list of dependencies"
+	$i "Add gpb to the list of dependencies"
 	$t perl -ni.bak -e 'print;if ($$.==1) {print "BUILD_DEPS = gpb\n"}' $(APP)/Makefile
 
 	$i "Download two proto files with an import"
@@ -110,7 +110,7 @@ protobuffs-makefile-change: init
 	$t cp ../erlang.mk $(APP)/
 	$t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v
 
-	$i "Add protobuffs to the list of dependencies"
+	$i "Add gpb to the list of dependencies"
 	$t perl -ni.bak -e 'print;if ($$.==1) {print "BUILD_DEPS = gpb\n"}' $(APP)/Makefile
 
 	$i "Download two proto files"
diff --git a/test/plugin_relx.mk b/test/plugin_relx.mk
index 7e08fe041..c91a26b60 100644
--- a/test/plugin_relx.mk
+++ b/test/plugin_relx.mk
@@ -3,9 +3,9 @@
 # Sleeps when interacting with relx script are necessary after start and upgrade
 # as both of those interactions are not synchronized.
 
-RELX_TARGETS = $(call list_targets,relx)
+relx_TARGETS = $(call list_targets,relx)
 
-.PHONY: relx $(RELX_TARGETS)
+.PHONY: relx $(relx_TARGETS)
 
 ifeq ($(PLATFORM),msys2)
 RELX_REL_EXT = .cmd
@@ -13,7 +13,7 @@ else
 RELX_REL_EXT =
 endif
 
-relx: $(RELX_TARGETS)
+relx: $(relx_TARGETS)
 
 relx-rel: init
 
@@ -63,8 +63,8 @@ relx-apps-with-deps: init
 	$i "Include my_app in the release"
 	$t perl -pi.bak -e 's/$(APP),/$(APP), my_app,/' $(APP)/relx.config
 
-	$i "Add Cowlib to the list of dependencies for my_app"
-	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\n"}' $(APP)/apps/my_app/Makefile
+	$i "Add Cowlib 2.13.0 to the list of dependencies for my_app"
+	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib_commit = 2.13.0\n"}' $(APP)/apps/my_app/Makefile
 
 ifdef LEGACY
 	$i "Add Cowlib to the applications key in the my_app.app.src file"
@@ -82,7 +82,7 @@ endif
 	$t test -f $(APP)/deps/cowlib/ebin/cowlib.app
 
 	$i "Check that Cowlib was included in the release"
-	$t test -d $(APP)/_rel/test_relx_apps_with_deps_release/lib/cowlib-1.0.2
+	$t test -d $(APP)/_rel/test_relx_apps_with_deps_release/lib/cowlib-2.13.0
 
 relx-bare-rel: init
 
diff --git a/test/plugin_shell.mk b/test/plugin_shell.mk
index 533f0a725..83b9883ee 100644
--- a/test/plugin_shell.mk
+++ b/test/plugin_shell.mk
@@ -1,10 +1,10 @@
 # Shell plugin.
 
-SHELL_TARGETS = $(call list_targets,shell)
+shell_TARGETS = $(call list_targets,shell)
 
-.PHONY: shell $(C_SRC_TARGETS)
+.PHONY: shell $(shell_TARGETS)
 
-shell: $(SHELL_TARGETS)
+shell: $(shell_TARGETS)
 
 shell-compile: init
 
diff --git a/test/plugin_sphinx.mk b/test/plugin_sphinx.mk
index 915bf8b6c..834a27398 100644
--- a/test/plugin_sphinx.mk
+++ b/test/plugin_sphinx.mk
@@ -2,14 +2,14 @@
 
 # Disable this test suite when sphinx is not installed.
 ifeq ($(shell which sphinx-build),)
-SPHINX_TARGETS =
+sphinx_TARGETS =
 else
-SPHINX_TARGETS = $(call list_targets,sphinx)
+sphinx_TARGETS = $(call list_targets,sphinx)
 endif
 
-.PHONY: sphinx $(SPHINX_TARGETS)
+.PHONY: sphinx $(sphinx_TARGETS)
 
-sphinx: $(SPHINX_TARGETS)
+sphinx: $(sphinx_TARGETS)
 
 sphinx-build: init
 
diff --git a/test/plugin_triq.mk b/test/plugin_triq.mk
index 58fd2176e..bf81d9833 100644
--- a/test/plugin_triq.mk
+++ b/test/plugin_triq.mk
@@ -1,10 +1,10 @@
 # Triq plugin.
 
-TRIQ_TARGETS = $(call list_targets,triq)
+triq_TARGETS = $(call list_targets,triq)
 
-.PHONY: triq $(TRIQ_TARGETS)
+.PHONY: triq $(triq_TARGETS)
 
-triq: $(TRIQ_TARGETS)
+triq: $(triq_TARGETS)
 
 triq-test-dir: init
 
diff --git a/test/plugin_xref.mk b/test/plugin_xref.mk
index 0246e239f..e98d7d06b 100644
--- a/test/plugin_xref.mk
+++ b/test/plugin_xref.mk
@@ -1,10 +1,10 @@
 # Xref plugin.
 
-XREF_TARGETS = $(call list_targets,xref)
+xref_TARGETS = $(call list_targets,xref)
 
-.PHONY: xref $(XREF_TARGETS)
+.PHONY: xref $(xref_TARGETS)
 
-xref: $(XREF_TARGETS)
+xref: $(xref_TARGETS)
 
 xref-check: init