From owner-svn-src-user@FreeBSD.ORG  Sun May 15 16:33:14 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 1A6EC1065676;
	Sun, 15 May 2011 16:33:14 +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 E32FF8FC1F;
	Sun, 15 May 2011 16:33:13 +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 p4FGXDt0044613;
	Sun, 15 May 2011 16:33:13 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4FGXD8R044607;
	Sun, 15 May 2011 16:33:13 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201105151633.p4FGXD8R044607@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 15 May 2011 16:33:13 +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: r221968 - in user/gabor/tre-integration: contrib/tre
	contrib/tre/src lib/libc/regex usr.bin usr.bin/agrep
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: Sun, 15 May 2011 16:33:14 -0000

Author: gabor
Date: Sun May 15 16:33:13 2011
New Revision: 221968
URL: http://svn.freebsd.org/changeset/base/221968

Log:
  - Add agrep to the build

Added:
  user/gabor/tre-integration/usr.bin/agrep/
  user/gabor/tre-integration/usr.bin/agrep/Makefile   (contents, props changed)
Modified:
  user/gabor/tre-integration/contrib/tre/config.h
  user/gabor/tre-integration/contrib/tre/src/agrep.c
  user/gabor/tre-integration/lib/libc/regex/Symbol.map
  user/gabor/tre-integration/usr.bin/Makefile

Modified: user/gabor/tre-integration/contrib/tre/config.h
==============================================================================
--- user/gabor/tre-integration/contrib/tre/config.h	Sun May 15 16:16:48 2011	(r221967)
+++ user/gabor/tre-integration/contrib/tre/config.h	Sun May 15 16:33:13 2011	(r221968)
@@ -154,3 +154,5 @@
 
 /* Version number of package */
 #define VERSION "0.8.0"
+
+#define PACKAGE_BUGREPORT "tre-general@lists.laurikari.net"

Modified: user/gabor/tre-integration/contrib/tre/src/agrep.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/src/agrep.c	Sun May 15 16:16:48 2011	(r221967)
+++ user/gabor/tre-integration/contrib/tre/src/agrep.c	Sun May 15 16:33:13 2011	(r221968)
@@ -23,7 +23,7 @@
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif /* HAVE_GETOPT_H */
-#include "regex.h"
+#include <regex.h>
 
 #ifdef HAVE_GETTEXT
 #include <libintl.h>

Modified: user/gabor/tre-integration/lib/libc/regex/Symbol.map
==============================================================================
--- user/gabor/tre-integration/lib/libc/regex/Symbol.map	Sun May 15 16:16:48 2011	(r221967)
+++ user/gabor/tre-integration/lib/libc/regex/Symbol.map	Sun May 15 16:33:13 2011	(r221968)
@@ -3,10 +3,12 @@
  */
 
 FBSD_1.2 {
+	tre_config;
 	tre_regacomp;
 	tre_regaexec;
 	tre_regancomp;
 	tre_reganexec;
+	tre_regaparams_default;
 	tre_regawncomp;
 	tre_regawnexec;
 	tre_regcomp;

Modified: user/gabor/tre-integration/usr.bin/Makefile
==============================================================================
--- user/gabor/tre-integration/usr.bin/Makefile	Sun May 15 16:16:48 2011	(r221967)
+++ user/gabor/tre-integration/usr.bin/Makefile	Sun May 15 16:33:13 2011	(r221968)
@@ -9,7 +9,8 @@
 # Moved to secure: bdes
 #
 
-SUBDIR=	alias \
+SUBDIR=	agrep \
+	alias \
 	apply \
 	asa \
 	awk \

Added: user/gabor/tre-integration/usr.bin/agrep/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/gabor/tre-integration/usr.bin/agrep/Makefile	Sun May 15 16:33:13 2011	(r221968)
@@ -0,0 +1,10 @@
+#	$FreeBSD$
+
+.PATH: ${.CURDIR}/../../contrib/tre/src ${.CURDIR}/../../contrib/tre/doc
+PROG=	agrep
+
+CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/../../contrib/tre \
+	-I${.CURDIR}/../../include
+WARNS?=	6
+
+.include <bsd.prog.mk>