Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 11 May 2011 00:47:25 +0000 (UTC)
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r221752 - in user/gabor/tre-integration/lib/libc/regex: . grot
Message-ID:  <201105110047.p4B0lPlo066722@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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;
 };

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105110047.p4B0lPlo066722>