Update to 20110905 provided by ISIHARA Takanori in PR 47079.

Over 2 years of changes.

10 files changed, 68 insertions, 67 deletions

diff --git a/editors/mg/Makefile b/editors/mg/Makefile
index e7c752f7c4b..6a4dee925ed 100644
--- a/editors/mg/Makefile
+++ b/editors/mg/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2012/10/11 13:03:38 marino Exp $
+# $NetBSD: Makefile,v 1.7 2012/12/12 12:47:50 wiz Exp $
 #
 
-DISTNAME=	mg-20090107
+DISTNAME=	mg-20110905
 CATEGORIES=	editors
-MASTER_SITES=	http://www.dds.nl/~han/software/mg/
+MASTER_SITES=	http://homepage.boetes.org/software/mg/
 
 MAINTAINER=	abs@NetBSD.org
-HOMEPAGE=	http://www.han.dds.nl/software/mg/
+HOMEPAGE=	http://homepage.boetes.org/software/mg/
 COMMENT=	Small, fast, public domain EMACS style editor
 
 HAS_CONFIGURE=	yes
 USE_NCURSES=	yes # Uses NCURSES internals
+USE_TOOLS+=	install
 MAKE_ENV+=	prefix=${PREFIX}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
@@ -19,5 +20,13 @@ CONFLICTS+=	mg2a-[0-9]*
 
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_MESSAGE.path=	Adjusting path.
+SUBST_FILES.path=	Makefile.in mg.1
+SUBST_SED.path=		-e "s|/usr/local|${PREFIX}/|g"
+SUBST_SED.path+=	-e "s|/usr/share/doc|${PREFIX}/share/doc|g"
+SUBST_SED.path+=	-e "s|/usr/bin/install|${INSTALL}|g"
+
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/mg/PLIST b/editors/mg/PLIST
index 0dc46f76fbe..8ffc61f1c1c 100644
--- a/editors/mg/PLIST
+++ b/editors/mg/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/13 11:04:14 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/12/12 12:47:50 wiz Exp $
 bin/mg
 man/man1/mg.1
+share/doc/mg/tutorial
diff --git a/editors/mg/distinfo b/editors/mg/distinfo
index f95c91572a9..3dd4bf6d16d 100644
--- a/editors/mg/distinfo
+++ b/editors/mg/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.5 2011/12/19 00:52:09 dholland Exp $
+$NetBSD: distinfo,v 1.6 2012/12/12 12:47:50 wiz Exp $
 
