From owner-svn-src-user@FreeBSD.ORG  Wed May 11 00:47:25 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9835F106566B;
	Wed, 11 May 2011 00:47:25 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 366E28FC0A;
	Wed, 11 May 2011 00:47:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4B0lP4T066725;
	Wed, 11 May 2011 00:47:25 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4B0lPlo066722;
	Wed, 11 May 2011 00:47:25 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201105110047.p4B0lPlo066722@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 11 May 2011 00:47:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221752 - in user/gabor/tre-integration/lib/libc/regex:
	. grot
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 May 2011 00:47:25 -0000

Author: gabor
Date: Wed May 11 00:47:24 2011
New Revision: 221752
URL: http://svn.freebsd.org/changeset/base/221752

Log:
  - Remove old regex code and build TRE instead

Deleted:
  user/gabor/tre-integration/lib/libc/regex/COPYRIGHT
  user/gabor/tre-integration/lib/libc/regex/WHATSNEW
  user/gabor/tre-integration/lib/libc/regex/cname.h
  user/gabor/tre-integration/lib/libc/regex/engine.c
  user/gabor/tre-integration/lib/libc/regex/grot/
  user/gabor/tre-integration/lib/libc/regex/regcomp.c
  user/gabor/tre-integration/lib/libc/regex/regerror.c
  user/gabor/tre-integration/lib/libc/regex/regex2.h
  user/gabor/tre-integration/lib/libc/regex/regexec.c
  user/gabor/tre-integration/lib/libc/regex/regfree.c
  user/gabor/tre-integration/lib/libc/regex/utils.h
Modified:
  user/gabor/tre-integration/lib/libc/regex/Makefile.inc
  user/gabor/tre-integration/lib/libc/regex/Symbol.map

Modified: user/gabor/tre-integration/lib/libc/regex/Makefile.inc
==============================================================================
--- user/gabor/tre-integration/lib/libc/regex/Makefile.inc	Wed May 11 00:46:22 2011	(r221751)
+++ user/gabor/tre-integration/lib/libc/regex/Makefile.inc	Wed May 11 00:47:24 2011	(r221752)
@@ -1,17 +1,17 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-# regex sources
-.PATH: ${.CURDIR}/regex
+.PATH: ${.CURDIR}/../../contrib/tre/lib ${.CURDIR}/regex
 
-CFLAGS+=-DPOSIX_MISTAKE
+CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/../../contrib/tre
 
-SRCS+=	regcomp.c regerror.c regexec.c regfree.c
+SRCS+=	regcomp.c regerror.c regexec.c tre-ast.c tre-compile.c \
+	tre-match-approx.c tre-match-backtrack.c tre-match-parallel.c \
+	tre-mem.c tre-parse.c tre-stack.c xmalloc.c
 
-SYM_MAPS+=${.CURDIR}/regex/Symbol.map
+MAN+=	regex.3 re_format.7
 
-MAN+=	regex.3
-MAN+=	re_format.7
+MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3 \
+	regexec.3 regfree.3
 
-MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3
-MLINKS+=regexec.3 regfree.3
+SYM_MAPS+=${.CURDIR}/regex/Symbol.map

Modified: user/gabor/tre-integration/lib/libc/regex/Symbol.map
==============================================================================
--- user/gabor/tre-integration/lib/libc/regex/Symbol.map	Wed May 11 00:46:22 2011	(r221751)
+++ user/gabor/tre-integration/lib/libc/regex/Symbol.map	Wed May 11 00:47:24 2011	(r221752)
@@ -3,8 +3,20 @@
  */
 
 FBSD_1.0 {
-	regcomp;
-	regerror;
-	regexec;
-	regfree;
+	tre_regacomp;
+	tre_regaexec;
+	tre_regancomp;
+	tre_reganexec;
+	tre_regawncomp;
+	tre_regawnexec;
+	tre_regcomp;
+	tre_regerror;
+	tre_regexec;
+	tre_regfree;
+	tre_regncomp;
+	tre_regnexec;
+	tre_regwcomp;
+	tre_regwexec;
+	tre_regwncomp;
+	tre_regwnexec;
 };