Subject: [alpine-aports] [PATCH] main/mg: upgrade to 20170401 and add unicode support

From: Cág <[email-masked]>
Date: Wed, 7 Jun 2017 18:55:10 +0100

---
 main/mg/APKBUILD         | 20 ++++++-------
 main/mg/musl-fixes.patch | 75 ------------------------------------------------
 2 files changed, 9 insertions(+), 86 deletions(-)
 delete mode 100644 main/mg/musl-fixes.patch

diff --git a/main/mg/APKBUILD b/main/mg/APKBUILD
index 4d3f36eadc..3e618c3552 100644
--- a/main/mg/APKBUILD
+++ b/main/mg/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Lee Hinman <[email-masked]>
-# Maintainer: Natanael Copa <[email-masked]>
+# Maintainer: Cág <[email-masked]>
 pkgname=mg
-pkgver=20140414
-pkgrel=3
+pkgver=20170401
+pkgrel=0
 pkgdesc="mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team."
 url="http://homepage.boetes.org/software/mg"
 arch="x86 x86_64"
@@ -11,8 +11,9 @@ depends=
 makedepends="ncurses-dev libbsd-dev bsd-compat-headers"
 install=
 subpackages="$pkgname-doc"
-source="http://dev.alpinelinux.org/archive/$pkgname-$pkgver.tar.gz
-	musl-fixes.patch
+source="http://homepage.boetes.org/software/mg/$pkgname-$pkgver.tar.gz
+	missing-defines.patch
+	unicode.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -38,9 +39,6 @@ package() {
 	install -Dm644 tutorial "$pkgdir"/usr/share/doc/$pkgname/tutorial
 }
 
-md5sums="ad4a99a5e26d25db75af7936c6657fbe  mg-20140414.tar.gz
-b09b7700ded811df8f6cf35f9a8df1ff  musl-fixes.patch"
-sha256sums="89ce25ee13cedc14c3c5c7b76d7a9e0ea38a060ad61e90ac43258d8dadf0d065  mg-20140414.tar.gz
-f05ae4f0cd9475932ebe51e32ce05217e7fb59a5a0614efd2b33af4cc888323c  musl-fixes.patch"
-sha512sums="b080b24c6015225ee1670eb6f062a21f40d34b02c699687d92842983506497c93e15cceb79d05b6cbbebfa8466f7261cb7dde8bcc4888489236cf64104215161  mg-20140414.tar.gz
-47ced85e221951c02654533a015be67018c045ad336a9997b70dcc869f10546318aeae8d1fbd43248d485e4f9c1c950deb93789b7aa8def493ba036af1beaaa1  musl-fixes.patch"
+sha512sums="729b2d9ba7eb236cc8bcbcf3ac7604494980cbf2fd21dc5a3856011bc830eee75be29a246b0bf3dfa6c7a03fcf69a902ae50d05ea371ac4d0225a4da6089d7ce  mg-20170401.tar.gz
+f1967dd33a025e11ff63ba797c2fb64ac0679cd6c09a332241a28e0976b96db467894e1e3573c5bc88b7feaecdb430695aa4f8fa2712b227d0947b3d8b05c97c  missing-defines.patch
+586a622b6838bb5b4f2e958352cec6bd4ca9c7db93bcc0dfeb6d8e588fb1191bc5f01afd17a385c10ddbd6ceb631d2d9caccd4e080294d1fceb5db676ab6a4fc  unicode.patch"
diff --git a/main/mg/musl-fixes.patch b/main/mg/musl-fixes.patch
deleted file mode 100644
index 31f3fbcc6b..0000000000
--- a/main/mg/musl-fixes.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/GNUmakefile b/GNUmakefile
-index a89c697..ece5944 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -31,7 +31,7 @@ CURSES_LIBS=	-lcurses
- CC=		gcc
- CFLAGS?=	-O2 -pipe
- CFLAGS+=	-g -Wall
--CPPFLAGS=	-DFKEYS -DREGEX -DXKEYS
-+CPPFLAGS=	-DFKEYS -DXKEYS
- CPPFLAGS+=	$(BSD_CPPFLAGS) -D__dead=__dead2
- LIBS=		$(CURSES_LIBS) $(BSD_LIBS)
- 
-diff --git a/Makefile b/Makefile
-index 023ed17..0c92790 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@ DPADD+=	${LIBCURSES} ${LIBUTIL}
- #	XKEYS		-- use termcap function key definitions.
- #				note: XKEYS and bsmap mode do _not_ get along.
- #
--CFLAGS+=-Wall -DFKEYS -DREGEX -DXKEYS
-+CFLAGS+=-Wall -DFKEYS -DXKEYS
- 
- SRCS=	autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \
- 	echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \
-diff --git a/main.c b/main.c
-index 9204d63..dfd4a6a 100644
---- a/main.c
-+++ b/main.c
-@@ -14,6 +14,10 @@
- #include <err.h>
- #include <locale.h>
- 
-+#ifndef __dead2
-+#define __dead2
-+#endif
-+
- int		 thisflag;			/* flags, this command	*/
- int		 lastflag;			/* flags, last command	*/
- int		 curgoal;			/* goal column		*/
-diff --git a/sysdef.h b/sysdef.h
-index 8d3d3a2..ea82d73 100644
---- a/sysdef.h
-+++ b/sysdef.h
-@@ -8,12 +8,7 @@
- #include <sys/param.h>
- #include <sys/queue.h>
- 
--/* necesarry to get asprintf & friends with glibc XXX doesn't work for some
-- * mysterious reason! */
--#ifdef __GLIBC__
--#  define _GNU_SOURCE
--#  define __USE_GNU
--#endif
-+#define _GNU_SOURCE
- 
- #if defined(__APPLE__) || defined(__FreeBSD__)
- #  define LOGIN_NAME_MAX _POSIX_LOGIN_NAME_MAX
-@@ -25,10 +20,15 @@
- #include <string.h>
- #include <errno.h>
- #include <signal.h>
-+#include <fcntl.h>
- 
- #define	KBLOCK		8192	/* Kill grow.			 */
- #define	GOOD		0	/* Good exit status.		 */
- 
-+#ifndef DEFFILEMODE			/* 4.4BSD extension. */
-+#define	DEFFILEMODE	(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
-+#endif
-+
- typedef int	RSIZE;		/* Type for file/region sizes	 */
- typedef short	KCHAR;		/* Type for internal keystrokes	 */
- 
-- 
2.13.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---