-SHA1 (mg-20090107.tar.gz) = 3191c6dea4996347b6d40b34fa4c88a57e5ef42e
-RMD160 (mg-20090107.tar.gz) = d35cc894d2be7bfafb1943fefb5529c2dcbc2002
-Size (mg-20090107.tar.gz) = 136530 bytes
-SHA1 (patch-aa) = 0999dd117883459d73b410e3e7ebd14e6890f611
-SHA1 (patch-ab) = a5d9864a49c83c4851266b24bea62534859acccc
-SHA1 (patch-ad) = 18dfdc0dd5768389ece4a545974542519220a7e4
-SHA1 (patch-af) = e305ea6c7189b51467c5f46fec42d88c0f54c107
-SHA1 (patch-ag) = 5d973ea998cca712e39a8b207820aea7e2739316
-SHA1 (patch-ah) = 579d1438d959597899ef82ab4bfed662792fa64d
-SHA1 (patch-ai) = 677ec3df1356b00b1ea0f8c8f44531ccf7699b5e
+SHA1 (mg-20110905.tar.gz) = 51d2bac801cab33c9b552c36db5f8637fbbe9363
+RMD160 (mg-20110905.tar.gz) = 721b2a2e9059ddf6ea637dafd205575150b58c8c
+Size (mg-20110905.tar.gz) = 138805 bytes
+SHA1 (patch-ab) = 2deb4c7e78d580434cfedfe9ea23add3b19cc300
+SHA1 (patch-ad) = 735fbcdc5dd0693a9ae3f0da347f5456cf73217e
+SHA1 (patch-af) = 3c36053fe5ad58751b26ea23672f6107d2fa3046
+SHA1 (patch-ag) = f6ac048ea94517fd0c4e3fb9b72045b8eca063fd
+SHA1 (patch-ah) = b18b967789b006d42e9da1c0133ac64bfe8673b3
+SHA1 (patch-ai) = bc9950469e4792867532dcaddba331f07131215c
diff --git a/editors/mg/patches/patch-aa b/editors/mg/patches/patch-aa
deleted file mode 100644
index 3a814c4fa37..00000000000
--- a/editors/mg/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/02/13 11:04:14 abs Exp $
-
---- dired.c.orig	2008-12-30 12:40:28.000000000 +0000
-+++ dired.c
-@@ -570,11 +570,11 @@ d_makename(struct line *lp, char *fn, si
- 	ep = lp->l_text + llength(lp);
- 	p++; /* skip action letter, if any */
- 	for (i = 0; i < NAME_FIELD; i++) {
--		while (p < ep && isspace(*p))
-+		while (p < ep && isspace((unsigned char)*p))
- 			p++;
--		while (p < ep && !isspace(*p))
-+		while (p < ep && !isspace((unsigned char)*p))
- 			p++;
--		while (p < ep && isspace(*p))
-+		while (p < ep && isspace((unsigned char)*p))
- 			p++;
- 		if (p == ep)
- 			return (ABORT);
diff --git a/editors/mg/patches/patch-ab b/editors/mg/patches/patch-ab
index 4b4b82acc04..6884007cbc3 100644
--- a/editors/mg/patches/patch-ab
+++ b/editors/mg/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/02/13 11:04:14 abs Exp $
+$NetBSD: patch-ab,v 1.2 2012/12/12 12:47:50 wiz Exp $
 
---- sysdef.h.orig	2008-12-11 09:38:10.000000000 +0000
+--- sysdef.h.orig	2011-01-02 23:03:41.000000000 +0000
 +++ sysdef.h
 @@ -31,6 +31,7 @@
  #include <string.h>
diff --git a/editors/mg/patches/patch-ad b/editors/mg/patches/patch-ad
index 05b6245d139..1c1a3af8fe2 100644
--- a/editors/mg/patches/patch-ad
+++ b/editors/mg/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.2 2011/12/19 00:52:10 dholland Exp $
+$NetBSD: patch-ad,v 1.3 2012/12/12 12:47:50 wiz Exp $
 
 - use toupper() correctly
 - suppress initialization warning that sometimes (?) arises with gcc 4.5
 
---- extend.c.orig	2007-01-12 17:24:48.000000000 +0000
+--- extend.c.orig	2011-06-18 09:18:54.000000000 +0000
 +++ extend.c
 @@ -445,7 +445,7 @@ dobindkey(KEYMAP *map, const char *func,
  	for (i = 0; *str && i < MAXKEY; i++) {
@@ -14,12 +14,3 @@ $NetBSD: patch-ad,v 1.2 2011/12/19 00:52:10 dholland Exp $
  		} else if (*str == '\\' && *(str + 1) != '\0') {
  			switch (*++str) {
  			case '^':
-@@ -707,7 +707,7 @@ excline(char *line)
- 	long	 nl;
- #ifdef	FKEYS
- 	int	 bind;
--	KEYMAP	*curmap;
-+	KEYMAP	*curmap = NULL;;
- #define BINDARG		0  /* this arg is key to bind (local/global set key) */
- #define	BINDNO		1  /* not binding or non-quoted BINDARG */
- #define BINDNEXT	2  /* next arg " (define-key) */
diff --git a/editors/mg/patches/patch-af b/editors/mg/patches/patch-af
index 95f66c240ab..c08e1f29ca5 100644
--- a/editors/mg/patches/patch-af
+++ b/editors/mg/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/02/13 11:04:14 abs Exp $
+$NetBSD: patch-af,v 1.2 2012/12/12 12:47:50 wiz Exp $
 
---- grep.c.orig	2008-12-30 12:39:43.000000000 +0000
+--- grep.c.orig	2011-01-02 22:57:56.000000000 +0000
 +++ grep.c
 @@ -152,7 +152,7 @@ gid(int f, int n)
  	/* Skip backwards over delimiters we are currently on */
diff --git a/editors/mg/patches/patch-ag b/editors/mg/patches/patch-ag
index a44fb42b6de..ce334009012 100644
--- a/editors/mg/patches/patch-ag
+++ b/editors/mg/patches/patch-ag
@@ -1,22 +1,42 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/02/13 11:04:14 abs Exp $
+$NetBSD: patch-ag,v 1.2 2012/12/12 12:47:50 wiz Exp $
 
---- Makefile.in.orig	2008-12-11 09:11:05.000000000 +0000
+--- Makefile.in.orig	2011-09-05 18:59:14.000000000 +0000
 +++ Makefile.in
-@@ -7,7 +7,7 @@
+@@ -7,20 +7,21 @@
  
  name=		mg
  
 -prefix=		/usr/local
-+prefix?=	/usr/local
++prefix?=	/usr/pkg/
  bindir=		$(prefix)/bin
  libdir=		$(prefix)/lib
  includedir=	$(prefix)/include
-@@ -17,7 +17,7 @@ mandir=		$(prefix)/man
+ mandir=		$(prefix)/man
++docdir=		$(prefix)/share/doc
+ 
+ 
  CC=		gcc
  CFLAGS?=	-O2 -pipe
- CFLAGS+=	-g -Wall -Werror
--LDFLAGS= 	-lncurses
-+LDFLAGS+= 	-lncurses
+-CFLAGS+=	-g -Wall -Werror -Wno-error=unused-but-set-variable
+-LIBS= 		-lncurses
++CFLAGS+=	-g -Wall -Werror
++LIBS+= 		-lncurses
+ 
+-INSTALL=	/usr/bin/install
+-STRIP=		/usr/bin/strip
++INSTALL?=	/usr/bin/install
++STRIP?=		/usr/bin/strip
+ 
+ 
+ OBJS= 	autoexec.o \
+@@ -86,8 +87,10 @@ clean:
+ install: $(name) $(name).1
+ 	$(INSTALL) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -d $(DESTDIR)$(docdir)/mg
+ 	$(INSTALL) -m 755 $(name)		$(DESTDIR)$(bindir)/$(name)
+ 	$(INSTALL) -m 444 $(name).1		$(DESTDIR)$(mandir)/man1/$(name).1
++	$(INSTALL) -m 444 tutorial		$(DESTDIR)$(docdir)/mg/tutorial
  
- INSTALL=	/usr/bin/install
- STRIP=		/usr/bin/strip
+ install-strip: install
+ 	$(STRIP) $(DESTDIR)$(bindir)/$(name)
diff --git a/editors/mg/patches/patch-ah b/editors/mg/patches/patch-ah
index 5291a646769..a63918e899c 100644
--- a/editors/mg/patches/patch-ah
+++ b/editors/mg/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2009/03/11 19:24:41 hasso Exp $
+$NetBSD: patch-ah,v 1.2 2012/12/12 12:47:50 wiz Exp $
 
---- fileio.c.orig	2009-03-11 19:57:37 +0200
-+++ fileio.c	2009-03-11 19:58:36 +0200
-@@ -15,6 +15,10 @@
+--- fileio.c.orig	2011-09-05 18:26:37.000000000 +0000
++++ fileio.c
+@@ -14,6 +14,10 @@
  #define	DEFFILEMODE	(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
  #endif
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.1 2009/03/11 19:24:41 hasso Exp $
  #include <sys/time.h>
  #include <sys/resource.h>
  #include <sys/wait.h>
-@@ -545,11 +549,7 @@ make_file_list(char *buf)
+@@ -544,11 +548,7 @@ make_file_list(char *buf)
  	 * SV files are fairly short.  For BSD, something more general would
  	 * be required.
  	 */
diff --git a/editors/mg/patches/patch-ai b/editors/mg/patches/patch-ai
index a443f14aebd..e8d0329bb47 100644
--- a/editors/mg/patches/patch-ai
+++ b/editors/mg/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2009/11/26 18:10:14 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2012/12/12 12:47:50 wiz Exp $
 
---- configure.orig	2009-11-26 19:05:06.000000000 +0100
+--- configure.orig	2011-09-05 18:36:16.000000000 +0000
 +++ configure
 @@ -163,32 +163,6 @@ else
      echo 'Fails.'