* Makefile.in: update urls and msys2 rules to go to repo.msys2.org * src/msys2-bash.mk, src/msys2-coreutils.mk, src/msys2-diffutils.mk, src/msys2-dos2unix.mk, src/msys2-filesystem.mk, src/msys2-findutils.mk, src/msys2-gawk.mk, src/msys2-gcc-libs.mk, src/msys2-gmp.mk, src/msys2-gnupg.mk, src/msys2-grep.mk, src/msys2-gzip.mk, src/msys2-icu.mk, src/msys2-info.mk, src/msys2-keyring.mk, src/msys2-less.mk, src/msys2-libassuan.mk, src/msys2-libbz2.mk, src/msys2-libcrypt.mk, src/msys2-libexpat.mk, src/msys2-libffi.mk, src/msys2-libgcrypt.mk, src/msys2-libgnutls.mk, src/msys2-libgpg-error.mk, src/msys2-libgpgme.mk, src/msys2-libhogweed.mk, src/msys2-libiconv.mk, src/msys2-libidn2.mk, src/msys2-libintl.mk, src/msys2-libksba.mk, src/msys2-liblzma.mk, src/msys2-libmetalink.mk, src/msys2-libnettle.mk, src/msys2-libnpth.mk, src/msys2-libopenssl.mk, src/msys2-libp11-kit.mk, src/msys2-libpcre.mk, src/msys2-libpcre2.mk, src/msys2-libpsl.mk, src/msys2-libreadline.mk, src/msys2-libsqlite.mk, src/msys2-libtasn1.mk, src/msys2-libunistring.mk, src/msys2-libutil-linux.mk, src/msys2-libxml2.mk, src/msys2-make.mk, src/msys2-mintty.mk, src/msys2-mpfr.mk, src/msys2-ncurses.mk, src/msys2-pacman-mirrors.mk, src/msys2-pacman.mk, src/msys2-patch.mk, src/msys2-perl.mk, src/msys2-runtime.mk, src/msys2-sed.mk, src/msys2-tar.mk, src/msys2-unzip.mk, src/msys2-wget.mk, src/msys2-zip.mk, src/msys2-zlib.mk, src/src-msys2-bash.mk, src/src-msys2-coreutils.mk, src/src-msys2-diffutils.mk, src/src-msys2-dos2unix.mk, src/src-msys2-filesystem.mk, src/src-msys2-findutils.mk, src/src-msys2-gawk.mk, src/src-msys2-gcc-libs.mk, src/src-msys2-gmp.mk, src/src-msys2-gnupg.mk, src/src-msys2-grep.mk, src/src-msys2-gzip.mk, src/src-msys2-icu.mk, src/src-msys2-info.mk, src/src-msys2-keyring.mk, src/src-msys2-less.mk, src/src-msys2-libassuan.mk, src/src-msys2-libbz2.mk, src/src-msys2-libcrypt.mk, src/src-msys2-libexpat.mk, src/src-msys2-libffi.mk, src/src-msys2-libgcrypt.mk, src/src-msys2-libgnutls.mk, src/src-msys2-libgpg-error.mk, src/src-msys2-libgpgme.mk, src/src-msys2-libhogweed.mk, src/src-msys2-libiconv.mk, src/src-msys2-libidn2.mk, src/src-msys2-libintl.mk, src/src-msys2-libksba.mk, src/src-msys2-liblzma.mk, src/src-msys2-libmetalink.mk, src/src-msys2-libnettle.mk, src/src-msys2-libnpth.mk src/src-msys2-libopenssl.mk, src/src-msys2-libp11-kit.mk, src/src-msys2-libpcre.mk, src/src-msys2-libpcre2.mk src/src-msys2-libpsl.mk, src/src-msys2-libreadline.mk, src/src-msys2-libsqlite.mk, src/src-msys2-libtasn1.mk, src/src-msys2-libunistring.mk, src/src-msys2-libutil-linux.mk, src/src-msys2-libxml2.mk, src/src-msys2-make.mk, src/src-msys2-mintty.mk, src/src-msys2-mpfr.mk, src/src-msys2-ncurses.mk, src/src-msys2-pacman-mirrors.mk, src/src-msys2-pacman.mk, src/src-msys2-patch.mk, src/src-msys2-perl.mk, src/src-msys2-runtime.mk, src/src-msys2-sed.mk, src/src-msys2-tar.mk, src/src-msys2-unzip.mk, src/src-msys2-wget.mk, src/src-msys2-zip.mk, src/src-msys2-zlib.mk, src/msys2-grep.mk: update download url

--- a/Makefile.in	Thu Jan 09 13:55:52 2020 -0500
+++ b/Makefile.in	Mon Jan 13 09:34:56 2020 -0500
@@ -459,9 +459,9 @@
     MSYS2_PACKAGES := $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html' | $(GREP) msys2-)
     MSYS2_SOURCES := $(addprefix src-,$(MSYS2_PACKAGES))
     PKGS += $(MSYS2_SOURCES)
-    MSYS2_BASE_URL := https://sourceforge.net/projects/msys2/files/REPOS/MSYS2
+    MSYS2_BASE_URL := http://repo.msys2.org/msys
     MSYS2_URL := $(MSYS2_BASE_URL)/$(MSYS2_ARCH)
-    MSYS2_SRC_URL := $(MSYS2_BASE_URL)/Sources
+    MSYS2_SRC_URL := $(MSYS2_BASE_URL)/sources
     MSYS2_DIR := $(TOP_BUILD_DIR)/msys2
 
     MSYS2_UPDATE_TMP_FILE := $(TOP_BUILD_DIR)/msys_updates.html
@@ -663,8 +663,9 @@
 define MSYS2_PKG_UPDATE
   $(WGET) -q -O- '$(MSYS2_URL)/' | \
   $(GREP) $($(PKG)_NAME) |
-  $(SED) -n 's,.*title="$($(PKG)_NAME)-\(r\?[0-9][^-]*-[0-9]*\)-[^\.]*\.pkg\.tar\.xz".*,\1,p' | \
-  head -1
+  $(SED) -n 's,.*href="$($(PKG)_NAME)-\(r\?[0-9][^-]*-[0-9]*\)-[^\.]*\.pkg\.tar\.xz".*,\1,p' | \
+  $(SORT) -V | \
+  tail -1
 endef
 
 .PHONY: msys2
@@ -1029,8 +1030,9 @@
 define MSYS2_PKG_UPDATE_FILE
   cat $(MSYS2_UPDATE_TMP_FILE) | \
   $(GREP) $($(PKG)_NAME) |
-  $(SED) -n 's,.*title="$($(PKG)_NAME)-\(r\?[0-9][^-]*-[0-9]*\)-[^\.]*\.pkg\.tar\.xz".*,\1,p' | \
-  head -1
+  $(SED) -n 's,.*href="$($(PKG)_NAME)-\(r\?[0-9][^-]*-[0-9]*\)-[^\.]*\.pkg\.tar\.xz".*,\1,p' | \
+  $(SORT) -V | \
+  tail -1
 endef
 
 update-msys2-filelist: