Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Aug 2005 05:32:12 +0200
From:      Frank Ruell <stoerte@dreamwarrior.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        dd@FreeBSD.org
Subject:   ports/85169: [patch] update editors/mg
Message-ID:  <E1E6gZA-000GP8-Oh@sisyphos.foobar.ath.cx>
Resent-Message-ID: <200508210340.j7L3eFBL092114@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         85169
>Category:       ports
>Synopsis:       [patch] update editors/mg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 21 03:40:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Frank Ruell
>Release:        FreeBSD 6.0-BETA2 i386
>Organization:
>Environment:
System: FreeBSD sisyphos.foobar.ath.cx 6.0-BETA2 FreeBSD 6.0-BETA2 #1: Fri Aug 19 17:50:12 CEST 2005 root@sisyphos.foobar.ath.cx:/usr/obj/usr/src/sys/SISYPHOS i386


>Description:
	It's mostly the same version that comes with OpenBSD 3.7.

	Most important improvements that comes with this update:
	* resizing your xterm doesn't hose Mg anymore
	* modbar is now displayed correctly
	* it has undo!
	it overall just "feels" better.

	Patches are shamelessly stollen from Han:
	* http://www.xs4all.nl/~hanb/software/mg/ 
	who maintains a portable version of Mg.

>How-To-Repeat:
	make tarball && make makesum && make install
>Fix:
--- editors_mg_20050820.diff begins here ---
diff -rN -u old-mg/Makefile new-mg/Makefile
--- old-mg/Makefile	2005-08-21 04:59:23.000000000 +0200
+++ new-mg/Makefile	2005-08-21 04:59:23.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mg
-PORTVERSION=	20010514
+PORTVERSION=	20050820
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dd
@@ -44,10 +44,11 @@
 # 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 @@
 	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 -rN -u old-mg/distinfo new-mg/distinfo
--- old-mg/distinfo	2005-08-21 04:59:23.000000000 +0200
+++ new-mg/distinfo	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-MD5 (mg-20010514.tar.gz) = 36c7ef4af945ccedded2ca9e0635eb2a
-SIZE (mg-20010514.tar.gz) = 100747
diff -rN -u old-mg/files/patch-Makefile new-mg/files/patch-Makefile
--- old-mg/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ new-mg/files/patch-Makefile	2005-08-21 04:59:23.000000000 +0200
@@ -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 -rN -u old-mg/files/patch-def.h new-mg/files/patch-def.h
--- old-mg/files/patch-def.h	1970-01-01 01:00:00.000000000 +0100
+++ new-mg/files/patch-def.h	2005-08-21 04:59:23.000000000 +0200
@@ -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 -rN -u old-mg/files/patch-queue.h new-mg/files/patch-queue.h
--- old-mg/files/patch-queue.h	1970-01-01 01:00:00.000000000 +0100
+++ new-mg/files/patch-queue.h	2005-08-21 04:59:23.000000000 +0200
@@ -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 -rN -u old-mg/files/patch-sysdef.h new-mg/files/patch-sysdef.h
--- old-mg/files/patch-sysdef.h	2005-08-21 04:59:23.000000000 +0200
+++ new-mg/files/patch-sysdef.h	2005-08-21 04:59:23.000000000 +0200
@@ -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


--- editors_mg_20050820.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1E6gZA-000GP8-Oh>