From 311c5b11e76199d37b1273a720cb82ceb85ae402 Mon Sep 17 00:00:00 2001
From: Sam Lawrance <lawrance@FreeBSD.org>
Date: Wed, 16 Nov 2005 16:05:35 +0000
Subject: Update to 20050820 snapshot.

PR:		ports/85169
Submitted by:	Frank Ruell <stoerte@dreamwarrior.net> (new maintainer)
---
 editors/mg/Makefile             | 11 +++++++----
 editors/mg/distinfo             |  5 +++--
 editors/mg/files/patch-Makefile | 10 ++++++++++
 editors/mg/files/patch-def.h    | 11 +++++++++++
 editors/mg/files/patch-queue.h  |  4 ++++
 editors/mg/files/patch-sysdef.h | 18 ++++++++++--------
 6 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 editors/mg/files/patch-Makefile
 create mode 100644 editors/mg/files/patch-def.h
 create mode 100644 editors/mg/files/patch-queue.h

(limited to 'editors/mg')

diff --git a/editors/mg/Makefile b/editors/mg/Makefile
index 5709bab1531d..132e4db0aae0 100644
--- a/editors/mg/Makefile
+++ b/editors/mg/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	mg
-PORTVERSION=	20010514
+PORTVERSION=	20050820
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dd
+MASTER_SITE_SUBDIR=	lawrance
 
 MAINTAINER=	stoerte@dreamwarrior.net
 COMMENT=	A small, fast Emacs-like editor
@@ -44,10 +44,11 @@ do-install:
 # Ports build/install stuff stops here.  Tarball creation stuff begins here.
 #
 CVS_CMD?=	cvs -z3
-CVS_DATE=	Mon May 14 17:41:46 PDT 2001
+CVS_DATE=	Sat Aug 20 21:22:23 UTC 2005
 CVS_SITES?=	anoncvs@anoncvs3.usa.openbsd.org:/cvs \
 		anoncvs@anoncvs1.ca.openbsd.org:/cvs
 CVS_MODULE=	src/usr.bin/mg
+CVS_STRTONUM=	src/lib/libc/stdlib/strtonum.c
 
 #
 # CVS checkout stuff mostly stolen from security/openssh-askpass port by
@@ -59,12 +60,14 @@ tarball:
 	for CVS_SITE in ${CVS_SITES}; do \
 		${ECHO_MSG} ">> Attempting to check out from $${CVS_SITE}."; \
 		if ${CVS_CMD} -d $${CVS_SITE} co -D "${CVS_DATE}" \
-		    ${CVS_MODULE}; then \
+		    ${CVS_MODULE} ${CVS_STRTONUM}; then \
 			cd ${DISTDIR}; \
 			${ECHO_MSG} ">> Creating dist tarball in ${DISTDIR}"; \
 			${ECHO_MSG} ">> \"${PKGNAME}.tar.gz\"."; \
 			${MV} ${PKGNAME}/${CVS_MODULE} \
 				${PKGNAME}/${CVS_MODULE:H}/${PKGNAME}; \
+			${MV} ${PKGNAME}/${CVS_STRTONUM} \
+				${PKGNAME}/${CVS_MODULE:H}/${PKGNAME}; \
 			${TAR} -cz \
 				-X ${FILESDIR}/tarignore \
 				-f ${PKGNAME}.tar.gz \
diff --git a/editors/mg/distinfo b/editors/mg/distinfo
index d4d75bf76624..43c9dd79b34c 100644
--- a/editors/mg/distinfo
+++ b/editors/mg/distinfo
@@ -1,2 +1,3 @@
-MD5 (mg-20010514.tar.gz) = 36c7ef4af945ccedded2ca9e0635eb2a
-SIZE (mg-20010514.tar.gz) = 100747
+MD5 (mg-20050820.tar.gz) = b3083b7fa423f67ef0924277d9115cfb
+SHA256 (mg-20050820.tar.gz) = cc5d54822dacafbc263bb80c179fedc89d553f69b5a2dcb8fd33f2de20f75649
+SIZE (mg-20050820.tar.gz) = 117541
diff --git a/editors/mg/files/patch-Makefile b/editors/mg/files/patch-Makefile
new file mode 100644
index 000000000000..d6e74c209768
--- /dev/null
+++ b/editors/mg/files/patch-Makefile
@@ -0,0 +1,10 @@
+diff -u -x _darcs -ur _darcs/current/Makefile ./Makefile
+--- _darcs/current/Makefile	Thu Mar 10 19:27:47 2005
++++ ./Makefile	Sun Aug 21 02:41:52 2005
+@@ -29,4 +29,6 @@
+ #
+ SRCS+=	grep.c theo.c mail.c
+ 
++SRCS+=	strtonum.c
++
+ .include <bsd.prog.mk>
diff --git a/editors/mg/files/patch-def.h b/editors/mg/files/patch-def.h
new file mode 100644
index 000000000000..8786d400eb14
--- /dev/null
+++ b/editors/mg/files/patch-def.h
@@ -0,0 +1,11 @@
+diff -u -x _darcs -ur _darcs/current/def.h ./def.h
+--- _darcs/current/def.h	Tue Jun 14 20:14:40 2005
++++ ./def.h	Sun Aug 21 02:30:50 2005
+@@ -3,6 +3,7 @@
+ /* This file is in the public domain. */
+ 
+ #include <sys/queue.h>
++#include "queue.h"
+ 
+ /*
+  * This file is the general header file for all parts
diff --git a/editors/mg/files/patch-queue.h b/editors/mg/files/patch-queue.h
new file mode 100644
index 000000000000..1eecfd4c6874
--- /dev/null
+++ b/editors/mg/files/patch-queue.h
@@ -0,0 +1,4 @@
+--- /dev/null	Sun Aug 21 03:44:00 2005
++++ queue.h	Sun Aug 21 02:27:51 2005
+@@ -0,0 +1 @@
++#define LIST_END(head)                  NULL
diff --git a/editors/mg/files/patch-sysdef.h b/editors/mg/files/patch-sysdef.h
index 254fc87aefa3..20947af10489 100644
--- a/editors/mg/files/patch-sysdef.h
+++ b/editors/mg/files/patch-sysdef.h
@@ -1,9 +1,11 @@
---- sysdef.h.orig	Mon Dec 29 11:37:41 2003
-+++ sysdef.h	Mon Dec 29 11:38:00 2003
-@@ -23,5 +23,5 @@
- struct fileinfo {
- 	mode_t          fi_mode;
- 	uid_t           fi_uid;
--	gid_t short     fi_gid;
-+	gid_t	fi_gid;
+diff -u -x _darcs -ur _darcs/current/sysdef.h ./sysdef.h
+--- _darcs/current/sysdef.h	Tue Jun 14 20:14:40 2005
++++ ./sysdef.h	Sun Aug 21 02:47:40 2005
+@@ -26,3 +26,7 @@
+ 	gid_t		fi_gid;
+ 	mode_t		fi_mode;
  };
++
++#ifndef LOGIN_NAME_MAX
++#define LOGIN_NAME_MAX MAXLOGNAME
++#endif
-- 
cgit v1.2.3