ports/151994: [patch] editors/2bsd-vi: remove libuxre

[Anonymous]

>Number:         151994
>Category:       ports
>Synopsis:       [patch] editors/2bsd-vi: remove libuxre
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 06 20:10:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- remove heirloom sources: libuxre[*] (LGPLv2+) and regexp.h (BSD)
- switch to using regex from libc
- mark as having BSD-style license (4 clauses)
- remove unused patch for 4.x
- don't compile termlib

[*] also makes binary 30Kb less in size
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: editors/2bsd-vi/Makefile
===================================================================
RCS file: /a/.cvsup/ports/editors/2bsd-vi/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- editors/2bsd-vi/Makefile	22 Aug 2009 00:20:10 -0000	1.9
+++ editors/2bsd-vi/Makefile	6 Nov 2010 19:38:03 -0000
@@ -15,6 +15,9 @@ DISTNAME=	ex-${PORTVERSION}
 MAINTAINER=	lx at redundancy.redundancy.org
 COMMENT=	The original vi editor, updated to run on modern OSes
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_BZIP2=	yes
 
 PRESERVEDIR=	/var/preserve/${UNIQUENAME}
@@ -23,6 +26,9 @@ PLIST_SUB=	PRESERVEDIR="${PRESERVEDIR}"
 MAN1=	ex.1 vi.1
 MLINKS=	ex.1 edit.1  vi.1 vedit.1  vi.1 view.1
 
+post-extract:	.SILENT
+	${RM} -fr ${WRKSRC}/libuxre ${WRKSRC}/regexp.h
+
 post-patch:
 .for f in Makefile ex.1 expreserve.c exrecover.c vi.1
 	@${REINPLACE_CMD} -e 's|/var/preserve|${PRESERVEDIR}|' ${WRKSRC}/${f}
Index: editors/2bsd-vi/files/patch-Makefile
===================================================================
RCS file: /a/.cvsup/ports/editors/2bsd-vi/files/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- editors/2bsd-vi/files/patch-Makefile	21 Sep 2010 20:56:14 -0000	1.3
+++ editors/2bsd-vi/files/patch-Makefile	6 Nov 2010 19:42:40 -0000
@@ -21,6 +21,17 @@
  
  #
  # Compiler and linker flags.
+@@ -161,9 +161,7 @@ FEATURES	= -DLISPCODE -DCHDIR -DFASTTAG 
+ # (wchar.h, wctype.h, btowc() etc.) which is not provided by older
+ # compilation environments.
+ #
+-REINC	= -I./libuxre -DUXRE
+-RELIB	= -L./libuxre -luxre
+-RETGT	= uxre
++REINC	= -DUXRE -DREG_ANGLES=0 -DNO_BE_BACKSLASH
+ 
+ #
+ # VMUNIX should be correct for any modern Unix.
 @@ -205,13 +204,13 @@ OSTYPE	= -DVMUNIX
  #
  # You may also get terminfo access by using the ncurses library.
@@ -37,6 +48,14 @@
  
  #
  # Since ex uses sbrk() internally, a conflict with the libc's version of
+@@ -240,7 +237,6 @@ RECOVER	= -DEXRECOVER=\"$(LIBEXECDIR)/ex
+ 			-DEXPRESERVE=\"$(LIBEXECDIR)/expreserve\"
+ CCFLAGS	= $(CFLAGS) $(WARN) $(CPPFLAGS) $(FEATURES) $(CHARSET) $(OSTYPE) \
+ 		$(LARGEF) $(RECOVER) $(LANGMSG) $(REINC) $(RPMCFLAGS)
+-TLIB	= libterm/libtermlib.a
+ INCLUDE	= /usr/include
+ OBJS	= ex.o ex_addr.o ex_cmds.o ex_cmds2.o ex_cmdsub.o \
+ 		ex_data.o ex_extern.o ex_get.o ex_io.o ex_put.o ex_re.o \
 @@ -292,13 +291,6 @@
  # install in standard place
  
Index: editors/2bsd-vi/files/stable-Makefile.patch
===================================================================
RCS file: editors/2bsd-vi/files/stable-Makefile.patch
diff -N editors/2bsd-vi/files/stable-Makefile.patch
--- editors/2bsd-vi/files/stable-Makefile.patch	13 Jul 2004 06:28:28 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
---- /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.
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: