Requires curses. Sync build options to the SunOS Makefile. Fix build flags.

Bump PKGREVISION.

4 files changed, 42 insertions, 12 deletions

diff --git a/editors/mg2a/Makefile b/editors/mg2a/Makefile
index 93c89e32bcb..de0764d7b21 100644
--- a/editors/mg2a/Makefile
+++ b/editors/mg2a/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/10/03 11:43:37 asau Exp $
+# $NetBSD: Makefile,v 1.15 2017/05/09 14:46:55 jperkin Exp $
 
 DISTNAME=	mg2a
 PKGNAME=	mg2a-1.11
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.wustl.edu/languages/c/unix-c/editors/
 EXTRACT_SUFX=	.tar.Z
@@ -27,4 +27,5 @@ do-install:
 	${INSTALL_MAN} ${FILESDIR}/mg.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/mg.rc ${DESTDIR}${PREFIX}/bin/mg.rc
 
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/mg2a/distinfo b/editors/mg2a/distinfo
index 3717c4f2346..637a789f35e 100644
--- a/editors/mg2a/distinfo
+++ b/editors/mg2a/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 03:32:18 agc Exp $
+$NetBSD: distinfo,v 1.13 2017/05/09 14:46:55 jperkin Exp $
 
 SHA1 (mg2a.tar.Z) = c96f890f217eaacb78117f9c73f1ea3709ca8d3f
 RMD160 (mg2a.tar.Z) = 7083ec8b49eb89d1389dabfb915859af2bb40ee1
@@ -9,7 +9,7 @@ SHA1 (patch-ab) = 8d39fe754a6e7f92a8c5afdadaacf3882e471d82
 SHA1 (patch-ac) = 6ef1d0bc88241756cdd3a66050ebfaaf353edcdb
 SHA1 (patch-ad) = d83892a713d75d830f553e58632d2fde55e53cc4
 SHA1 (patch-ae) = 13c976df16c34acffc14615d29ad91a3bdacd716
-SHA1 (patch-af) = fa6e22c0d2c12ca349af2887b606954e4e016269
+SHA1 (patch-af) = 25270ccd23643cfb5b8da10bc069d9b63d9e5a09
 SHA1 (patch-ag) = e8bcbc0cba9cdf989b93d280e108de167281f262
 SHA1 (patch-ah) = 1041e9060e70fbe3e483823a4ab38018c8ce2069
 SHA1 (patch-ai) = fc3d195c0fb3c68cac29c0d7506068b5bca9a847
@@ -22,3 +22,4 @@ SHA1 (patch-ap) = 49aca14c3ee0b1c3c84f3920eb875ec8700f9128
 SHA1 (patch-aq) = 1deef2a00054de186cd73f7d864c5764a41dc2b0
 SHA1 (patch-as) = bcdca9ca43ab34f51a623a5f0f385e62ce7125bf
 SHA1 (patch-at) = c585ce4f8cea93faf55de2c144167dc678bb0d62
+SHA1 (patch-sys_sysv_Makefile) = 2e307a00ce7d8eae4d1c41488fd11b4b7e1c2eaa
diff --git a/editors/mg2a/patches/patch-af b/editors/mg2a/patches/patch-af
index 2ce51720e85..71d6867bdf8 100644
--- a/editors/mg2a/patches/patch-af
+++ b/editors/mg2a/patches/patch-af
@@ -1,17 +1,19 @@
-$NetBSD: patch-af,v 1.3 2007/01/07 00:41:30 rillig Exp $
+$NetBSD: patch-af,v 1.4 2017/05/09 14:46:55 jperkin Exp $
 
---- sys/bsd/Makefile.orig	Wed May 31 16:36:29 2000
-+++ sys/bsd/Makefile	Wed May 31 16:36:31 2000
-@@ -17,7 +17,7 @@
+--- sys/bsd/Makefile.orig	1988-07-03 17:50:59.000000000 +0000
++++ sys/bsd/Makefile
+@@ -17,8 +17,8 @@ LIBS	= -ltermcap
  #	REGEX		-- create regular expression functions
  #
  #CDEFS	=  -DDO_METAKEY
 -CDEFS	=  -DDO_METAKEY -DPREFIXREGION
+-CFLAGS	= -g $(CDEFS)
 +CDEFS	=  -DDO_METAKEY -DPREFIXREGION -DSTARTUPFILE=\"mg.rc\" -DNO_BACKUP -DSYMBLINK
- CFLAGS	= -g $(CDEFS)
++CFLAGS += $(CDEFS)
  
  # Objects which only depend on the "standard" includes
-@@ -42,8 +42,14 @@
+ OBJS	= basic.o dir.o dired.o file.o line.o match.o paragraph.o \
+@@ -42,8 +42,14 @@ SRCS	= basic.c dir.c dired.c file.c line
  OINCS =	ttydef.h sysdef.h chrdef.h
  INCS =	def.h
  
@@ -23,11 +25,11 @@ $NetBSD: patch-af,v 1.3 2007/01/07 00:41:30 rillig Exp $
 +
  mg:	$(OBJ)
 -	cc $(CFLAGS) -o mg $(OBJ) $(LIBS)
-+	gcc $(CFLAGS) -o mg $(OBJ) $(LIBS)
++	gcc $(CFLAGS) -o mg $(OBJ) $(LDFLAGS) $(LIBS)
  
  # strip mg once you're satisfied it'll run -- makes it much smaller
  strip:
-@@ -75,44 +81,52 @@
+@@ -75,44 +81,52 @@ echo.o:	$(INCS) $(OINCS) key.h macro.h
  $(OOBJS):	$(INCS) $(OINCS)
  
  sysdef.h:	sys/$(SYS)/sysdef.h	# Update links, if needed.
diff --git a/editors/mg2a/patches/patch-sys_sysv_Makefile b/editors/mg2a/patches/patch-sys_sysv_Makefile
new file mode 100644
index 00000000000..1ca28429a91
--- /dev/null
+++ b/editors/mg2a/patches/patch-sys_sysv_Makefile
@@ -0,0 +1,26 @@
+$NetBSD: patch-sys_sysv_Makefile,v 1.1 2017/05/09 14:46:55 jperkin Exp $
+
+Sync options with sys/bsd/Makefile, use pkgsrc vars.
+
+--- sys/sysv/Makefile.orig	1988-07-03 17:51:04.000000000 +0000
++++ sys/sysv/Makefile
+@@ -18,8 +18,8 @@ LIBS	= -lcurses
+ #	REGEX		-- create regular expression functions
+ #
+ #CDEFS	=  -DDO_METAKEY
+-CDEFS	=  -DDO_METAKEY -DPREFIXREGION
+-CFLAGS	= -g $(CDEFS)
++CDEFS	=  -DDO_METAKEY -DPREFIXREGION -DSTARTUPFILE=\"mg.rc\" -DNO_BACKUP -DSYMBLINK
++CFLAGS += $(CDEFS)
+ 
+ # Objects which only depend on the "standard" includes
+ OBJS	= basic.o dir.o dired.o file.o line.o match.o paragraph.o \
+@@ -44,7 +44,7 @@ OINCS =	ttydef.h sysdef.h chrdef.h
+ INCS =	def.h
+ 
+ mg:	$(OBJ)
+-	cc $(CFLAGS) -o mg $(OBJ) $(LIBS)
++	cc $(CFLAGS) -o mg $(OBJ) $(LDFLAGS) $(LIBS)
+ 
+ # strip mg once you're satisfied it'll run -- makes it much smaller
+ strip: