From owner-svn-src-user@FreeBSD.ORG Sun May 1 17:26:52 2011 Return-Path: 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 A0E121065670; Sun, 1 May 2011 17:26:52 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 77F3B8FC12; Sun, 1 May 2011 17:26:52 +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 p41HQq1x001034; Sun, 1 May 2011 17:26:52 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p41HQqLB001032; Sun, 1 May 2011 17:26:52 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201105011726.p41HQqLB001032@svn.freebsd.org> From: Doug Barton Date: Sun, 1 May 2011 17:26:52 +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: r221298 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 May 2011 17:26:52 -0000 Author: dougb Date: Sun May 1 17:26:52 2011 New Revision: 221298 URL: http://svn.freebsd.org/changeset/base/221298 Log: For -F --packages* -r handle the case where there is no +REQUIRED_BY Micro-optimize a few more cases where we can avoid going out to disk to test stuff by separating the test for a variable first. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun May 1 15:46:18 2011 (r221297) +++ user/dougb/portmaster/portmaster Sun May 1 17:26:52 2011 (r221298) @@ -332,7 +332,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then fi export pdb - [ -z "$port_dbdir" -a -d /var/db/ports ] && port_dbdir=/var/db/ports + [ -z "$port_dbdir" ] && [ -d /var/db/ports ] && port_dbdir=/var/db/ports [ -z "$port_dbdir" ] && port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR 2>/dev/null` [ -n "$port_dbdir" ] && export port_dbdir @@ -3049,7 +3049,7 @@ elif [ -z "$portdir" ]; then no_valid_port fi -if [ ! -d "$pd/$portdir" -a -z "$PM_INDEX_ONLY" ]; then +if [ -z "$PM_INDEX_ONLY" ] && [ ! -d "$pd/$portdir" ]; then find_moved_port $portdir $upg_port || no_valid_port [ -n "$moved_npd" ] || no_valid_port [ -d "$pd/$moved_npd" ] || no_valid_port @@ -3640,8 +3640,12 @@ if [ -z "$PM_THOROUGH" -a -z "$NO_DEP_UP fi if [ -n "$FETCH_ONLY" ]; then # Only reached here if using packages - if [ -n "$UPDATE_REQ_BYS" ] && [ -s "$pdb/$new_port/+REQUIRED_BY" ]; then - urb_final + if [ -n "$UPDATE_REQ_BYS" ]; then + if [ -s "$pdb/$new_port/+REQUIRED_BY" ]; then + urb_final + else + safe_exit + fi elif [ "$$" -eq "$PM_PARENT_PID" ]; then check_fetch_only Package else @@ -3695,7 +3699,7 @@ echo '' # Remove saved libs that match newly installed files temp=`find $LOCALBASE_COMPAT -type d -empty 2>/dev/null` -if [ -z "$temp" -a -d "$LOCALBASE_COMPAT" ]; then +if [ -z "$temp" ] && [ -d "$LOCALBASE_COMPAT" ]; then unset files for file in `pkg_info -q -L $new_port`; do [ -f "${LOCALBASE_COMPAT}/${file##*/}" ] && @@ -3824,7 +3828,6 @@ if [ -n "$upg_port" ]; then else ilist="Re-installation of $upg_port" fi - unset argv else ilist="Installation of $portdir ($new_port)" fi From owner-svn-src-user@FreeBSD.ORG Sun May 1 19:24:52 2011 Return-Path: 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 25884106564A; Sun, 1 May 2011 19:24:52 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 16BEC8FC0A; Sun, 1 May 2011 19:24:52 +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 p41JOpwF004563; Sun, 1 May 2011 19:24:51 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p41JOpS6004561; Sun, 1 May 2011 19:24:51 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201105011924.p41JOpS6004561@svn.freebsd.org> From: Doug Barton Date: Sun, 1 May 2011 19:24:51 +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: r221302 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 May 2011 19:24:52 -0000 Author: dougb Date: Sun May 1 19:24:51 2011 New Revision: 221302 URL: http://svn.freebsd.org/changeset/base/221302 Log: Don't print the "you can restart" message if -F Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun May 1 19:05:54 2011 (r221301) +++ user/dougb/portmaster/portmaster Sun May 1 19:24:51 2011 (r221302) @@ -216,7 +216,7 @@ parent_exit () { fi PM_NEEDS_UPDATE=${PM_NEEDS_UPDATE# } - if [ -n "$1" -a -n "$PM_NEEDS_UPDATE" -a -n "$PM_BUILDING" ]; then + if [ -n "$1" -a -n "$PM_NEEDS_UPDATE" -a -n "$PM_BUILDING" -a -z "$FETCH_ONLY" ]; then echo '' echo "===>>> You can restart from the point of failure with this command line:" echo " ${0##*/} $PM_NEEDS_UPDATE" From owner-svn-src-user@FreeBSD.ORG Mon May 2 06:14:52 2011 Return-Path: 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 01B6610656FD; Mon, 2 May 2011 06:14:52 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E76538FC0A; Mon, 2 May 2011 06:14:51 +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 p426EpS2024669; Mon, 2 May 2011 06:14:51 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p426Ep87024667; Mon, 2 May 2011 06:14:51 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201105020614.p426Ep87024667@svn.freebsd.org> From: Doug Barton Date: Mon, 2 May 2011 06:14:51 +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: r221313 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 May 2011 06:14:52 -0000 Author: dougb Date: Mon May 2 06:14:51 2011 New Revision: 221313 URL: http://svn.freebsd.org/changeset/base/221313 Log: If -F --packages-only and there is no package to fetch, give the user a menu of options Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon May 2 05:39:43 2011 (r221312) +++ user/dougb/portmaster/portmaster Mon May 2 06:14:51 2011 (r221313) @@ -3464,7 +3464,29 @@ fetch_package () { echo '' echo " Check the pkg_add(1) man page for information" echo " on setting the PACKAGESITE environment variable" - [ "$PM_PACKAGES" = only ] && fail $ponly_err + [ "$PM_PACKAGES" = only -a -z "$FETCH_ONLY" ] && fail $ponly_err + if [ -n "$FETCH_ONLY" ]; then + while [ -z "$continue" ]; do + echo -e "\n===>>> There is no valid package to install\n" + echo "===>>> Abort update [a]" + echo "===>>> Retry fetch [r]" + echo "===>>> Continue if possible [c]" + echo '' + echo -n "===>>> How would you like to proceed? [a] " + read answer ; echo '' + + case "$answer" in + a|'') fail "No package exists for $new_port" ;; + r) if fetch_package $new_port try ; then + latest_pv=$new_port + continue=continue + fi ;; + c) safe_exit ;; + *) echo " ===>>> $answer is not a valid response" ;; + esac + done + unset continue answer + fi else latest_pv=${latest_pv#*href=\"} latest_pv=${latest_pv%%\.tbz*} From owner-svn-src-user@FreeBSD.ORG Mon May 2 06:52:42 2011 Return-Path: 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 ED983106568A; Mon, 2 May 2011 06:52:42 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DF53E8FC18; Mon, 2 May 2011 06:52:42 +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 p426qgqi025805; Mon, 2 May 2011 06:52:42 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p426qg98025803; Mon, 2 May 2011 06:52:42 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201105020652.p426qg98025803@svn.freebsd.org> From: Doug Barton Date: Mon, 2 May 2011 06:52:42 +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: r221314 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 May 2011 06:52:43 -0000 Author: dougb Date: Mon May 2 06:52:42 2011 New Revision: 221314 URL: http://svn.freebsd.org/changeset/base/221314 Log: Indicate in usage() that --packages* can now be used with -F Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon May 2 06:14:51 2011 (r221313) +++ user/dougb/portmaster/portmaster Mon May 2 06:52:42 2011 (r221314) @@ -375,7 +375,7 @@ usage () { echo '' echo "${0##*/} --list-origins" echo '' - echo "${0##*/} [--force-config|-G] [-aftv] -F" + echo "${0##*/} [--force-config|-G] [[--packages|-P]|[--packages-only|-PP]] [-aftv] -F" echo '' echo "${0##*/} [-n|y] [-b] [-D|d] -e " echo "${0##*/} [-n|y] [-b] [-D|d] -s" From owner-svn-src-user@FreeBSD.ORG Mon May 2 06:54:46 2011 Return-Path: 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 A79BE106566B; Mon, 2 May 2011 06:54:46 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 991AC8FC13; Mon, 2 May 2011 06:54:46 +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 p426skoM025897; Mon, 2 May 2011 06:54:46 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p426skwU025895; Mon, 2 May 2011 06:54:46 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201105020654.p426skwU025895@svn.freebsd.org> From: Doug Barton Date: Mon, 2 May 2011 06:54:46 +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: r221315 - user/dougb/portmaster/files X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 May 2011 06:54:46 -0000 Author: dougb Date: Mon May 2 06:54:46 2011 New Revision: 221315 URL: http://svn.freebsd.org/changeset/base/221315 Log: Update for version 3.9, -L can now take --index-only and -t, -F can now take --packages* Modified: user/dougb/portmaster/files/portmaster.8 Modified: user/dougb/portmaster/files/portmaster.8 ============================================================================== --- user/dougb/portmaster/files/portmaster.8 Mon May 2 06:52:42 2011 (r221314) +++ user/dougb/portmaster/files/portmaster.8 Mon May 2 06:54:46 2011 (r221315) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 10, 2011 +.Dd May 1, 2011 .Dt PORTMASTER 8 .Os .Sh NAME @@ -83,11 +83,15 @@ and/or multiple globs from /var/db/pkg .Op Fl R .Fl r Ar name/glob of port in /var/db/pkg .Nm -.Fl [l|L] +.Fl l +.Nm +.Op --index-only [-t] +.Fl L .Nm .Fl -list-origins .Nm .Op Fl -force-config|-G +.Op Fl P|-PP .Op Fl aftv .Fl F .Nm From owner-svn-src-user@FreeBSD.ORG Mon May 2 06:59:09 2011 Return-Path: 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 68C751065670; Mon, 2 May 2011 06:59:09 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A9878FC14; Mon, 2 May 2011 06:59:09 +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 p426x9n6026061; Mon, 2 May 2011 06:59:09 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p426x9OR026059; Mon, 2 May 2011 06:59:09 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201105020659.p426x9OR026059@svn.freebsd.org> From: Doug Barton Date: Mon, 2 May 2011 06:59:09 +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: r221316 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 May 2011 06:59:09 -0000 Author: dougb Date: Mon May 2 06:59:09 2011 New Revision: 221316 URL: http://svn.freebsd.org/changeset/base/221316 Log: Condense the new usage() line for -F to fit an 80-column terminal Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon May 2 06:54:46 2011 (r221315) +++ user/dougb/portmaster/portmaster Mon May 2 06:59:09 2011 (r221316) @@ -375,7 +375,7 @@ usage () { echo '' echo "${0##*/} --list-origins" echo '' - echo "${0##*/} [--force-config|-G] [[--packages|-P]|[--packages-only|-PP]] [-aftv] -F" + echo "${0##*/} [--force-config|-G] [-P|-PP] [-aftv] -F" echo '' echo "${0##*/} [-n|y] [-b] [-D|d] -e " echo "${0##*/} [-n|y] [-b] [-D|d] -s" From owner-svn-src-user@FreeBSD.ORG Tue May 3 19:42:57 2011 Return-Path: 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 8BDE91065672; Tue, 3 May 2011 19:42:57 +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 627A98FC16; Tue, 3 May 2011 19:42:57 +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 p43Jgvdc009599; Tue, 3 May 2011 19:42:57 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p43Jgvto009598; Tue, 3 May 2011 19:42:57 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201105031942.p43Jgvto009598@svn.freebsd.org> From: Gabor Kovesdan Date: Tue, 3 May 2011 19:42:57 +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: r221404 - user/gabor X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2011 19:42:57 -0000 Author: gabor Date: Tue May 3 19:42:57 2011 New Revision: 221404 URL: http://svn.freebsd.org/changeset/base/221404 Log: - Create my user directory Added: user/gabor/ From owner-svn-src-user@FreeBSD.ORG Tue May 3 19:43:44 2011 Return-Path: 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 70B581065670; Tue, 3 May 2011 19:43:44 +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 489738FC0C; Tue, 3 May 2011 19:43:44 +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 p43Jhieq009698; Tue, 3 May 2011 19:43:44 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p43JhihJ009697; Tue, 3 May 2011 19:43:44 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201105031943.p43JhihJ009697@svn.freebsd.org> From: Gabor Kovesdan Date: Tue, 3 May 2011 19:43:44 +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: r221405 - user/gabor/tre-integration X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2011 19:43:44 -0000 Author: gabor Date: Tue May 3 19:43:43 2011 New Revision: 221405 URL: http://svn.freebsd.org/changeset/base/221405 Log: - Create my TRE integration branch for Summer of Code 2011 Added: - copied from r221404, head/ Directory Properties: user/gabor/tre-integration/ (props changed) From owner-svn-src-user@FreeBSD.ORG Tue May 3 19:51:56 2011 Return-Path: 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 E1DC2106566C; Tue, 3 May 2011 19:51:56 +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 B87258FC15; Tue, 3 May 2011 19:51:56 +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 p43Jpup5010305; Tue, 3 May 2011 19:51:56 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p43Jpuxi010304; Tue, 3 May 2011 19:51:56 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201105031951.p43Jpuxi010304@svn.freebsd.org> From: Gabor Kovesdan Date: Tue, 3 May 2011 19:51:56 +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: r221408 - user/gabor/tre-integration/contrib/tre X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2011 19:51:57 -0000 Author: gabor Date: Tue May 3 19:51:56 2011 New Revision: 221408 URL: http://svn.freebsd.org/changeset/base/221408 Log: - Bring in TRE into my branch Added: user/gabor/tre-integration/contrib/tre/ - copied from r221407, vendor/tre/dist/ From owner-svn-src-user@FreeBSD.ORG Wed May 4 20:26:48 2011 Return-Path: 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 EFE87106566B; Wed, 4 May 2011 20:26:48 +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 DE3AB8FC0C; Wed, 4 May 2011 20:26:48 +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 p44KQm2V066028; Wed, 4 May 2011 20:26:48 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p44KQml9066026; Wed, 4 May 2011 20:26:48 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201105042026.p44KQml9066026@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 4 May 2011 20:26:48 +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: r221456 - user/gabor/tre-integration/contrib/tre/lib X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2011 20:26:49 -0000 Author: gabor Date: Wed May 4 20:26:48 2011 New Revision: 221456 URL: http://svn.freebsd.org/changeset/base/221456 Log: - Remove duplicated declaration Modified: user/gabor/tre-integration/contrib/tre/lib/tre-internal.h Modified: user/gabor/tre-integration/contrib/tre/lib/tre-internal.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/tre-internal.h Wed May 4 20:13:26 2011 (r221455) +++ user/gabor/tre-integration/contrib/tre/lib/tre-internal.h Wed May 4 20:26:48 2011 (r221456) @@ -265,11 +265,6 @@ tre_tnfa_run_parallel(const tre_tnfa_t * int *match_end_ofs); reg_errcode_t -tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string, int len, - tre_str_type_t type, int *match_tags, int eflags, - int *match_end_ofs); - -reg_errcode_t tre_tnfa_run_backtrack(const tre_tnfa_t *tnfa, const void *string, int len, tre_str_type_t type, int *match_tags, int eflags, int *match_end_ofs); From owner-svn-src-user@FreeBSD.ORG Wed May 4 20:28:46 2011 Return-Path: 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 1FCBE106564A; Wed, 4 May 2011 20:28:46 +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 0E41A8FC22; Wed, 4 May 2011 20:28:46 +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 p44KSjcC066157; Wed, 4 May 2011 20:28:45 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p44KSjR9066156; Wed, 4 May 2011 20:28:45 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201105042028.p44KSjR9066156@svn.freebsd.org> From: Gabor Kovesdan Date: Wed, 4 May 2011 20:28:45 +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: r221458 - user/gabor/tre-integration/lib/libregex X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2011 20:28:46 -0000 Author: gabor Date: Wed May 4 20:28:45 2011 New Revision: 221458 URL: http://svn.freebsd.org/changeset/base/221458 Log: - Add Makefile glue to build TRE as a standalone library Added: user/gabor/tre-integration/lib/libregex/ user/gabor/tre-integration/lib/libregex/Makefile (contents, props changed) Added: user/gabor/tre-integration/lib/libregex/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gabor/tre-integration/lib/libregex/Makefile Wed May 4 20:28:45 2011 (r221458) @@ -0,0 +1,17 @@ +# +# $FreeBSD$ +# + +.PATH: ${.CURDIR}/../../contrib/tre/lib + +LIB= regex +SHLIB_MAJOR=1 +NO_MAN= yes +WARNS?= 6 + +CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}/../../contrib/tre +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 + +.include From owner-svn-src-user@FreeBSD.ORG Sat May 7 21:54:49 2011 Return-Path: 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 B8CAE1065675; Sat, 7 May 2011 21:54:49 +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 A8A148FC0A; Sat, 7 May 2011 21:54:49 +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 p47LsnRl016344; Sat, 7 May 2011 21:54:49 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p47LsnIx016341; Sat, 7 May 2011 21:54:49 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201105072154.p47LsnIx016341@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 7 May 2011 21:54:49 +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: r221609 - in user/gabor/tre-integration/contrib/tre: . lib X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 May 2011 21:54:49 -0000 Author: gabor Date: Sat May 7 21:54:49 2011 New Revision: 221609 URL: http://svn.freebsd.org/changeset/base/221609 Log: - Tweak config.h to suit our building needs Added: user/gabor/tre-integration/contrib/tre/lib/config.h - copied, changed from r221409, user/gabor/tre-integration/contrib/tre/config.h Modified: user/gabor/tre-integration/contrib/tre/config.h Modified: user/gabor/tre-integration/contrib/tre/config.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/config.h Sat May 7 18:42:41 2011 (r221608) +++ user/gabor/tre-integration/contrib/tre/config.h Sat May 7 21:54:49 2011 (r221609) @@ -1,37 +1,9 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -/* #undef ENABLE_NLS */ - /* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -/* #undef HAVE_CFLOCALECOPYCURRENT */ - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -/* #undef HAVE_DCGETTEXT */ - /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -41,12 +13,6 @@ /* Define to 1 if you have the `getopt_long' function. */ #define HAVE_GETOPT_LONG 1 -/* Define if the GNU gettext() function is already present or preinstalled. */ -/* #undef HAVE_GETTEXT */ - -/* Define if you have the iconv() function and it works. */ -/* #undef HAVE_ICONV */ - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -71,9 +37,6 @@ /* Define to 1 if you have the `iswupper' function or macro. */ #define HAVE_ISWUPPER 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LIBUTF8_H */ - /* Define to 1 if you have the `mbrtowc' function or macro. */ #define HAVE_MBRTOWC 1 @@ -81,17 +44,11 @@ #define HAVE_MBSTATE_T 1 /* Define to 1 if you have the `mbtowc' function or macro. */ -/* #undef HAVE_MBTOWC */ +#define HAVE_MBTOWC 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_REGEX_H */ - -/* Define to 1 if the system has the type `reg_errcode_t'. */ -/* #undef HAVE_REG_ERRCODE_T */ - /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -141,7 +98,7 @@ #define HAVE_WCSRTOMBS 1 /* Define to 1 if you have the `wcstombs' function or macro. */ -/* #undef HAVE_WCSTOMBS */ +#define HAVE_WCSTOMBS 1 /* Define to 1 if you have the `wctype' function or macro. */ #define HAVE_WCTYPE 1 @@ -155,27 +112,6 @@ /* Define if you want to disable debug assertions. */ #define NDEBUG 1 -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - -/* Name of package */ -#define PACKAGE "tre" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "tre-general@lists.laurikari.net" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "TRE" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "TRE 0.8.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "tre" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.8.0" - /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. @@ -190,9 +126,6 @@ /* Define if you want to enable approximate matching functionality. */ #define TRE_APPROX 1 -/* Define if you want TRE to print debug messages to stdout. */ -/* #undef TRE_DEBUG */ - /* Define to enable multibyte character set support. */ #define TRE_MULTIBYTE 1 @@ -200,16 +133,10 @@ the internal tre_tnfa_t structure */ #define TRE_REGEX_T_FIELD value -/* Define to the absolute path to the system regex.h */ -/* #undef TRE_SYSTEM_REGEX_H_PATH */ - /* Define if you want TRE to use alloca() instead of malloc() when allocating memory needed for regexec operations. */ #define TRE_USE_ALLOCA 1 -/* Define to include the system regex.h from TRE regex.h */ -/* #undef TRE_USE_SYSTEM_REGEX_H */ - /* TRE version string. */ #define TRE_VERSION "0.8.0" @@ -227,33 +154,3 @@ /* Version number of package */ #define VERSION "0.8.0" - -/* Define to the maximum value of wchar_t if not already defined elsewhere */ -/* #undef WCHAR_MAX */ - -/* Define if wchar_t is signed */ -/* #undef WCHAR_T_SIGNED */ - -/* Define if wchar_t is unsigned */ -/* #undef WCHAR_T_UNSIGNED */ - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define to enable GNU extensions in glibc */ -#define _GNU_SOURCE 1 - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define on IRIX */ -/* #undef _REGCOMP_INTERNAL */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif Copied and modified: user/gabor/tre-integration/contrib/tre/lib/config.h (from r221409, user/gabor/tre-integration/contrib/tre/config.h) ============================================================================== --- user/gabor/tre-integration/contrib/tre/config.h Tue May 3 20:13:27 2011 (r221409, copy source) +++ user/gabor/tre-integration/contrib/tre/lib/config.h Sat May 7 21:54:49 2011 (r221609) @@ -1,37 +1,9 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -/* #undef ENABLE_NLS */ - /* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -/* #undef HAVE_CFLOCALECOPYCURRENT */ - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -/* #undef HAVE_DCGETTEXT */ - /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -41,12 +13,6 @@ /* Define to 1 if you have the `getopt_long' function. */ #define HAVE_GETOPT_LONG 1 -/* Define if the GNU gettext() function is already present or preinstalled. */ -/* #undef HAVE_GETTEXT */ - -/* Define if you have the iconv() function and it works. */ -/* #undef HAVE_ICONV */ - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -71,9 +37,6 @@ /* Define to 1 if you have the `iswupper' function or macro. */ #define HAVE_ISWUPPER 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LIBUTF8_H */ - /* Define to 1 if you have the `mbrtowc' function or macro. */ #define HAVE_MBRTOWC 1 @@ -81,17 +44,11 @@ #define HAVE_MBSTATE_T 1 /* Define to 1 if you have the `mbtowc' function or macro. */ -/* #undef HAVE_MBTOWC */ +#define HAVE_MBTOWC 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_REGEX_H */ - -/* Define to 1 if the system has the type `reg_errcode_t'. */ -/* #undef HAVE_REG_ERRCODE_T */ - /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -141,7 +98,7 @@ #define HAVE_WCSRTOMBS 1 /* Define to 1 if you have the `wcstombs' function or macro. */ -/* #undef HAVE_WCSTOMBS */ +#define HAVE_WCSTOMBS 1 /* Define to 1 if you have the `wctype' function or macro. */ #define HAVE_WCTYPE 1 @@ -155,27 +112,6 @@ /* Define if you want to disable debug assertions. */ #define NDEBUG 1 -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - -/* Name of package */ -#define PACKAGE "tre" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "tre-general@lists.laurikari.net" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "TRE" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "TRE 0.8.0" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "tre" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.8.0" - /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. @@ -190,9 +126,6 @@ /* Define if you want to enable approximate matching functionality. */ #define TRE_APPROX 1 -/* Define if you want TRE to print debug messages to stdout. */ -/* #undef TRE_DEBUG */ - /* Define to enable multibyte character set support. */ #define TRE_MULTIBYTE 1 @@ -200,16 +133,10 @@ the internal tre_tnfa_t structure */ #define TRE_REGEX_T_FIELD value -/* Define to the absolute path to the system regex.h */ -/* #undef TRE_SYSTEM_REGEX_H_PATH */ - /* Define if you want TRE to use alloca() instead of malloc() when allocating memory needed for regexec operations. */ #define TRE_USE_ALLOCA 1 -/* Define to include the system regex.h from TRE regex.h */ -/* #undef TRE_USE_SYSTEM_REGEX_H */ - /* TRE version string. */ #define TRE_VERSION "0.8.0" @@ -227,33 +154,3 @@ /* Version number of package */ #define VERSION "0.8.0" - -/* Define to the maximum value of wchar_t if not already defined elsewhere */ -/* #undef WCHAR_MAX */ - -/* Define if wchar_t is signed */ -/* #undef WCHAR_T_SIGNED */ - -/* Define if wchar_t is unsigned */ -/* #undef WCHAR_T_UNSIGNED */ - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define to enable GNU extensions in glibc */ -#define _GNU_SOURCE 1 - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define on IRIX */ -/* #undef _REGCOMP_INTERNAL */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif From owner-svn-src-user@FreeBSD.ORG Sat May 7 22:03:37 2011 Return-Path: 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 E2E321065673; Sat, 7 May 2011 22:03:36 +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 C81FC8FC08; Sat, 7 May 2011 22:03:36 +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 p47M3ajn016772; Sat, 7 May 2011 22:03:36 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p47M3aTf016769; Sat, 7 May 2011 22:03:36 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201105072203.p47M3aTf016769@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 7 May 2011 22:03:36 +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: r221610 - user/gabor/tre-integration/contrib/tre/lib X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 May 2011 22:03:37 -0000 Author: gabor Date: Sat May 7 22:03:36 2011 New Revision: 221610 URL: http://svn.freebsd.org/changeset/base/221610 Log: - Decouple header files from config.h so that they can be used individually. - Clean up Modified: user/gabor/tre-integration/contrib/tre/lib/regex.h user/gabor/tre-integration/contrib/tre/lib/tre.h Modified: user/gabor/tre-integration/contrib/tre/lib/regex.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/regex.h Sat May 7 21:54:49 2011 (r221609) +++ user/gabor/tre-integration/contrib/tre/lib/regex.h Sat May 7 22:03:36 2011 (r221610) @@ -15,12 +15,10 @@ #include "tre.h" -#ifndef TRE_USE_SYSTEM_REGEX_H #define regcomp tre_regcomp #define regerror tre_regerror #define regexec tre_regexec #define regfree tre_regfree -#endif /* TRE_USE_SYSTEM_REGEX_H */ #define regacomp tre_regacomp #define regaexec tre_regaexec Modified: user/gabor/tre-integration/contrib/tre/lib/tre.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/tre.h Sat May 7 21:54:49 2011 (r221609) +++ user/gabor/tre-integration/contrib/tre/lib/tre.h Sat May 7 22:03:36 2011 (r221610) @@ -9,60 +9,15 @@ #ifndef TRE_H #define TRE_H 1 -#include "tre-config.h" - -#ifdef HAVE_SYS_TYPES_H #include -#endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_LIBUTF8_H -#include -#endif /* HAVE_LIBUTF8_H */ - -#ifdef TRE_USE_SYSTEM_REGEX_H -/* Include the system regex.h to make TRE ABI compatible with the - system regex. */ -#include TRE_SYSTEM_REGEX_H_PATH -#define tre_regcomp regcomp -#define tre_regexec regexec -#define tre_regerror regerror -#define tre_regfree regfree -#endif /* TRE_USE_SYSTEM_REGEX_H */ +#define TRE_WCHAR 1 +#define TRE_APPROX 1 #ifdef __cplusplus extern "C" { #endif -#ifdef TRE_USE_SYSTEM_REGEX_H - -#ifndef REG_OK -#define REG_OK 0 -#endif /* !REG_OK */ - -#ifndef HAVE_REG_ERRCODE_T -typedef int reg_errcode_t; -#endif /* !HAVE_REG_ERRCODE_T */ - -#if !defined(REG_NOSPEC) && !defined(REG_LITERAL) -#define REG_LITERAL 0x1000 -#endif - -/* Extra tre_regcomp() flags. */ -#ifndef REG_BASIC -#define REG_BASIC 0 -#endif /* !REG_BASIC */ -#define REG_RIGHT_ASSOC (REG_LITERAL << 1) -#define REG_UNGREEDY (REG_RIGHT_ASSOC << 1) - -/* Extra tre_regexec() flags. */ -#define REG_APPROX_MATCHER 0x1000 -#define REG_BACKTRACKING_MATCHER (REG_APPROX_MATCHER << 1) - -#else /* !TRE_USE_SYSTEM_REGEX_H */ - -/* If the we're not using system regex.h, we need to define the - structs and enums ourselves. */ - typedef int regoff_t; typedef struct { size_t re_nsub; /* Number of parenthesized subexpressions. */ @@ -114,8 +69,6 @@ typedef enum { #define REG_APPROX_MATCHER (REG_NOTEOL << 1) #define REG_BACKTRACKING_MATCHER (REG_APPROX_MATCHER << 1) -#endif /* !TRE_USE_SYSTEM_REGEX_H */ - /* REG_NOSPEC and REG_LITERAL mean the same thing. */ #if defined(REG_LITERAL) && !defined(REG_NOSPEC) #define REG_NOSPEC REG_LITERAL @@ -143,9 +96,7 @@ extern void tre_regfree(regex_t *preg); #ifdef TRE_WCHAR -#ifdef HAVE_WCHAR_H #include -#endif /* HAVE_WCHAR_H */ /* Wide character versions (not in POSIX.2). */ extern int From owner-svn-src-user@FreeBSD.ORG Sat May 7 22:05:14 2011 Return-Path: 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 8FDB6106566B; Sat, 7 May 2011 22:05: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 806718FC18; Sat, 7 May 2011 22:05:14 +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 p47M5EHX016864; Sat, 7 May 2011 22:05:14 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p47M5ECo016862; Sat, 7 May 2011 22:05:14 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201105072205.p47M5ECo016862@svn.freebsd.org> From: Gabor Kovesdan Date: Sat, 7 May 2011 22:05:14 +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: r221611 - user/gabor/tre-integration/contrib/tre/lib X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 May 2011 22:05:14 -0000 Author: gabor Date: Sat May 7 22:05:14 2011 New Revision: 221611 URL: http://svn.freebsd.org/changeset/base/221611 Log: - Customize tre-config.h, a copy of the already cleaned up config.h will do Modified: user/gabor/tre-integration/contrib/tre/lib/tre-config.h Modified: user/gabor/tre-integration/contrib/tre/lib/tre-config.h ============================================================================== --- user/gabor/tre-integration/contrib/tre/lib/tre-config.h Sat May 7 22:03:36 2011 (r221610) +++ user/gabor/tre-integration/contrib/tre/lib/tre-config.h Sat May 7 22:05:14 2011 (r221611) @@ -1,35 +1,141 @@ -/* lib/tre-config.h. Generated from tre-config.h.in by configure. */ -/* tre-config.h.in. This file has all definitions that are needed in - `tre.h'. Note that this file must contain only the bare minimum - of definitions without the TRE_ prefix to avoid conflicts between - definitions here and definitions included from somewhere else. */ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LIBUTF8_H */ +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA 1 -/* Define to 1 if the system has the type `reg_errcode_t'. */ -/* #undef HAVE_REG_ERRCODE_T */ +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isascii' function. */ +#define HAVE_ISASCII 1 + +/* Define to 1 if you have the `isblank' function. */ +#define HAVE_ISBLANK 1 + +/* Define to 1 if you have the `iswascii' function or macro. */ +#define HAVE_ISWASCII 1 + +/* Define to 1 if you have the `iswblank' function or macro. */ +#define HAVE_ISWBLANK 1 + +/* Define to 1 if you have the `iswctype' function or macro. */ +#define HAVE_ISWCTYPE 1 + +/* Define to 1 if you have the `iswlower' function or macro. */ +#define HAVE_ISWLOWER 1 + +/* Define to 1 if you have the `iswupper' function or macro. */ +#define HAVE_ISWUPPER 1 + +/* Define to 1 if you have the `mbrtowc' function or macro. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 if the system has the type `mbstate_t'. */ +#define HAVE_MBSTATE_T 1 + +/* Define to 1 if you have the `mbtowc' function or macro. */ +#define HAVE_MBTOWC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the `towlower' function or macro. */ +#define HAVE_TOWLOWER 1 + +/* Define to 1 if you have the `towupper' function or macro. */ +#define HAVE_TOWUPPER 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_WCHAR_H 1 +/* Define to 1 if the system has the type `wchar_t'. */ +#define HAVE_WCHAR_T 1 + +/* Define to 1 if you have the `wcschr' function or macro. */ +#define HAVE_WCSCHR 1 + +/* Define to 1 if you have the `wcscpy' function or macro. */ +#define HAVE_WCSCPY 1 + +/* Define to 1 if you have the `wcslen' function or macro. */ +#define HAVE_WCSLEN 1 + +/* Define to 1 if you have the `wcsncpy' function or macro. */ +#define HAVE_WCSNCPY 1 + +/* Define to 1 if you have the `wcsrtombs' function or macro. */ +#define HAVE_WCSRTOMBS 1 + +/* Define to 1 if you have the `wcstombs' function or macro. */ +#define HAVE_WCSTOMBS 1 + +/* Define to 1 if you have the `wctype' function or macro. */ +#define HAVE_WCTYPE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCTYPE_H 1 + +/* Define to 1 if the system has the type `wint_t'. */ +#define HAVE_WINT_T 1 + +/* Define if you want to disable debug assertions. */ +#define NDEBUG 1 + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + /* Define if you want to enable approximate matching functionality. */ #define TRE_APPROX 1 /* Define to enable multibyte character set support. */ #define TRE_MULTIBYTE 1 -/* Define to the absolute path to the system tre.h */ -/* #undef TRE_SYSTEM_REGEX_H_PATH */ - -/* Define to include the system regex.h from tre.h */ -/* #undef TRE_USE_SYSTEM_REGEX_H */ - -/* Define to enable wide character (wchar_t) support. */ -#define TRE_WCHAR 1 +/* Define to a field in the regex_t struct where TRE should store a pointer to + the internal tre_tnfa_t structure */ +#define TRE_REGEX_T_FIELD value + +/* Define if you want TRE to use alloca() instead of malloc() when allocating + memory needed for regexec operations. */ +#define TRE_USE_ALLOCA 1 /* TRE version string. */ #define TRE_VERSION "0.8.0" @@ -42,3 +148,9 @@ /* TRE version level 3. */ #define TRE_VERSION_3 0 + +/* Define to enable wide character (wchar_t) support. */ +#define TRE_WCHAR 1 + +/* Version number of package */ +#define VERSION "0.8.0"