ports/68965: Update: editors/bsd-vi, unbreak on -STABLE

[David Thiel]

>Number:         68965
>Category:       ports
>Synopsis:       Update: editors/bsd-vi, unbreak on -STABLE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 13 00:20:04 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     David Thiel
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD redundancy.redundancy.org 4.9-STABLE FreeBSD 4.9-STABLE #15: Wed Nov 19 21:41:32 PST 2003 lx at redundancy.redundancy.org:/usr/obj/usr/src/sys/REDUNDANCY i386

>Description:

Use the original regex code instead of the default libuxre on -STABLE
and remove a valloc re-declaration, fixing the slightly ironic
requirement of running -CURRENT to build an ancient vi. This does result
in two patches for the same file (Makefile), but they do apply in the
correct order and I can't think of a better way to do it. I'm open to
suggestions if anyone knows a more correct method.

>How-To-Repeat:
>Fix:

diff -ruN 2bsd-vi/Makefile 2bsd-vi.new/Makefile
--- 2bsd-vi/Makefile	Mon Jul 12 14:07:07 2004
+++ 2bsd-vi.new/Makefile	Mon Jul 12 16:38:21 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	vi
 PORTVERSION=	040605
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ex-vi/
@@ -22,7 +23,7 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=			Requires FreeBSD-5.0 or newer
+EXTRA_PATCHES+=	${FILESDIR}/stable-Makefile.patch
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN 2bsd-vi/files/patch-mapalloc.c 2bsd-vi.new/files/patch-mapalloc.c
--- 2bsd-vi/files/patch-mapalloc.c	Wed Dec 31 16:00:00 1969
+++ 2bsd-vi.new/files/patch-mapalloc.c	Mon Jul 12 16:36:55 2004
@@ -0,0 +1,17 @@
+--- /tmp/mapmalloc.c	Mon Jul 12 16:28:16 2004
++++ mapmalloc.c	Mon Jul 12 16:28:37 2004
+@@ -550,14 +550,6 @@
+ 	return NULL;
+ }
+ 
+-/*ARGSUSED*/
+-char *
+-valloc(size)
+-size_t size;
+-{
+-	return NULL;
+-}
+-
+ char *
+ mallinfo()
+ {
diff -ruN 2bsd-vi/files/stable-Makefile.patch 2bsd-vi.new/files/stable-Makefile.patch
--- 2bsd-vi/files/stable-Makefile.patch	Wed Dec 31 16:00:00 1969
+++ 2bsd-vi.new/files/stable-Makefile.patch	Mon Jul 12 16:36:55 2004
@@ -0,0 +1,15 @@
+--- /tmp/Makefile	Mon Jul 12 16:26:36 2004
++++ Makefile	Mon Jul 12 16:26:48 2004
+@@ -144,9 +144,9 @@
+ # advanced multibyte character support etc. which might not be present
+ # on your system.
+ #
+-REINC	= -I./libuxre -DUXRE
+-RELIB	= -L./libuxre -luxre
+-RETGT	= uxre
++#REINC	= -I./libuxre -DUXRE
++#RELIB	= -L./libuxre -luxre
++#RETGT	= uxre
+ 
+ #
+ # These settings should be correct for any modern Unix.
>Release-Note:
>Audit-Trail:
>Unformatted: