main/mc: enable SFTP-vfs. add APKBUILD syntax highliting. non-english help and hints are moved to -lang. mcedit macros examples are moved to -doc. non-english man pages are removed. v1 PROPOSED

Valery Kartel: 1
 main/mc: enable SFTP-vfs. add APKBUILD syntax highliting. non-english help and hints are moved to -lang. mcedit macros examples are moved to -doc. non-english man pages are removed.

 2 files changed, 39 insertions(+), 7 deletions(-)

[alpine-aports] [PATCH] main/mc: enable SFTP-vfs. add APKBUILD syntax highliting. non-english help and hints are moved to -lang. mcedit macros examples are moved to -doc. non-english man pages are removed. Export this patch

---
 main/mc/APKBUILD            | 34 +++++++++++++++++++++++++++-------
 main/mc/alpine_syntax.patch | 12 ++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 main/mc/alpine_syntax.patch

Timo Teras <timo.teras@iki.fi>

8 years ago

Thanks. I took this and the other mc patch, and merged them together. I
also reformatted the commit log message.

Could you format the future patches like this? And if there's follow-up
changes, send single updated patch containing it all and just mark it
v2,v3...

Seems there's still few similar things in the patchworks. Do you think
you could fix the older patches? There was at least
dovecot-pigeonhole-plugins and spamassasin that had two patches that
need merging.

Thanks,
Timo


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index 6e41d18..dbd0692 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -1,15 +1,17 @@
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mc
 pkgver=4.8.15
-pkgrel=0
+pkgrel=1
 pkgdesc="A filemanager/shell that emulates Norton Commander"
-url="http://www.ibiblio.org/mc/"
+url="http://www.midnight-commander.org"
 arch="all"
 license="GPL3+"
 depends=""
 subpackages="$pkgname-doc $pkgname-lang"
-makedepends="e2fsprogs-dev glib-dev pcre-dev ncurses-dev"
-source="http://www.midnight-commander.org/downloads/mc-$pkgver.tar.bz2"
+makedepends="e2fsprogs-dev glib-dev pcre-dev ncurses-dev libssh2-dev"
+source="http://www.midnight-commander.org/downloads/$pkgname-$pkgver.tar.bz2
+	alpine_syntax.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -33,6 +35,7 @@ build() {
 		--enable-background \
 		--enable-charset \
 		--enable-largefile \
+		--enable-vfs-sftp \
 		--with-edit \
 		--with-mmap \
 		--with-screen=ncurses \
@@ -53,6 +56,23 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="db48ce26ba425a61edc51930e94227fd  mc-4.8.15.tar.bz2"
-sha256sums="f74e3da70410975cdeb27ee9a66d1dd812250b6d3ede364bca728dd5a48e5471  mc-4.8.15.tar.bz2"
-sha512sums="d5eb35d5ca25cb5b19d512adc15f11d23035b59c68977a08bdacadc39a3d49cc9c9fe659fd4ca0bb17f8ab7e0b71574cbaac9dbc1935f64f0534a28d60eaffe1  mc-4.8.15.tar.bz2"
+doc() {
+	default_doc;
+	rm -fr "$subpkgdir"/usr/share/man/??
+	mkdir -p "$subpkgdir"/usr/share/doc
+	mv "$pkgdir"/usr/share/mc/examples "$subpkgdir"/usr/share/doc/mc
+}
+
+lang() {
+	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/
+	mv "$pkgdir"/usr/share/mc/hints/mc.hint.* "$subpkgdir"/usr/share/mc/hints/
+}
+
+md5sums="db48ce26ba425a61edc51930e94227fd  mc-4.8.15.tar.bz2
+e483f42ec389b0be50d8b9bafab889eb  alpine_syntax.patch"
+sha256sums="f74e3da70410975cdeb27ee9a66d1dd812250b6d3ede364bca728dd5a48e5471  mc-4.8.15.tar.bz2
+9ca96cc0ea6893e21496621f88a58fbc377d64cc39f5e350e8cec9045bf3bb6c  alpine_syntax.patch"
+sha512sums="d5eb35d5ca25cb5b19d512adc15f11d23035b59c68977a08bdacadc39a3d49cc9c9fe659fd4ca0bb17f8ab7e0b71574cbaac9dbc1935f64f0534a28d60eaffe1  mc-4.8.15.tar.bz2
+aee89eaacaafcdfe2ceb2eb7b7dcf08d669dbaffcb76f4c1613498017096c33068b7bf9d06e6f7d0685c9928cebaa932ab78b3a68f3b2de59b512022b3944e8d  alpine_syntax.patch"
diff --git a/main/mc/alpine_syntax.patch b/main/mc/alpine_syntax.patch
new file mode 100644
index 0000000..a93b854
--- /dev/null
+++ b/main/mc/alpine_syntax.patch
@@ -0,0 +1,12 @@
+--- old/misc/syntax/Syntax.in
++++ new/misc/syntax/Syntax.in
+@@ -238,6 +238,9 @@
+ file .\*\\.strace$ Strace\sdebug\soutput
+ include strace.syntax
+ 
++file APKBUILD$ Alpine\spackage\sbuild\sscript
++include PKGBUILD.syntax
++
+ file PKGBUILD$ Arch\spackage\sbuild\sscript
+ include PKGBUILD.syntax
+ 
-- 
2.7.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---