Made the package work on Solaris.

4 files changed, 31 insertions, 8 deletions

diff --git a/editors/mg2a/Makefile b/editors/mg2a/Makefile
index 58cdb1d0646..9ca87d81407 100644
--- a/editors/mg2a/Makefile
+++ b/editors/mg2a/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/07 00:18:43 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 00:41:29 rillig Exp $
 
 DISTNAME=	mg2a
 PKGNAME=	mg2a-1.11
@@ -9,10 +9,15 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	tron@NetBSD.org
 COMMENT=	Small, fast, public domain EMACS style editor
 
+BUILD_TARGET=		mg
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-post-extract:
-	cd ${WRKSRC} && ${CP} sys/bsd/Makefile .
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	case ${OPSYS} in \
+	SunOS) cp sys/sysv/Makefile . ;; \
+	*) cp sys/bsd/Makefile . ;; \
+	esac
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mg ${PREFIX}/bin/mg
diff --git a/editors/mg2a/distinfo b/editors/mg2a/distinfo
index def69380b50..f7a38ba6aca 100644
--- a/editors/mg2a/distinfo
+++ b/editors/mg2a/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/06/30 15:59:58 tron Exp $
+$NetBSD: distinfo,v 1.7 2007/01/07 00:41:29 rillig Exp $
 
 SHA1 (mg2a.tar.Z) = c96f890f217eaacb78117f9c73f1ea3709ca8d3f
 RMD160 (mg2a.tar.Z) = 7083ec8b49eb89d1389dabfb915859af2bb40ee1
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = c62b733dc0247ddff65a544c4a5f9593ee324472
 SHA1 (patch-ac) = 6ef1d0bc88241756cdd3a66050ebfaaf353edcdb
 SHA1 (patch-ad) = d83892a713d75d830f553e58632d2fde55e53cc4
 SHA1 (patch-ae) = 025873e653403c6c2141db351bd058c6ed2c2e99
-SHA1 (patch-af) = 23acac8f9fbafd576d6b8a44890688ffe5f216e0
+SHA1 (patch-af) = fa6e22c0d2c12ca349af2887b606954e4e016269
 SHA1 (patch-ag) = e8bcbc0cba9cdf989b93d280e108de167281f262
 SHA1 (patch-ah) = 1041e9060e70fbe3e483823a4ab38018c8ce2069
 SHA1 (patch-ai) = fc3d195c0fb3c68cac29c0d7506068b5bca9a847
@@ -20,3 +20,4 @@ SHA1 (patch-an) = faf386a6ba58793f286aae1e372e318d77f6daa3
 SHA1 (patch-ao) = ebe3ad41e0ad49aa4ea6fe571dbf360af8c70a96
 SHA1 (patch-ap) = 49aca14c3ee0b1c3c84f3920eb875ec8700f9128
 SHA1 (patch-aq) = 1deef2a00054de186cd73f7d864c5764a41dc2b0
+SHA1 (patch-as) = bcdca9ca43ab34f51a623a5f0f385e62ce7125bf
diff --git a/editors/mg2a/patches/patch-af b/editors/mg2a/patches/patch-af
index 1ad3c8842c5..2ce51720e85 100644
--- a/editors/mg2a/patches/patch-af
+++ b/editors/mg2a/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2000/07/10 18:26:54 tron Exp $
+$NetBSD: patch-af,v 1.3 2007/01/07 00:41:30 rillig Exp $
 
---- Makefile.orig	Wed May 31 16:36:29 2000
-+++ Makefile	Wed May 31 16:36:31 2000
+--- 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 @@
  #	REGEX		-- create regular expression functions
  #
diff --git a/editors/mg2a/patches/patch-as b/editors/mg2a/patches/patch-as
new file mode 100644
index 00000000000..5f9fba1f8f5
--- /dev/null
+++ b/editors/mg2a/patches/patch-as
@@ -0,0 +1,17 @@
+$NetBSD: patch-as,v 1.1 2007/01/07 00:41:30 rillig Exp $
+
+--- sys/sysv/ttyio.c.orig	1988-07-03 19:51:10.000000000 +0200
++++ sys/sysv/ttyio.c	2007-01-07 01:38:38.616877688 +0100
+@@ -213,10 +213,11 @@ char *s;
+ /*
+ ** This should check the size of the window, and reset if needed.
+ */
+-
+ setttysize()
+ {
+ #ifdef	TIOCGWINSZ
++	struct winsize winsize;
++
+ 	if (ioctl(0, TIOCGWINSZ, (char *) &winsize) == 0) {
+ 		nrow = winsize . ws_row;
+ 		ncol = winsize . ws_col;