main/slang: upgrade to 2.3.1

main/slang/APKBUILD

@@ -1,51 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=slang
-pkgver=2.2.4
-pkgrel=2
+pkgver=2.3.1
+pkgrel=0
 pkgdesc="S-Lang is a powerful interpreted language"
-url="http://www.s-lang.org/"
+url="http://www.jedsoft.org/slang/"
 arch="all"
 license="GPL"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
 makedepends="pcre-dev ncurses-dev"
-source="ftp://ftp.fu-berlin.de/pub/unix/misc/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz
-	slang-2.2.3-slsh-libs.patch
-	musl-fix-posix_close-clash.patch
-	"
+source="http://www.jedsoft.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2"
 
-prepare () {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build () {
-	cd "$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
+build() {
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
 		|| return 1
 	make -j1 elf static || return 1
 	cd slsh && make || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$builddir"
 	make -j1 install-all DESTDIR="$pkgdir" || return 1
 }
-md5sums="86cd8689cd71e281b4720fef8453ceeb  slang-2.2.4.tar.gz
-7f67ad2059a7dd3cad289da97d547521  slang-2.2.3-slsh-libs.patch
-75edbc059fb9af7916e71ea932010aa4  musl-fix-posix_close-clash.patch"
-sha256sums="e334028e0c75c35406d10fe9e1686f36a615dcc6e2af90e8de25d299e8e6129f  slang-2.2.4.tar.gz
-a60e88f3066fd69b676ad84c34777915f6c59649fabf34f45d8accc6e1c6ed8d  slang-2.2.3-slsh-libs.patch
-47359f7c02691895cafb6b2c1e3fbe8ec59bf8e65d22d1052eb415918dc5689c  musl-fix-posix_close-clash.patch"
-sha512sums="fe5335517d307beb7aea6482f1c78eaed2ce8350685149381eab1cdef69824affee5f1aed24ad0b5a3f13792159c1d0ebb087fb2d9bcd975c6348b9929600629  slang-2.2.4.tar.gz
-0651a89670bbe9f0d15797986edb0c6ce2bc25f3662b530b716a75a30d4df697b08c466c13426372a426e6adf8da00ab34d125da0703e60fe684d7e3e0852a48  slang-2.2.3-slsh-libs.patch
-09dacad6f7bcfc8ac1b946e395f70fa0a57441617a44cbf7a8b964111cd826ba779e454310e5125717f6700e7f1af5b89dd01dcf37e8d9d8f902b3d546f5d5b2  musl-fix-posix_close-clash.patch"
+
+md5sums="bd46d1dc17a50c72004ad842829d7b1f  slang-2.3.1.tar.bz2"
+sha256sums="a810d5da7b0c0c8c335393c6b4f12884be6fa7696d9ca9521ef21316a4e00f9d  slang-2.3.1.tar.bz2"
+sha512sums="9d485c6f758fbeada82c2ed6c48ecf6e101a3875a1d63ef1b6f5d9ccb1844645f23b9bddf3ba0e5c9f807f2e8394415c14788f00cfcd5a4d6fa153387be6648b  slang-2.3.1.tar.bz2"

main/slang/musl-fix-posix_close-clash.patch

@@ -1,20 +0,0 @@
---- slang-2.2.4.orig/src/slposio.c
-+++ slang-2.2.4/src/slposio.c
-@@ -363,7 +363,7 @@
-    return 0;
- }
- 
--static int posix_close (SLFile_FD_Type *f)
-+static int posix_close_slfile (SLFile_FD_Type *f)
- {
-    int status = do_close (f);
- 
-@@ -1001,7 +1001,7 @@
-    MAKE_INTRINSIC_2("write", posix_write, V, F, B),
-    MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F),
-    MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I),
--   MAKE_INTRINSIC_1("close", posix_close, I, F),
-+   MAKE_INTRINSIC_1("close", posix_close_slfile, I, F),
-    MAKE_INTRINSIC_1("_close", posix_close_fd, I, I),
- #if defined(TTYNAME_R)
-    MAKE_INTRINSIC_0("ttyname", posix_ttyname, V),

main/slang/slang-2.2.3-slsh-libs.patch

@@ -1,11 +0,0 @@
---- ./slsh/Makefile.in
-+++ ./slsh/Makefile.in
-@@ -80,7 +80,7 @@
- $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- 	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
--	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(INST_LIBS)
-+	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile
- 	cd $(OBJDIR) && $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) $(SRCDIR)/slsh.c
- $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile