7 files changed, 13 insertions, 48 deletions
diff --git a/plugins/apps/ricochet.mk b/plugins/apps/ricochet.mk
index 518c4f8..e876154 100644
--- a/plugins/apps/ricochet.mk
+++ b/plugins/apps/ricochet.mk
@@ -1,20 +1,14 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := ricochet
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.1.4
-$(PKG)_CHECKSUM := f5f32caa3480def1de5c93010c6bf5f5789ddcba34bf09fc0feab67696d0c374
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-src.tar.bz2
-$(PKG)_URL      := https://ricochet.im/releases/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_WEBSITE  := https://ricochet.im/
 $(PKG)_OWNER    := https://github.com/starius
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.1.4
+$(PKG)_CHECKSUM := 4eb9000bc3f6c6a18659479015af980c16f971d468d10410ebeac8ada720d2cd
+$(PKG)_GH_CONF  := ricochet-im/ricochet/tags, v
 $(PKG)_DEPS     := cc openssl protobuf qtbase qtdeclarative qtmultimedia qtquickcontrols qttools
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, ricochet-im/ricochet, v)
-endef
-
 define $(PKG)_BUILD
     # TODO: add libasan and libubsan and let ricochet use them.
     # See https://github.com/ricochet-im/ricochet/blob/master/BUILDING.md#hardening
diff --git a/plugins/apps/wrk.mk b/plugins/apps/wrk.mk
index 9c6bcb3..e960cb4 100644
--- a/plugins/apps/wrk.mk
+++ b/plugins/apps/wrk.mk
@@ -1,20 +1,14 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := wrk
+$(PKG)_WEBSITE  := https://github.com/wg/wrk
+$(PKG)_OWNER    := https://github.com/starius
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 4.0.1
 $(PKG)_CHECKSUM := c03bbc283836cb4b706eb6bfd18e724a8ce475e2c16154c13c6323a845b4327d
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/wg/wrk/archive/$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := https://github.com/wg/wrk
-$(PKG)_OWNER    := https://github.com/starius
+$(PKG)_GH_CONF  := wg/wrk/tags
 $(PKG)_DEPS     := cc luajit openssl pthreads $(BUILD)~luajit
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, wg/wrk)
-endef
-
 define $(PKG)_BUILD
     $(MAKE) \
         -C '$(1)' \
diff --git a/plugins/luarocks/llthreads2.mk b/plugins/luarocks/llthreads2.mk
index 5c8023c..af5dccf 100644
--- a/plugins/luarocks/llthreads2.mk
+++ b/plugins/luarocks/llthreads2.mk
@@ -6,15 +6,9 @@ $(PKG)_OWNER    := https://github.com/starius
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.1.3
 $(PKG)_CHECKSUM := 8c6fc7966cdcc15ae2f89f66ae72f6727a985e7d254f139ecf75a50956a3e8e4
-$(PKG)_SUBDIR   := lua-$(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
-$(PKG)_URL      := https://github.com/moteus/lua-llthreads2/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_GH_CONF  := moteus/lua-llthreads2/tags, v
 $(PKG)_DEPS     := cc luarocks
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, moteus/lua-llthreads2, v)
-endef
-
 # shared-only because luarocks is shared-only
 
 define $(PKG)_BUILD_SHARED
diff --git a/plugins/luarocks/lua-rapidjson.mk b/plugins/luarocks/lua-rapidjson.mk
index 7d73adb..8c22645 100644
--- a/plugins/luarocks/lua-rapidjson.mk
+++ b/plugins/luarocks/lua-rapidjson.mk
@@ -6,15 +6,9 @@ $(PKG)_OWNER    := https://github.com/starius
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.2.2-1
 $(PKG)_CHECKSUM := 10783d8633df3f50b1ad33c7de89d2a94a7d9cf45e2ce5217d0d2d5e77396fd2
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
-$(PKG)_URL      := https://github.com/xpol/lua-rapidjson/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_GH_CONF  := xpol/lua-rapidjson/tags, v
 $(PKG)_DEPS     := cc luarocks
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, xpol/lua-rapidjson, v)
-endef
-
 # shared-only because luarocks is shared-only
 
 define $(PKG)_BUILD_SHARED
diff --git a/plugins/luarocks/luasocket.mk b/plugins/luarocks/luasocket.mk
index a17c375..34547fc 100644
--- a/plugins/luarocks/luasocket.mk
+++ b/plugins/luarocks/luasocket.mk
@@ -6,15 +6,9 @@ $(PKG)_OWNER    := https://github.com/starius
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3.0-rc1
 $(PKG)_CHECKSUM := 8b67d9b5b545e1b694753dab7bd6cdbc24c290f2b21ba1e14c77b32817ea1249
-$(PKG)_SUBDIR   := luasocket-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
-$(PKG)_URL      := https://github.com/diegonehab/luasocket/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_GH_CONF  := diegonehab/luasocket/tags, v
 $(PKG)_DEPS     := cc luarocks
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, diegonehab/luasocket, v)
-endef
-
 # shared-only because luarocks is shared-only
 
 define $(PKG)_BUILD_SHARED
diff --git a/plugins/luarocks/luv.mk b/plugins/luarocks/luv.mk
index a1649e8..758c7ab 100644
--- a/plugins/luarocks/luv.mk
+++ b/plugins/luarocks/luv.mk
@@ -6,15 +6,9 @@ $(PKG)_OWNER    := https://github.com/starius
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.9.0-1
 $(PKG)_CHECKSUM := fab5ba54f141711afc432216d03f3664710798204c78a2a7414479f10b2b2d83
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
-$(PKG)_URL      := https://github.com/luvit/luv/releases/download/1.9.0-1/$($(PKG)_FILE)
+$(PKG)_GH_CONF  := luvit/luv/tags
 $(PKG)_DEPS     := cc libuv luarocks
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, luvit/luv)
-endef
-
 # shared-only because luarocks is shared-only
 
 define $(PKG)_BUILD_SHARED
diff --git a/plugins/qt4/qt4-overlay.mk b/plugins/qt4/qt4-overlay.mk
index e0c856c..951986f 100644
--- a/plugins/qt4/qt4-overlay.mk
+++ b/plugins/qt4/qt4-overlay.mk
@@ -4,8 +4,9 @@
 
 PKG               := libechonest
 $(PKG)_DEPS       := $(filter-out qtbase ,$($(PKG)_DEPS)) qt qjson
-$(PKG)_QT_SUFFIX  := 4
+$(PKG)_QT_SUFFIX  :=
 $(PKG)_QT4_BOOL   := ON
+$(PKG)_BUILD_STATIC =
 
 PKG               := opencsg
 $(PKG)_DEPS       := $(filter-out qtbase ,$($(PKG)_DEPS)) qt