main/mc: modernize, sanitize patch

Switch to the *.xz source archive. Use https for source and upstream URLs.

2 files changed, 17 insertions, 17 deletions

diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index 2e0de9aef7..edbc39e1fc 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -3,14 +3,14 @@
 pkgname=mc
 pkgver=4.8.20
 pkgrel=0
-pkgdesc="A filemanager/shell that emulates Norton Commander"
-url="http://www.midnight-commander.org"
+pkgdesc="Filemanager/shell that emulates Norton Commander"
+url="https://www.midnight-commander.org"
 arch="all"
 license="GPL-3.0-or-later"
 depends=""
 subpackages="$pkgname-doc $pkgname-lang"
-makedepends="e2fsprogs-dev glib-dev pcre-dev ncurses-dev libssh2-dev"
-source="http://www.midnight-commander.org/downloads/$pkgname-$pkgver.tar.bz2
+makedepends="e2fsprogs-dev glib-dev libssh2-dev ncurses-dev pcre-dev"
+source="https://www.midnight-commander.org/downloads/$pkgname-$pkgver.tar.xz
         alpine_syntax.patch"
 
 builddir="$srcdir/$pkgname-$pkgver"
@@ -34,8 +34,7 @@ build() {
                 --with-subshell \
                 --without-gpm-mouse \
                 --without-included-gettext \
-                --without-x \
-                || return 1
+                --without-x
         make
 }
 
@@ -45,28 +44,29 @@ check() {
 }
 
 package() {
-        make -C "$builddir" DESTDIR="$pkgdir" install || return 1
+        cd "$builddir"
+        make DESTDIR="$pkgdir" install
         rm -fr "$pkgdir"/usr/share/man/??
 }
 
 doc() {
-        default_doc || return 1
-        mkdir -p "$subpkgdir"/usr/share/doc || return 1
+        default_doc
+        mkdir -p "$subpkgdir"/usr/share/doc
         mv "$pkgdir"/usr/share/mc/examples \
-                "$subpkgdir"/usr/share/doc/mc || return 1
+                "$subpkgdir"/usr/share/doc/mc
         find "$pkgdir"/usr/lib/mc -name README* \
                 -exec mv {} "$subpkgdir"/usr/share/doc/mc/ \;
 }
 
 lang() {
-        default_lang || return 1
+        default_lang
         mkdir -p "$subpkgdir"/usr/share/mc/help \
                 "$subpkgdir"/usr/share/mc/hints
         mv "$pkgdir"/usr/share/mc/help/mc.hlp.* \
-                "$subpkgdir"/usr/share/mc/help/ || return 1
+                "$subpkgdir"/usr/share/mc/help/
         mv "$pkgdir"/usr/share/mc/hints/mc.hint.* \
                 "$subpkgdir"/usr/share/mc/hints/
 }
 
-sha512sums="533aff7079374e070c8df9e967c151ef09f44ad507517dd3e607d58eba7357cb6ba3cad31b6a0b27c52791a163b28f8c8218e12eda1d900e83bb25daf9d47849  mc-4.8.20.tar.bz2
-aee89eaacaafcdfe2ceb2eb7b7dcf08d669dbaffcb76f4c1613498017096c33068b7bf9d06e6f7d0685c9928cebaa932ab78b3a68f3b2de59b512022b3944e8d  alpine_syntax.patch"
+sha512sums="c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138  mc-4.8.20.tar.xz
+47aa001e8c20a24631617d665fd0d81b269ebad96696c4bd70c7040bbca713868e02fe53dfaee9a775a57f35a0e7c9e44ce299037379e249ad27354a78d905c3  alpine_syntax.patch"
diff --git a/main/mc/alpine_syntax.patch b/main/mc/alpine_syntax.patch
index a93b85492c..b556f7c474 100644
--- a/main/mc/alpine_syntax.patch
+++ b/main/mc/alpine_syntax.patch
@@ -1,6 +1,6 @@
---- old/misc/syntax/Syntax.in
-+++ new/misc/syntax/Syntax.in
-@@ -238,6 +238,9 @@
+--- a/misc/syntax/Syntax.in
++++ b/misc/syntax/Syntax.in
+@@ -250,6 +250,9 @@
  file .\*\\.strace$ Strace\sdebug\soutput
  include strace.syntax