mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/regex
In directory sc8-pr-cvs16:/tmp/cvs-serv10609

Modified Files:
	ChangeLog README 
Added Files:
	Makefile.in aclocal.m4 configure configure.ac nomsvc pkgid.m4 
	regex.3 regex.7 
Removed Files:
	Makefile 
Log Message:
Adaptation for distribution as MinGW contributed package.


--- NEW FILE: configure ---
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for MinGW libgnurx 2.5.
#
# Report bugs to <." rel="nofollow">https://sourceforge.net/tracker/?group_id=2435&atid=102435>.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
## M4sh Initialization.  ##
## --------------------- ##

# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  emulate sh
  NULLCMD=:
  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
  # is contrary to our usage.  Disable this feature.
[...3240 lines suppressed...]
# by configure, so config.status won't be able to write to it; its
# output is simply discarded.  So we exec the FD to /dev/null,
# effectively closing config.log, so it can be properly (re)opened and
# appended to by config.status.  When coming back to configure, we
# need to make the FD available again.
if test "$no_create" != yes; then
  ac_cs_success=:
  ac_config_status_args=
  test "$silent" = yes &&
    ac_config_status_args="$ac_config_status_args --quiet"
  exec 5>/dev/null
  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
  exec 5>>config.log
  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
  # would make configure fail if this is the last instruction.
  $ac_cs_success || { (exit 1); exit 1; }
fi

#
# $RCSfile: configure,v $Revision: 1.1 $: end of file

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/regex/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ChangeLog	27 Apr 2007 19:29:51 -0000	1.1.1.1
--- ChangeLog	30 Apr 2007 22:46:34 -0000	1.2
***************
*** 1,5 ****
  2007-04-27  Keith Marshall  <kei...@us...>
  
! 	Initial import of Tor Lillqvist's port of GNU libc regex package.
  
  	* MinGW: Vendor tag assigned.
--- 1,32 ----
+ 2007-04-30  Keith Marshall  <kei...@us...>
+ 
+ 	Adaptation for distribution as MinGW contributed package.
+ 
+ 	* aclocal.m4, configure.ac, pkgid.m4: New files.
+ 	* configure: New file; generated.
+ 
+ 	* Makefile: Deleted; replaced by...
+ 	* Makefile.in: ...this; adapted from `Makefile', with...
+ 	(PACKAGE): New macro, renames original `THIS' macro.
+ 	(install, install-dll, install-dev): New installation targets.
+ 	(bindist, devdist, srcdist): New distribution targets.
+ 	(DLLVERSION): New macro; replaces hard coded DLL version tag.
+ 	(srcdir, VPATH): New AC_SUBSTed macros, supporting VPATH build.
+ 	(prefix, exec_prefix, bindir, libdir, includedir, mandir): AC_SUBSTed
+ 	macros, specifying installation directories.
+ 	(LDFLAGS): AC_SUBSTed linker flags.
+ 	(MSVCLIB): New macro; AC_SUBSTed to invoke or avoid use of `lib'.
+ 	(ZIPCMD, ZIPEXT): New macros; AC_SUBSTed to control packaging format.
+ 	(BINDIST_FILES, DEVDIST_FILES, SRCDIST_FILES): New macros.
+ 
+ 	* nomsvc: New helper script; invoked if MSVC `lib' not installed.
+ 
+ 	* regex.3, regex.7: New files; manpage sources copied from GNU/Linux.
+ 
+ 	* README: Add preamble, describing changes for this distribution.
+ 
  2007-04-27  Keith Marshall  <kei...@us...>
  
! 	Initial import of Tor Lillqvist's port of GNU glibc regex package.
  
  	* MinGW: Vendor tag assigned.

--- NEW FILE: Makefile.in ---
# Makefile.in for MinGW port of GNU libc 'regex' functions.
# Processed by 'configure' script, to generate 'Makefile'.
# 
PACKAGE = @PACKAGE_TARNAME@
VERSION = @PACKAGE_VERSION@
#
# Adaptation by Keith Marshall <kei...@us...>
# from original 'Makefile' by Tor Lillqvist <tm...@ik...>, <tm...@no...>
#
DLLVERSION = @DLLVERSION@
#
# This is free software.  It is provided AS IS, in the hope that it may
# be useful, but WITHOUT WARRANTY OF ANY KIND, not even an IMPLIED WARRANTY
# of MERCHANTABILITY, nor of FITNESS FOR ANY PARTICULAR PURPOSE.
#
# Source files accompanying this Makefile remain copyright of their
# respective authors, or of the Free Software Foundation Inc., as stated
# in individual file headers; all are redistributed with permission, as
# granted by the GNU Lesser General Public License.
#
# Permission is granted to redistribute this software, either "as is" or
# in modified form, under the terms of the GNU Lesser General Public License,
# as published by the Free Software Foundation; either version 2.1, or (at
# your option) any later version.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this software; see the file COPYING.LIB.  If not, write to the
# Free Software Foundation, 51 Franklin St - Fifth Floor, Boston,
# MA 02110-1301, USA.

VPATH = ${srcdir}
srcdir = @srcdir@

prefix = @prefix@
exec_prefix = @exec_prefix@
includedir = @includedir@
libdir = @libdir@
bindir = @bindir@
mandir = @mandir@

CC = @CC_QUALIFIED@
CFLAGS = @CFLAGS@ -I ${srcdir}
LDFLAGS = @LDFLAGS@

SOURCES = $(wildcard ${srcdir}/*.c ${srcdir}/*.h)
OBJECTS = regex.o

MSVCLIB = @MSVCLIB@

BINDIST_FILES = libgnurx-$(DLLVERSION).dll
DEVDIST_FILES = ${srcdir}/regex.h libgnurx.dll.a libregex.a @GNURX_LIB@
SRCDIST_FILES = ${srcdir}/configure ${srcdir}/configure.ac ${srcdir}/aclocal.m4 \
  ${srcdir}/pkgid.m4 ${srcdir}/Makefile.in ${srcdir}/README ${srcdir}/COPYING.LIB \
  $(SOURCES) $(wildcard ${srcdir}/*.[37]) ${srcdir}/nomsvc ${srcdir}/ChangeLog

ZIPCMD = @ZIPCMD@
ZIPEXT = @ZIPEXT@

all: libgnurx-$(DLLVERSION).dll libgnurx.dll.a libregex.a gnurx.lib

Makefile: config.status Makefile.in
	./config.status

config.status: configure
	./config.status --recheck

libgnurx-$(DLLVERSION).dll libgnurx.dll.a: $(OBJECTS) Makefile
	$(CC) -shared -o libgnurx-$(DLLVERSION).dll $(LDFLAGS) $(OBJECTS)

libregex.a: libgnurx.dll.a
	cp -p libgnurx.dll.a $@

gnurx.lib: libgnurx-$(DLLVERSION).dll
	$(MSVCLIB) -def:libgnurx.def -out:gnurx.lib

install: install-dll @install_dev@

install-dll:
	mkdir -p ${bindir}
	cp -p $(BINDIST_FILES) ${bindir}

install-dev:
	mkdir -p ${includedir} ${libdir}
	cp -p ${srcdir}/regex.h ${includedir}
	cp -p $(DEVDIST_FILES) ${libdir}
	for s in 3 7; do \
	  mkdir -p ${mandir}/man$$s; \
	  gzip -c ${srcdir}/regex.$$s > ${mandir}/man$$s/regex.$$s.gz; \
	done

dist:	 bindist devdist srcdist
bindist: $(PACKAGE)-$(VERSION)-bin$(ZIPEXT)
devdist: $(PACKAGE)-$(VERSION)-dev$(ZIPEXT)
srcdist: $(PACKAGE)-$(VERSION)-src$(ZIPEXT)

$(PACKAGE)-$(VERSION)-bin$(ZIPEXT): $(BINDIST_FILES)
	rm -rf tmp
	$(MAKE) prefix=`pwd`/tmp --no-print-directory install-dll
	cd tmp; $(ZIPCMD) ../$@ bin
	rm -rf tmp

$(PACKAGE)-$(VERSION)-dev$(ZIPEXT): $(DEVDIST_FILES)
	rm -rf tmp
	$(MAKE) prefix=`pwd`/tmp --no-print-directory install-dev
	cd tmp; $(ZIPCMD) ../$@ .
	rm -rf tmp

$(PACKAGE)-$(VERSION)-src$(ZIPEXT): $(SRCDIST_FILES)
	rm -rf $(PACKAGE)-$(VERSION)
	mkdir $(PACKAGE)-$(VERSION)
	cp -p $(SRCDIST_FILES) $(PACKAGE)-$(VERSION)
	$(ZIPCMD) $@ $(PACKAGE)-$(VERSION)
	rm -rf $(PACKAGE)-$(VERSION)

clean:
	rm -f *~ *.o *.dll *.def *.exp *.lib *.a *.zip
	rm -rf runtime dev $(PACKAGE)-$(VERSION)

distclean: clean
	rm -f Makefile config.status config.log
	rm -rf autom4te.cache

# $RCSfile: Makefile.in,v $Revision: 1.1 $: end of file

--- Makefile DELETED ---

Index: README
===================================================================
RCS file: /cvsroot/mingw/regex/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	27 Apr 2007 19:29:48 -0000	1.1.1.1
--- README	30 Apr 2007 22:46:36 -0000	1.2
***************
*** 1,4 ****
  This is the regex functionality from glibc 2.5 extracted into a
! separate library, for Win32.
  
  I call the DLL libgnurx-0.dll which hopefully should be unique. At
--- 1,79 ----
  This is the regex functionality from glibc 2.5 extracted into a
! separate library, for Win32.  It may be built, from the sources
! provided, using the command sequence:--
! 
!   ./configure [--options...] && make
! 
! For a list of available configuration options, run:--
! 
!   ./configure --help
! 
! After building, as above, the resultant DLL, and optionally the
! associated development kit, may be installed by:--
! 
!   make install
! 
! while redistributable binary DLL and development library kits may
! be created by:--
! 
!   make dist
! 
! 
! The original sources, on which this port is based, remain
! copyright of their respective authors, or of the Free Software
! Foundation Inc., as indicated in individual file headers; all are
! redistributed with permission, as granted by the GNU Lesser
! General Public License.
! 
! This is free software.  It is provided AS IS, in the hope that
! it may be useful, but WITHOUT WARRANTY OF ANY KIND, not even an
! IMPLIED WARRANTY of MERCHANTABILITY, nor of FITNESS FOR ANY
! PARTICULAR PURPOSE.
! 
! Permission is granted to redistribute this software, either
! "as is" or in modified form, under the terms of the GNU Lesser
! General Public License, as published by the Free Software
! Foundation; either version 2.1, or (at your option) any later
! version.
! 
! You should have received a copy of the GNU Lesser General Public
! License along with this software; see the file COPYING.LIB.  If
! not, write to the Free Software Foundation, 51 Franklin St -
! Fifth Floor, Boston, MA 02110-1301, USA.
! 
! The original port of this functionality was implemented by Tor
! Lillqvist; I've adapted his work, to make it somewhat more MinGW
! friendly.  I have *not* modified any of the `C' sources provided
! by Tor; nor have I changed the naming conventions he adopted for
! generated distributables.  I *have*:--
! 
! 1) Replaced Tor's original `Makefile' with an autoconf generated
!    configure script, and a backwardly compatible `Makefile.in';
!    this provides a more flexible build procedure, which I find
!    more convenient, when cross-compiling on a GNU/Linux host.
! 
! 2) Added VPATH support, for `out of tree' builds.
! 
! 3) Adapted the build procedure, to avoid a dependency on the `lib'
!    program from Microsoft's MSVC tool chain.  This is achieved by
!    simply declining to build an MSVC compatible import library,
!    if this tool is not present, while retaining the capability to
!    do so, if the tool *is* present.
! 
! 4) Added `install', `install-dll' and `install-dev' targets, to
!    support direct installation of the DLL, and its associated
!    development kit.
! 
! 5) Changed the default packaging format for distributables, from
!    Tor's exclusive choice of `zip', to my own preferred `tar.gz';
!    `zip' format remains available, as an option, by configuring
!    with `--enable-dist=zip'.
! 
! 6) Added `bindist', `devdist' and `srcdist' targets, for greater
!    flexibility in building distribution kits.
! 
! The original text of Tor's README file will be found below.
! 
! --Keith Marshall  <kei...@us...>
  
  I call the DLL libgnurx-0.dll which hopefully should be unique. At
***************
*** 6,10 ****
  gnuwin32.sourceforge.net site for *two* incompatible DLLs. (That mess,
  and the mess with their build of Henry Spencer's regex library, was
! what lead me to build my own GNU regex library. See the gnuwin32-users mailing list archives from December 2006.)
  
  The "-0" is so that if at some point I build a release that isn't
--- 81,86 ----
  gnuwin32.sourceforge.net site for *two* incompatible DLLs. (That mess,
  and the mess with their build of Henry Spencer's regex library, was
! what lead me to build my own GNU regex library. See the
! gnuwin32-users mailing list archives from December 2006.)
  
  The "-0" is so that if at some point I build a release that isn't

--- NEW FILE: configure.ac ---
# configure.ac  -*- Autoconf -*-
# Process this file with autoconf, to generate a configure script.
#
# $Id: configure.ac,v 1.1 2007/04/30 22:46:37 keithmarshall Exp $
#
# Copyright (C) 2007, MinGW Project
# Written by Keith Marshall <kei...@us...>
#
# Package identification.
#
# This is configure.ac for the MinGW `libgnurx' package.
# BASENAME, VERSION_MAJOR and VERSION_MINOR are required tags;
# complete `Value' fields as appropriate.
#
#                            Tag              Value
#                            ---------------  ----------
  MINGW_AC_DEFINE_PACKAGE_ID([BASENAME],      [libgnurx])
  MINGW_AC_DEFINE_PACKAGE_ID([VERSION_MAJOR], [2])
  MINGW_AC_DEFINE_PACKAGE_ID([VERSION_MINOR], [5])
#
# PATCHLEVEL is optional; comment/uncomment and adjust as required.
#
# MINGW_AC_DEFINE_PACKAGE_ID([PATCHLEVEL],    [1])
#
# DLL_VERSION is required; installed DLLs will be versioned, by
# appending a hyphen, the specified tag value, and then the `.dll'
# file name extension, to the base name of each generated DLL.
#
  MINGW_AC_DEFINE_PACKAGE_ID([DLL_VERSION],   [0])
#
#
# libgnurx is an adaptation of Tor Lillqvist's original port of the
# regex functions from GNU libc, for use on native Woe32 platforms.
#
# The original sources, on which this port is based, remain copyright
# of their respective authors, or of the Free Software Foundation Inc.,
# as indicated in individual file headers; all are redistributed with
# permission, as granted by the GNU Lesser General Public License.
#
# This is free software.  It is provided AS IS, in the hope that it may
# be useful, but WITHOUT WARRANTY OF ANY KIND, not even an IMPLIED WARRANTY
# of MERCHANTABILITY, nor of FITNESS FOR ANY PARTICULAR PURPOSE.
#
# Permission is granted to redistribute this software, either "as is" or
# in modified form, under the terms of the GNU Lesser General Public License,
# as published by the Free Software Foundation; either version 2.1, or (at
# your option) any later version.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this software; see the file COPYING.LIB.  If not, write to the
# Free Software Foundation, 51 Franklin St - Fifth Floor, Boston,
# MA 02110-1301, USA.

# Autoconf initialisation.
#
  AC_PREREQ([2.59])
  AC_INIT(__MINGW_AC_PACKAGE_IDENTIFICATION__)

# Compiler and build tool checks.
#
  AC_PROG_CC
  MINGW_AC_PROG_CC_OPTIONS([CC_QUALIFIED], [-m], [threads tune=pentium3])
  AC_CHECK_TOOL([MSVCLIB], [lib])

# Set the release version for the resultant DLL.
#
  AC_SUBST([DLLVERSION], [__MINGW_AC_PACKAGE_DLL_VERSION__])

# User configuration options.
#
  MINGW_AC_DISTRIBUTION_TYPE([tar])
  MINGW_AC_DEV_INSTALL_OPTION

# Configuration output.
#
  AC_SUBST([GNURX_LIB])
  AC_SUBST([CC_QUALIFIED], ["$CC $CC_QUALIFIED"])
  LDFLAGS='-Wl,--enable-auto-image-base -Wl,--out-implib,libgnurx.dll.a'
  if test -n "${MSVCLIB}"
    then LDFLAGS="$LDFLAGS -Wl,--output-def,libgnurx.def" GNURX_LIB=gnurx.lib
    else MSVCLIB='${srcdir}/nomsvc lib'; fi
  AC_CONFIG_FILES([Makefile])
  AC_OUTPUT
#
# $RCSfile: configure.ac,v $Revision: 1.1 $: end of file

--- NEW FILE: regex.7 ---
.\" From Henry Spencer's regex package (as found in the apache
.\" distribution). The package carries the following copyright:
.\"
.\"  Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
.\"  This software is not subject to any license of the American Telephone
.\"  and Telegraph Company or of the Regents of the University of California.
.\"  
.\"  Permission is granted to anyone to use this software for any purpose
.\"  on any computer system, and to alter it and redistribute it, subject
.\"  to the following restrictions:
.\"  
.\"  1. The author is not responsible for the consequences of use of this
.\"     software, no matter how awful, even if they arise from flaws in it.
.\"  
.\"  2. The origin of this software must not be misrepresented, either by
.\"     explicit claim or by omission.  Since few users ever read sources,
.\"     credits must appear in the documentation.
.\"  
.\"  3. Altered versions must be plainly marked as such, and must not be
.\"     misrepresented as being the original software.  Since few users
.\"     ever read sources, credits must appear in the documentation.
.\"  
.\"  4. This notice may not be removed or altered.
.\" 
.\" In order to comply with `credits must appear in the documentation'
.\" I added an AUTHOR paragraph below - aeb.
.\"
.\" In the default nroff environment there is no dagger \(dg.
.\"
.\" 2005-05-11 Removed discussion of `[[:<:]]' and `[[:>:]]', which
.\" 	appear not to be in the glibc implementation of regcomp
.\"
.\" 2007-04-30  Keith Marshall  (kei...@us...)
.\"   Adapt TH for inclusion in MinGW distribution kit
.\"
.ie t .ds dg \(dg
.el .ds dg (!)
.TH REGEX 7 2007-04-30 MinGW "MinGW Reference Manual"
.SH NAME
regex \- POSIX 1003.2 regular expressions
.SH DESCRIPTION
Regular expressions (``RE''s),
as defined in POSIX 1003.2, come in two forms:
modern REs (roughly those of
.IR egrep ;
1003.2 calls these ``extended'' REs)
and obsolete REs (roughly those of
.BR ed (1);
1003.2 ``basic'' REs).
Obsolete REs mostly exist for backward compatibility in some old programs;
they will be discussed at the end.
1003.2 leaves some aspects of RE syntax and semantics open;
`\*(dg' marks decisions on these aspects that
may not be fully portable to other 1003.2 implementations.
.PP
A (modern) RE is one\*(dg or more non-empty\*(dg \fIbranches\fR,
separated by `|'.
It matches anything that matches one of the branches.
.PP
A branch is one\*(dg or more \fIpieces\fR, concatenated.
It matches a match for the first, followed by a match for the second, etc.
.PP
A piece is an \fIatom\fR possibly followed
by a single\*(dg `*', `+', `?', or \fIbound\fR.
An atom followed by `*' matches a sequence of 0 or more matches of the atom.
An atom followed by `+' matches a sequence of 1 or more matches of the atom.
An atom followed by `?' matches a sequence of 0 or 1 matches of the atom.
.PP
A \fIbound\fR is `{' followed by an unsigned decimal integer,
possibly followed by `,'
possibly followed by another unsigned decimal integer,
always followed by `}'.
The integers must lie between 0 and RE_DUP_MAX (255\*(dg) inclusive,
and if there are two of them, the first may not exceed the second.
An atom followed by a bound containing one integer \fIi\fR
and no comma matches
a sequence of exactly \fIi\fR matches of the atom.
An atom followed by a bound
containing one integer \fIi\fR and a comma matches
a sequence of \fIi\fR or more matches of the atom.
An atom followed by a bound
containing two integers \fIi\fR and \fIj\fR matches
a sequence of \fIi\fR through \fIj\fR (inclusive) matches of the atom.
.PP
An atom is a regular expression enclosed in `()' (matching a match for the
regular expression),
an empty set of `()' (matching the null string)\*(dg,
a \fIbracket expression\fR (see below), `.'
(matching any single character), `^' (matching the null string at the
beginning of a line), `$' (matching the null string at the
end of a line), a `\e' followed by one of the characters
`^.[$()|*+?{\e'
(matching that character taken as an ordinary character),
a `\e' followed by any other character\*(dg
(matching that character taken as an ordinary character,
as if the `\e' had not been present\*(dg),
or a single character with no other significance (matching that character).
A `{' followed by a character other than a digit is an ordinary
character, not the beginning of a bound\*(dg.
It is illegal to end an RE with `\e'.
.PP
A \fIbracket expression\fR is a list of characters enclosed in `[]'.
It normally matches any single character from the list (but see below).
If the list begins with `^',
it matches any single character
(but see below) \fInot\fR from the rest of the list.
If two characters in the list are separated by `\-', this is shorthand
for the full \fIrange\fR of characters between those two (inclusive) in the
collating sequence,
e.g. `[0\-9]' in ASCII matches any decimal digit.
It is illegal\*(dg for two ranges to share an
endpoint, e.g. `a-c-e'.
Ranges are very collating-sequence-dependent,
and portable programs should avoid relying on them.
.PP
To include a literal `]' in the list, make it the first character
(following a possible `^').
To include a literal `\-', make it the first or last character,
or the second endpoint of a range.
To use a literal `\-' as the first endpoint of a range,
enclose it in `[.' and `.]' to make it a collating element (see below).
With the exception of these and some combinations using `[' (see next
paragraphs), all other special characters, including `\e', lose their
special significance within a bracket expression.
.PP
Within a bracket expression, a collating element (a character,
a multi-character sequence that collates as if it were a single character,
or a collating-sequence name for either)
enclosed in `[.' and `.]' stands for the
sequence of characters of that collating element.
The sequence is a single element of the bracket expression's list.
A bracket expression containing a multi-character collating element 
can thus match more than one character,
e.g. if the collating sequence includes a `ch' collating element,
then the RE `[[.ch.]]*c' matches the first five characters
of `chchcc'.
.PP
Within a bracket expression, a collating element enclosed in `[=' and
`=]' is an equivalence class, standing for the sequences of characters
of all collating elements equivalent to that one, including itself.
(If there are no other equivalent collating elements,
the treatment is as if the enclosing delimiters were `[.' and `.]'.)
For example, if o and \o'o^' are the members of an equivalence class,
then `[[=o=]]', `[[=\o'o^'=]]', and `[o\o'o^']' are all synonymous.
An equivalence class may not\*(dg be an endpoint
of a range.
.PP
Within a bracket expression, the name of a \fIcharacter class\fR enclosed
in `[:' and `:]' stands for the list of all characters belonging to that
class.
Standard character class names are:
.PP
.RS
.nf
.ta 3c 6c 9c
alnum	digit	punct
alpha	graph	space
blank	lower	upper
cntrl	print	xdigit
.fi
.RE
.PP
These stand for the character classes defined in
.BR wctype (3).
A locale may provide others.
A character class may not be used as an endpoint of a range.
.\" As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=295666
.\" The following does not seem to apply in the glibc implementation
.\" .PP
.\" There are two special cases\*(dg of bracket expressions:
.\" the bracket expressions `[[:<:]]' and `[[:>:]]' match the null string at
.\" the beginning and end of a word respectively.
.\" A word is defined as a sequence of
.\" word characters
.\" which is neither preceded nor followed by
.\" word characters.
.\" A word character is an
.\" .I alnum
.\" character (as defined by
.\" .BR wctype (3))
.\" or an underscore.
.\" This is an extension,
.\" compatible with but not specified by POSIX 1003.2,
.\" and should be used with
.\" caution in software intended to be portable to other systems.
.PP
In the event that an RE could match more than one substring of a given
string,
the RE matches the one starting earliest in the string.
If the RE could match more than one substring starting at that point,
it matches the longest.
Subexpressions also match the longest possible substrings, subject to
the constraint that the whole match be as long as possible,
with subexpressions starting earlier in the RE taking priority over
ones starting later.
Note that higher-level subexpressions thus take priority over
their lower-level component subexpressions.
.PP
Match lengths are measured in characters, not collating elements.
A null string is considered longer than no match at all.
For example,
`bb*' matches the three middle characters of `abbbc',
`(wee|week)(knights|nights)' matches all ten characters of `weeknights',
when `(.*).*' is matched against `abc' the parenthesized subexpression
matches all three characters, and
when `(a*)*' is matched against `bc' both the whole RE and the parenthesized
subexpression match the null string.
.PP
If case-independent matching is specified,
the effect is much as if all case distinctions had vanished from the
alphabet.
When an alphabetic that exists in multiple cases appears as an
ordinary character outside a bracket expression, it is effectively
transformed into a bracket expression containing both cases,
e.g. `x' becomes `[xX]'.
When it appears inside a bracket expression, all case counterparts
of it are added to the bracket expression, so that (e.g.) `[x]'
becomes `[xX]' and `[^x]' becomes `[^xX]'.
.PP
No particular limit is imposed on the length of REs\*(dg.
Programs intended to be portable should not employ REs longer
than 256 bytes,
as an implementation can refuse to accept such REs and remain
POSIX-compliant.
.PP
Obsolete (``basic'') regular expressions differ in several respects.
`|', `+', and `?' are ordinary characters and there is no equivalent
for their functionality.
The delimiters for bounds are `\e{' and `\e}',
with `{' and `}' by themselves ordinary characters.
The parentheses for nested subexpressions are `\e(' and `\e)',
with `(' and `)' by themselves ordinary characters.
`^' is an ordinary character except at the beginning of the
RE or\*(dg the beginning of a parenthesized subexpression,
`$' is an ordinary character except at the end of the
RE or\*(dg the end of a parenthesized subexpression,
and `*' is an ordinary character if it appears at the beginning of the
RE or the beginning of a parenthesized subexpression
(after a possible leading `^').
Finally, there is one new type of atom, a \fIback reference\fR:
`\e' followed by a non-zero decimal digit \fId\fR
matches the same sequence of characters
matched by the \fId\fRth parenthesized subexpression
(numbering subexpressions by the positions of their opening parentheses,
left to right),
so that (e.g.) `\e([bc]\e)\e1' matches `bb' or `cc' but not `bc'.
.SH "SEE ALSO"
.BR regex (3)
.PP
POSIX 1003.2, section 2.8 (Regular Expression Notation).
.SH BUGS
Having two kinds of REs is a botch.
.PP
The current 1003.2 spec says that `)' is an ordinary character in
the absence of an unmatched `(';
this was an unintentional result of a wording error,
and change is likely.
Avoid relying on it.
.PP
Back references are a dreadful botch,
posing major problems for efficient implementations.
They are also somewhat vaguely defined
(does
`a\e(\e(b\e)*\e2\e)*d' match `abbbd'?).
Avoid using them.
.PP
1003.2's specification of case-independent matching is vague.
The ``one case implies all cases'' definition given above
is current consensus among implementors as to the right interpretation.
.PP
The syntax for word boundaries is incredibly ugly.
.SH AUTHOR
This page was taken from Henry Spencer's regex package.

--- NEW FILE: pkgid.m4 ---
## pkgid.m4  -*- Autoconf -*- vim: filetype=config
## Generate a package identification argument list for AC_INIT.
## (MinGW Project specific version).
##
## $Id: pkgid.m4,v 1.1 2007/04/30 22:46:38 keithmarshall Exp $
##
## Written by Keith Marshall <kei...@us...>
##
## Hereby assigned to the public domain.
## This file is provided `as is', in the hope that it may be useful,
## but WITHOUT WARRANTY OF ANY KIND, not even any implied warranty of
## MERCHANTABILITY, nor of FITNESS FOR ANY PARTICULAR PURPOSE.
##
##
## m4_include this file in aclocal.m4, and invoke AC_INIT as:--
##
##   AC_INIT(__MINGW_AC_PACKAGE_IDENTIFICATION__)
##
## to automatically define PACKAGE_NAME, PACKAGE_VERSION, PACKAGE_TARNAME
## and PACKAGE_BUG_REPORT, deriving them from tags specified in configure.ac,
## using the MINGW_AC_DEFINE_PACKAGE_ID( TAGNAME, VALUE ) macro to define
## the tag values, *before* invoking AC_INIT.
##

# MINGW_AC_DEFINE_PACKAGE_ID( TAGNAME, VALUE )
# --------------------------------------------
# Define VALUE for a tag, selected from the following TAGNAME list,
# and used to compose arguments for AC_INIT.
#
#   PROVIDER         optional; default is `MinGW'
#   BASENAME         required; the base name for the package
#   TARNAME_PREFIX   optional; default is `mingw'
#   VERSION_MAJOR    required; major version number for package
#   VERSION_MINOR    required; minor version number for package
#   PATCHLEVEL       optional; default is an empty string
#   BUG_REPORT_URI   predefined to URI for the MinGW bug tracker
#
# These are assigned to AC_INIT arguments as follows:--
#
#   PACKAGE_NAME        =  [PROVIDER ]BASENAME
#   PACKAGE_VERSION     =  VERSION_MAJOR.VERSION_MINOR[.PATCHLEVEL]
#   PACKAGE_TARNAME     =  [TARNAME_PREFIX-]NAME
#   PACKAGE_BUG_REPORT  =  BUG_REPORT_URI
#
m4_define([MINGW_AC_DEFINE_PACKAGE_ID],
[m4_define([__MINGW_AC_PACKAGE_][$1][__],[$2])dnl
])# MINGW_AC_DEFINE_PACKAGE_ID

# Define default values for the optional tags.
#
MINGW_AC_DEFINE_PACKAGE_ID([PROVIDER],        [MinGW])
MINGW_AC_DEFINE_PACKAGE_ID([TARNAME_PREFIX],  [mingw])
MINGW_AC_DEFINE_PACKAGE_ID([BUG_TRACKER_URI],
[https://sourceforge.net/tracker/?group_id=2435&atid=102435])

# __MINGW_AC_PACKAGE_IDENTIFICATION__
# -----------------------------------
# Construct an argument list for AC_INIT.
#
m4_define([__MINGW_AC_PACKAGE_IDENTIFICATION__],
[__MINGW_AC_PACKAGE_OPTION__([__MINGW_AC_PACKAGE_PROVIDER__],[ ])]dnl
[__MINGW_AC_PACKAGE_BASENAME__][,]dnl
[__MINGW_AC_PACKAGE_VERSION_MAJOR__[.][__MINGW_AC_PACKAGE_VERSION_MINOR__]]dnl
[__MINGW_AC_PACKAGE_OPTION__([__MINGW_AC_PACKAGE_PATCHLEVEL__],[],[.])][,]dnl
[__MINGW_AC_PACKAGE_BUG_TRACKER_URI__][,]dnl
[__MINGW_AC_PACKAGE_OPTION__([__MINGW_AC_PACKAGE_TARNAME_PREFIX__],[-])dnl
[__MINGW_AC_PACKAGE_BASENAME__]dnl
])#__MINGW_AC_PACKAGE_IDENTIFICATION__

# __MINGW_AC_PACKAGE_OPTION__( TAG, [SUFFIX], [PREFIX] )
# ------------------------------------------------------
# Insert optional package ID tags in the generated AC_INIT arglist,
# in the form `[PREFIX]TAG[SUFFIX]'; emits nothing, if TAG is either
# undefined, or is an empty string.
#
m4_define([__MINGW_AC_PACKAGE_OPTION__],[m4_ifdef([$1],[$3]$1[$2])dnl
])#__MINGW_AC_PACKAGE_OPTION__

# $RCSfile: pkgid.m4,v $Revision: 1.1 $: end of file

--- NEW FILE: regex.3 ---
.\" Copyright (C), 1995, Graeme W. Wilford. (Wilf.)
.\"
.\" Permission is granted to make and distribute verbatim copies of this
.\" manual provided the copyright notice and this permission notice are
.\" preserved on all copies.
.\"
.\" Permission is granted to copy and distribute modified versions of this
.\" manual under the conditions for verbatim copying, provided that the
.\" entire resulting derived work is distributed under the terms of a
.\" permission notice identical to this one.
.\" 
.\" Since the Linux kernel and libraries are constantly changing, this
.\" manual page may be incorrect or out-of-date.  The author(s) assume no
.\" responsibility for errors or omissions, or for damages resulting from
.\" the use of the information contained herein.  The author(s) may not
.\" have taken the same level of care in the production of this manual,
.\" which is licensed free of charge, as they might when working
.\" professionally.
.\" 
.\" Formatted or processed versions of this manual, if unaccompanied by
.\" the source, must acknowledge the copyright and authors of this work.
.\"
.\" Wed Jun 14 16:10:28 BST 1995 Wilf. (G.W...@ee...)
.\" Tiny change in formatting - aeb, 950812
.\" Modified 8 May 1998 by Joseph S. Myers (js...@ca...)
.\" 2007-04-30  Keith Marshall  (kei...@us...)
.\"   Adapt TH for inclusion in MinGW distribution kit
.\"
.\" show the synopsis section nicely
.de xx
.in \\n(INu+\\$1
.ti -\\$1
..
.TH REGEX 3 2007-04-30 MinGW "MinGW Programmer's Manual"
.SH NAME
regcomp, regexec, regerror, regfree \- POSIX regex functions
.SH SYNOPSIS
.B #include <sys/types.h>
.br
.B #include <regex.h>
.sp
.xx \w'\fBint\ regcomp(\fR'u
.BI "int\ regcomp(regex_t *" preg ", const char *" regex , 
.BI "int " cflags );
.xx \w'\fBint\ regexec(\fR'u
.BI "int\ regexec(const regex_t *" preg ", const char *" string ,
.BI "size_t " nmatch ", regmatch_t " pmatch[] , 
.BI "int " eflags );
.xx \w'\fBsize_t\ regerror(\fR'u
.BI "size_t\ regerror(int " errcode , 
.BI "const regex_t *" preg ", char *" errbuf , 
.BI "size_t " errbuf_size );
.xx \w'\fBvoid\ regfree(\fR'
.BI "void\ regfree(regex_t *" preg );
.SH "POSIX REGEX COMPILING"
.BR regcomp ()
is used to compile a regular expression into a form that is suitable
for subsequent 
.BR regexec ()
searches.

.BR regcomp ()
is supplied with 
.IR preg , 
a pointer to a pattern buffer storage area; 
.IR regex ,
a pointer to the null-terminated string and
.IR cflags ,
flags used to determine the type of compilation.

All regular expression searching must be done via a compiled pattern
buffer, thus 
.BR regexec ()
must always be supplied with the address of a 
.BR regcomp ()
initialized pattern buffer.

.I cflags 
may be the 
.RB bitwise- or
of one or more of the following:
.TP 
.B REG_EXTENDED
Use 
.B POSIX
Extended Regular Expression syntax when interpreting 
.IR regex .
If not set,
.B POSIX
Basic Regular Expression syntax is used.
.TP 
.B REG_ICASE
Do not differentiate case.  Subsequent 
.BR regexec ()
searches using this pattern buffer will be case insensitive.
.TP 
.B REG_NOSUB
Support for substring addressing of matches is not required.
The
.I nmatch
and
.I pmatch
parameters to 
.BR regexec ()
are ignored if the pattern buffer supplied was compiled with this flag set.
.TP 
.B REG_NEWLINE
Match-any-character operators don't match a newline.

A non-matching list 
.RB ( [^...] )
not containing a newline does not match a newline.
    
Match-beginning-of-line operator
.RB ( ^ )
matches the empty string immediately after a newline, regardless of
whether
.IR eflags ,
the execution flags of
.BR regexec (),
contains 
.BR REG_NOTBOL .

Match-end-of-line operator 
.RB ( $ )
matches the empty string immediately before a newline, regardless of
whether 
.IR eflags 
contains
.BR REG_NOTEOL .
.SH "POSIX REGEX MATCHING"
.BR regexec ()
is used to match a null-terminated string
against the precompiled pattern buffer, 
.IR preg .
.I nmatch
and
.I pmatch
are used to provide information regarding the location of any matches.  
.I eflags
may be the 
.RB bitwise- or
of one or both of 
.B REG_NOTBOL
and
.B REG_NOTEOL 
which cause changes in matching behaviour described below.
.TP
.B REG_NOTBOL
The match-beginning-of-line operator always fails to match (but see the
compilation flag
.B REG_NEWLINE 
above)
This flag may be used when different portions of a string are passed to 
.BR regexec ()
and the beginning of the string should not be interpreted as the
beginning of the line.
.TP
.B REG_NOTEOL
The match-end-of-line operator always fails to match (but see the
compilation flag
.B REG_NEWLINE
above)
.SS "BYTE OFFSETS"
Unless 
.B REG_NOSUB
was set for the compilation of the pattern buffer, it is possible to
obtain substring match addressing information. 
.I pmatch
must be dimensioned to have at least
.I nmatch
elements.
These are filled in by
.BR regexec ()
with substring match addresses.  Any unused structure elements
will contain the value \-1.

The 
.B regmatch_t 
structure which is the type of
.I pmatch
is defined in
.IR regex.h .

.RS
.B typedef struct
.br
.B {
.br
.BI "  regoff_t " rm_so ;
.br
.BI "  regoff_t " rm_eo ;
.br
.B }
.B regmatch_t;
.RE

Each 
.I rm_so
element that is not \-1 indicates the start offset of the next largest
substring match within the string.  The relative 
.I rm_eo 
element indicates the end offset of the match.
.SH "POSIX ERROR REPORTING"
.BR regerror ()
is used to turn the error codes that can be returned by both 
.BR regcomp ()
and
.BR regexec ()
into error message strings.

.BR regerror ()
is passed the error code,
.IR errcode ,
the pattern buffer,
.IR preg ,
a pointer to a character string buffer,
.IR errbuf ,
and the size of the string buffer,
.IR errbuf_size .
It returns the size of the
.I errbuf
required to contain the null-terminated error message string.  If both
.I errbuf
and
.I errbuf_size
are non-zero, 
.I errbuf
is filled in with the first 
.I "errbuf_size \- 1"
characters of the error message and a terminating null.
.SH "POSIX PATTERN BUFFER FREEING"
Supplying 
.BR regfree ()
with a precompiled pattern buffer,
.I preg
will free the memory allocated to the pattern buffer by the compiling
process,
.BR regcomp ().
.SH "RETURN VALUE"
.BR regcomp ()
returns zero for a successful compilation or an error code for failure.

.BR regexec ()
returns zero for a successful match or 
.B REG_NOMATCH
for failure.
.SH ERRORS
The following errors can be returned by 
.BR regcomp ():
.TP
.B REG_BADBR
Invalid use of back reference operator.
.TP
.B REG_BADPAT
Invalid use of pattern operators such as group or list.
.TP
.B REG_BADRPT
Invalid use of repetition operators such as using 
.RB ` * '
as the first character.
.TP
.B REG_EBRACE
Un-matched brace interval operators.
.TP
.B REG_EBRACK
Un-matched bracket list operators.
.TP
.B REG_ECOLLATE
Invalid collating element.
.TP
.B REG_ECTYPE
Unknown character class name.
.TP
.B REG_EEND
Non specific error.  This is not defined by POSIX.2.
.TP
.B REG_EESCAPE
Trailing backslash.
.TP
.B REG_EPAREN
Un-matched parenthesis group operators.
.TP
.B REG_ERANGE
Invalid use of the range operator, eg. the ending point of the range
occurs prior to the starting point.
.TP
.B REG_ESIZE
Compiled regular expression requires a pattern buffer larger than 64Kb.
This is not defined by POSIX.2.
.TP
.B REG_ESPACE
The regex routines ran out of memory.
.TP
.B REG_ESUBREG
Invalid back reference to a subexpression.
.SH "CONFORMING TO"
POSIX.2
.SH "SEE ALSO"
.BR regex (7),
GNU regex manual
 

--- NEW FILE: aclocal.m4 ---
# aclocal.m4 -*- Autoconf -*- vim: filetype=config
# File included by autoconf, when generating a configure script.
#
# $Id: aclocal.m4,v 1.1 2007/04/30 22:46:36 keithmarshall Exp $
#
# Copyright (C) 2007, MinGW Project
# Written by Keith Marshall <kei...@us...>
#
#
# This is free software.  It is provided AS IS, in the hope that it may
# be useful, but WITHOUT WARRANTY OF ANY KIND, not even an IMPLIED WARRANTY
# of MERCHANTABILITY, nor of FITNESS FOR ANY PARTICULAR PURPOSE.
#
# Permission is granted to redistribute this software, either "as is" or
# in modified form, under the terms of the GNU Lesser General Public License,
# as published by the Free Software Foundation; either version 2.1, or (at
# your option) any later version.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this software; see the file COPYING.LIB.  If not, write to the
# Free Software Foundation, 51 Franklin St - Fifth Floor, Boston,
# MA 02110-1301, USA.

m4_include([pkgid.m4])

# MINGW_AC_PROG_CC_OPTIONS( VARNAME, CLASS, OPTION ... )
# ------------------------------------------------------
# For each specified OPTION, prefix the CLASS flag, then check if the
# C compiler will accept the resulting CLASSOPTION flag as a valid argument,
# and if so, add it to the space separated list specified in VARNAME.
#
AC_DEFUN([MINGW_AC_PROG_CC_OPTIONS],
[AC_LANG_PUSH(C)
 popCFLAGS=$CFLAGS
 echo 'int main(void){return 0;}' > conftest.$ac_ext
 AC_FOREACH([OPTION], [$3],
  [AC_MSG_CHECKING([whether $CC accepts the $2[]m4_normalize(OPTION) option])
   CFLAGS="$popCFLAGS $$1 $2[]m4_normalize(OPTION)"
   if (eval $ac_compile) 2>&5; then
     AC_MSG_RESULT([yes])
     $1=${$1+"$$1 "}"$2[]m4_normalize(OPTION)"
   else
     AC_MSG_RESULT([no])
     echo 'failed program was:' >&5
     sed 's/^/| /' conftest.$ac_ext >&5
   fi
  ])dnl
 rm -f conftest*
 AC_LANG_POP([C])
 CFLAGS=$popCFLAGS
 AC_SUBST([$1])dnl
])# MINGW_AC_PROG_CC_OPTIONS

# MINGW_AC_DISTRIBUTION_TYPE( PREF )
# ----------------------------------
# Set the preferred packaging method to PREF, (either `tar' or `zip'),
# by setting the ZIPCMD and ZIPEXT substitution variables appropriately.
#
AC_DEFUN([MINGW_AC_DISTRIBUTION_TYPE],
[AC_SUBST([ZIPCMD], ['tar czhf'])
 AC_SUBST([ZIPEXT], ['.tar.gz'])
 test "x$1" = xzip && ZIPCMD='zip -r' ZIPEXT='.zip'
 AC_ARG_ENABLE([dist],
  AS_HELP_STRING([--enable-dist=TYPE],
  [package distribution as TYPE tar or zip [[TYPE=$1]]]),
  [case $enableval in
    tar) ;; zip) ZIPCMD='zip -r' ZIPEXT='.zip' ;;
    *) AC_MSG_WARN([$enableval:unsupported distribution format])
       AC_MSG_WARN([reverting to $1 format]) ;;
   esac
  ])dnl
])# MINGW_AC_DISTRIBUTION_TYPE

# MINGW_AC_DEV_INSTALL_OPTION
# ---------------------------
# Allow the user to optionally disable the installation of the
# development libraries, when invoking `make install'
#
AC_DEFUN([MINGW_AC_DEV_INSTALL_OPTION],
[AC_SUBST([install_dev], [install-dev])
 AC_ARG_ENABLE([dev-install],
  AS_HELP_STRING([--disable-dev-install],
  [omit development libraries with `make install']),
  [test "x$enableval" = xno && install_dev=""])dnl
])# MINGW_AC_DEV_INSTALL_OPTION
# $RCSfile: aclocal.m4,v $Revision: 1.1 $: end of file

--- NEW FILE: nomsvc ---
#! /bin/sh
# Stub to invoke instead of MSVC tools, when these are unavailable.
#
# $Id: nomsvc,v 1.1 2007/04/30 22:46:37 keithmarshall Exp $
#
# Written by Keith Marshall <kei...@us...>
# Hereby assigned to the public domain.
#
# This is free software.  You may copy, modify and redistribute it as
# you wish, without restriction of copyright.
#
# This software is provided "as is", in the hope that it may be useful.
# There is NO WARRANTY OF ANY KIND, not even an IMPLIED WARRANTY of
# MERCHANTABILITY, nor of FITNESS FOR ANY PARTICULAR PURPOSE.  The
# author accepts NO LIABILITY for damage of any kind, however caused,
# resulting from the use of this software.
#
  echo
  echo "MSVC program '$1' not available; not building MSVC components"
  echo "Not executing command: $@"
  echo
#
# $RCSfile: nomsvc,v $Revision: 1.1 $: end of file

Update of /cvsroot/mingw/portmaker/template
In directory sc8-pr-cvs16:/tmp/cvs-serv9660/template

Modified Files:
	mingwPORT.cleanup mingwPORT.configure mingwPORT.question 
	mingwPORT.sh 
Log Message:
Miscellaneous question, patch and configure bug-fixes and enhancements


Index: mingwPORT.question
===================================================================
RCS file: /cvsroot/mingw/portmaker/template/mingwPORT.question,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mingwPORT.question	9 Apr 2007 19:11:59 -0000	1.3
--- mingwPORT.question	27 Apr 2007 19:16:16 -0000	1.4
***************
*** 1,2 ****
--- 1,3 ----
+ ARCHIVEPATH=${ARCHIVEPATH-"/tmp"}
  ask "Download file?" "Yes" DOWNLOAD
  if (isyes $DOWNLOAD)
***************
*** 29,33 ****
  Select a numeric value:" "$ATN" ATN
    ask "Archive file?" "$ARCHIVEFILE" ARCHIVEFILE
!   ask "Download directory?" "/tmp" ARCHIVEPATH
  else
    ask "Unarchive file?" "Yes" UNARCHIVE
--- 30,34 ----
  Select a numeric value:" "$ATN" ATN
    ask "Archive file?" "$ARCHIVEFILE" ARCHIVEFILE
!   ask "Download directory?" "$ARCHIVEPATH" ARCHIVEPATH
  else
    ask "Unarchive file?" "Yes" UNARCHIVE
***************
*** 36,40 ****
      ask "Archive file type?" $ARCHIVETYPE ARCHIVETYPE
      ask "Archive file?" "${ARCHIVEFILE-$PACKAGE-$VERSION.$ARCHIVETYPE}" ARCHIVEFILE
!     ask "Archive file path?" "/tmp" ARCHIVEPATH
    fi
  fi
--- 37,41 ----
      ask "Archive file type?" $ARCHIVETYPE ARCHIVETYPE
      ask "Archive file?" "${ARCHIVEFILE-$PACKAGE-$VERSION.$ARCHIVETYPE}" ARCHIVEFILE
!     ask "Archive file path?" "$ARCHIVEPATH" ARCHIVEPATH
    fi
  fi

Index: mingwPORT.sh
===================================================================
RCS file: /cvsroot/mingw/portmaker/template/mingwPORT.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mingwPORT.sh	9 Sep 2006 09:21:45 -0000	1.4
--- mingwPORT.sh	27 Apr 2007 19:16:17 -0000	1.5
***************
*** 43,48 ****
    pref $mingwPORT.beforepatch
  
!   eval sed \"${PATCHFILTER-"s/x/x/"}\" $mingwPORT.patch \
!   | patch -t -N $PATCHFLAGS 
  
    pref $mingwPORT.afterpatch
--- 43,50 ----
    pref $mingwPORT.beforepatch
  
!   PATCHFLAGS=${PATCHFLAGS-"-p0"}
!   PATCHFILTER=${PATCHFILTER-"s,x,x,"}
!   sed ${PATCHFILTER} $mingwPORT.patch | ( cd "${SRCDIR}" &&
!     patch -t -N $PATCHFLAGS )
  
    pref $mingwPORT.afterpatch

Index: mingwPORT.cleanup
===================================================================
RCS file: /cvsroot/mingw/portmaker/template/mingwPORT.cleanup,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mingwPORT.cleanup	9 Jun 2006 22:21:00 -0000	1.3
--- mingwPORT.cleanup	27 Apr 2007 19:16:16 -0000	1.4
***************
*** 25,29 ****
    fi
  
!   patch -t -R ${PATCHFLAGS} < ${CURDIR}/mingwPORT.patch
  
    if [ -f ${CURDIR}/mingwPORT.afterrpatch ]
--- 25,30 ----
    fi
  
!   sed ${PATCHFILTER} $mingwPORT.patch | ( cd "${SRCDIR}" &&
!     patch -t -R $PATCHFLAGS )
  
    if [ -f ${CURDIR}/mingwPORT.afterrpatch ]

Index: mingwPORT.configure
===================================================================
RCS file: /cvsroot/mingw/portmaker/template/mingwPORT.configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mingwPORT.configure	3 Apr 2005 19:45:22 -0000	1.1
--- mingwPORT.configure	27 Apr 2007 19:16:16 -0000	1.2
***************
*** 1,9 ****
  # mingwPORT.configure
! # Required.  This is the execution of any configuration scripts before the
! # build process.
  
! if [ ! -d ${PREFIX} ]
! then
!   mkdir -p ${PREFIX}
! fi
! ${SRCDIR}/configure --prefix=`cd ${PREFIX} && pwd -W`
--- 1,7 ----
  # mingwPORT.configure
! # Required.  This initiates the execution of any configuration scripts
! # before the build process.
  
! test -d ${PREFIX} || mkdir -p ${PREFIX}
! CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS-"--prefix='`win32path ${PREFIX}`'"}
! eval ${SRCDIR}/configure ${HOSTSPEC} ${CONFIGURE_OPTIONS}

Update of /cvsroot/mingw/portmaker
In directory sc8-pr-cvs16:/tmp/cvs-serv9660

Modified Files:
	ChangeLog 
Log Message:
Miscellaneous question, patch and configure bug-fixes and enhancements


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/portmaker/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ChangeLog	9 Apr 2007 19:11:59 -0000	1.13
--- ChangeLog	27 Apr 2007 19:16:15 -0000	1.14
***************
*** 1,2 ****
--- 1,20 ----
+ 2007-04-27  Keith Marshall  <kei...@us...>
+ 
+ 	Miscellaneous question, patch and configure bug-fixes and enhancements
+ 
+ 	* template/mingwPORT.sh (PATCHFLAGS): Make sure its defined.
+ 	(PATCHFILTER): New variable; define default to pass through unchanged.
+ 	(SRCDIR): Make it current directory, while applying patches.
+ 
+ 	* template/mingwPORT.configure (HOSTSPEC): Honour cross compiler host
+ 	settings, if any, established in local mingwPORT.site file.
+ 	(CONFIGURE_OPTIONS): New variable; define default, and use it.
+ 
+ 	* template/mingwport.question (ARCHIVEPATH): Keep prior assignment as
+ 	default reply; this allows a local mingwPORT.site default assignment.
+ 
+ 	* template/mingwPORT.cleanup (PATCHFILTER, PATCHFLAGS): Use them.
+ 	(SRCDIR): Make it current directory, while reverting patches.
+ 
  2007-04-09  Jan Bruun Andersen  <jb...@us...>
  

Update of /cvsroot/mingw/catgets
In directory sc8-pr-cvs16:/tmp/cvs-serv20922

Modified Files:
	ChangeLog catopen.c mcsource.c 
Log Message:
* catopen.c (mc_open): Catch unopened file; return failed status.
* mcsource.c (mc_source): Kill MSGTEXT state, after NL at EOF.


Index: catopen.c
===================================================================
RCS file: /cvsroot/mingw/catgets/catopen.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** catopen.c	6 Apr 2007 22:34:52 -0000	1.1.1.1
--- catopen.c	20 Apr 2007 22:24:02 -0000	1.2
***************
*** 53,57 ****
   * On Win32 platforms, we don't expect LC_MESSAGES to be defined.
   * For this, and any others which don't define it, substitute LC_CTYPE.
-  *
   */
  # define LC_MESSAGES  LC_CTYPE
--- 53,56 ----
***************
*** 64,68 ****
   * we need to provide the malloc/realloc wrapper function,
   * which is prototyped in platform.h
-  *
   */
  #include <errno.h>
--- 63,66 ----
***************
*** 89,93 ****
     * we can handle.
     */
- 
    if( (fd = open( name, O_RDONLY | O_BINARY )) >= 0 )
    {
--- 87,90 ----
***************
*** 109,113 ****
       * so release the file descriptor...
       */
- 
      close( fd );
    }
--- 106,109 ----
***************
*** 115,119 ****
    /* ...and fall through, returning an invalid descriptor.
     */
- 
    return (int)(-1);
  }
--- 111,114 ----
***************
*** 126,130 ****
     * status code specified by `retval'.
     */
- 
    setlocale( LC_TYPE, working_locale );
    free( working_locale );
--- 121,124 ----
***************
*** 146,150 ****
     * ( we need to change it temporarily, because...
     */
- 
    char *saved_locale = strdup( setlocale( LC_CTYPE, NULL ) );
  
--- 140,143 ----
***************
*** 153,157 ****
     * Win32 multibyte character path names ).
     */
- 
    setlocale( LC_CTYPE, "" );
    if( (step = mbtowc( &chk, (chkptr = msgcat), MB_CUR_MAX )) > 0 )
--- 146,149 ----
***************
*** 160,164 ****
       * characters which appear to represent a Win32 drive specifier.
       */
- 
      if( (chk != L'/') && (chk != L'\\') )
      {
--- 152,155 ----
***************
*** 166,170 ****
         * directory name separator, and the second *is* a colon...
         */
-       
        chkptr += step;
        if( ((step = mbtowc( &chk, chkptr, MB_CUR_MAX )) > 0) && (chk == L':') )
--- 157,160 ----
***************
*** 178,182 ****
      /* Scan the given `msgcat' spec, checking for directory name separators...
       */
- 
      while( step > 0 )
      {
--- 168,171 ----
***************
*** 186,190 ****
  	 * so pass it back to `catopen', as an exact catalogue file reference.
  	 */
- 
  	return mc_pop_locale( LC_CTYPE, saved_locale, mc_validate( msgcat ) );
        }
--- 175,178 ----
***************
*** 197,201 ****
       * falling back to the built in default, if none is defined.
       */
- 
      if( (nlspath = getenv( "NLSPATH" )) == NULL )
        nlspath = NLSPATH_DEFAULT;
--- 185,188 ----
***************
*** 206,210 ****
       * catalogue successfully matched, or bail out if no match found.
       */
- 
      nlscopy = nlsname;
      headroom = sizeof( nlsname );
--- 193,196 ----
***************
*** 214,223 ****
  	   case L'\0':
  	   case NLSPATH_SEPARATOR_CHAR:
! 
! 	     /* We reached the end of the current NLSPATH template component;
  	      * add a terminator, and attempt to validate a matching message
  	      * catalogue; return it immediately if successful.
  	      */
- 
  	     if( headroom >= MB_CUR_MAX )
  	     {
--- 200,208 ----
  	   case L'\0':
  	   case NLSPATH_SEPARATOR_CHAR:
! 	     /*
! 	      *	We reached the end of the current NLSPATH template component;
  	      * add a terminator, and attempt to validate a matching message
  	      * catalogue; return it immediately if successful.
  	      */
  	     if( headroom >= MB_CUR_MAX )
  	     {
***************
*** 226,235 ****
  		 return fd;
  	     }
- 
  	     /* Couldn't find a valid message catalogue to match the current
  	      * NLSPATH prototype; move on to the next template, if any, and
  	      * try again.
  	      */
- 
  	     nlspath += step;
  	     nlscopy = nlsname;
--- 211,218 ----
***************
*** 238,244 ****
  
  	   case L'%':
! 
! 	     /* Found a substitution meta-character; need to interpret it. */
! 
  	     nlspath += step;
  	     nlspath += (step = mbtowc( &chk, nlspath, MB_CUR_MAX ));
--- 221,227 ----
  
  	   case L'%':
! 	     /*
! 	      *	Found a substitution meta-character; need to interpret it.
! 	      */
  	     nlspath += step;
  	     nlspath += (step = mbtowc( &chk, nlspath, MB_CUR_MAX ));
***************
*** 250,256 ****
  		  * then append it to the prototype for the message catalogue name
  		  * which we are currently constructing.
- 		  *
  		  */
- 
  		 if( headroom >= MB_CUR_MAX )
  		 {
--- 233,237 ----
***************
*** 267,273 ****
  		  * this `catopen' request, into the assembled name prototype;
  		  * again, check we have sufficient space, before proceeding.
- 		  *
  		  */
- 
  		 subst = msgcat;
  		 while( (copy_index = mbtowc( &chk, subst, MB_CUR_MAX )) > 0 )
--- 248,252 ----
***************
*** 292,301 ****
  		  * `LC_MESSAGES' or `LANG' definitions in the environment, if
  		  * present, otherwise for the system locale.
- 		  *
  		  */
- 
  		 if(  (nls_locale != NULL)
  		 ||  ((nls_locale = getenv( NLS_LOCALE_STRING )) != NULL)
! 	         ||  ((nls_locale = setlocale( LC_MESSAGES, NULL )) != NULL)  )
  		 {
  		   wchar_t break_code = L'\0';
--- 271,278 ----
  		  * `LC_MESSAGES' or `LANG' definitions in the environment, if
  		  * present, otherwise for the system locale.
  		  */
  		 if(  (nls_locale != NULL)
  		 ||  ((nls_locale = getenv( NLS_LOCALE_STRING )) != NULL)
! 		 ||  ((nls_locale = setlocale( LC_MESSAGES, NULL )) != NULL)  )
  		 {
  		   wchar_t break_code = L'\0';
***************
*** 332,335 ****
--- 309,316 ----
  
  	   default:
+ 	     /*
+ 	      * Any regular character is simply copied to the constructed path,
+ 	      * provided there is sufficient space available.
+ 	      */	      
  	     if( headroom >= step )
  	     {
***************
*** 347,351 ****
     * so just return it as is, and leave `catopen' to clean up.
     */
- 
    return mc_pop_locale( LC_CTYPE, saved_locale, (int)(-1) );
  }
--- 328,331 ----
***************
*** 363,367 ****
     * memory, and loads the entire catalogue into the allocated space.
     */
- 
    char *catname = va_arg( argv, char * );
    unsigned tab_increment, flags = va_arg( argv, unsigned );
--- 343,346 ----
***************
*** 370,374 ****
     * table slots to create, if we need to expand the table.
     */
-   
    if( (tab_increment = flags & NL_CATD_BLKSIZ_MAX) > 0 )
      cdt->grow_size = tab_increment;
--- 349,352 ----
***************
*** 376,380 ****
    /* Find the first free slot, if any, in the descriptor table.
     */
- 
    int retval = 0;
    while( (retval < cdt->curr_size) && (cdt->tab[ retval ].fd >= 0) )
--- 354,357 ----
***************
*** 383,387 ****
    /* Got an empty slot?
     */
- 
    if( retval == cdt->curr_size )
    {
--- 360,363 ----
***************
*** 390,394 ****
       * table increment size, bailing out on failure.
       */
- 
      struct mc_descriptor *tmp = cdt->tab;
      int new_size = retval + cdt->grow_size;
--- 366,369 ----
***************
*** 399,403 ****
       * initialise each new slot...
       */
- 
      cdt->tab = tmp;
      while( retval < new_size )
--- 374,377 ----
***************
*** 423,427 ****
     * within the message catalogue descriptor.
     */
- 
    if( (cdt->tab[ retval ].fd = mc_nlspath_open( catname, flags )) >= 0 )
    {
--- 397,400 ----
***************
*** 430,434 ****
       * and load the entire contents of the file into this buffer.
       */
- 
      struct stat catinfo;
      struct mc_descriptor *ref = cdt->tab + retval;
--- 403,406 ----
***************
*** 439,463 ****
        /* If we get to here, we failed to load the message catalogue,
         * so mark the descriptor as unused, free any resources we allocated,
!        * and bail out.
         */
- 
        _mc_free_( ref );
-       return (void *)(-1);
      }
    }
  
!   /* If we did not bail out earlier,
!    * then we should now have a valid, and open, message catalogue descriptor;
!    * it is actually of `nl_catd' type, but `_mctab_' requires us to return it
!    * as a generic `void *' pointer; we do that, leaving `catopen' to cast it
!    * to the ultimately expected `nl_catd' type.
     */
! 
!   return (void *) retval;
  }
  
  /* The actual `catopen' implementation is trivial...
   */
- 
  nl_catd catopen( __const char *name, int flags )
  {
--- 411,436 ----
        /* If we get to here, we failed to load the message catalogue,
         * so mark the descriptor as unused, free any resources we allocated,
!        * and fall through to bail out.
         */
        _mc_free_( ref );
      }
+     else
+       /*
+        * We should now have a valid, and open, message catalogue descriptor;
+        * it is actually of `nl_catd' type, but `_mctab_' requires us to return
+        * a generic `void *' pointer; we do that, leaving `catopen' to cast it
+        * to the ultimately expected `nl_catd' type.
+        */
+       return (void *) retval;
    }
  
!   /* If we fall through to here, then something went wrong;
!    * there should be nothing to clean up, so just return a `failed' status.
     */
!   return (void *)(-1);
  }
  
  /* The actual `catopen' implementation is trivial...
   */
  nl_catd catopen( __const char *name, int flags )
  {

Index: mcsource.c
===================================================================
RCS file: /cvsroot/mingw/catgets/mcsource.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mcsource.c	6 Apr 2007 22:34:51 -0000	1.1.1.1
--- mcsource.c	20 Apr 2007 22:24:03 -0000	1.2
***************
*** 739,743 ****
           * BEFORE we proceed to the next cycle.
           */
- 
          while( headroom < (xcount + ICONV_MB_LEN_MAX) )
          {
--- 739,742 ----
***************
*** 790,793 ****
--- 789,805 ----
      }
      dfprintf(( stderr, "\n%s:end of input; (count is now %d bytes)", input, count ));
+     /*
+      * We reached the end of the input stream.
+      * If the final record was a message definition,
+      * then the MSGTEXT parser state will still be active;
+      * this state would be cancelled immediately, at the start of the next cycle,
+      * but becuase there is no more input data, we will not start another cycle.
+      * To avoid misidentifying this case as an incomplete final message,
+      * and so displaying an erroneous warning,
+      * we clear this state now.
+      */
+     if(  (count == 0)
+     &&  ((status & (MSGTEXT | NEWLINE | CONTINUED)) == (MSGTEXT | NEWLINE))  )
+       status &= ~MSGTEXT;
    }
    /*

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/catgets/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ChangeLog	6 Apr 2007 22:34:55 -0000	1.1.1.1
--- ChangeLog	20 Apr 2007 22:24:02 -0000	1.2
***************
*** 1,2 ****
--- 1,7 ----
+ 2007-04-20  Keith Marshall  <kei...@us...>
+ 
+ 	* catopen.c (mc_open): Catch unopened file; return failed status.
+ 	* mcsource.c (mc_source): Kill MSGTEXT state, after NL at EOF.
+ 
  2007-04-06  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/portmaker/template
In directory sc8-pr-cvs16:/tmp/cvs-serv3473/template

Modified Files:
	mingwPORT.question 
Log Message:
	* template/mingwPORT.question (ARCHIVEPATH): Modify prompt;
	s/Download to path/Download directory/
	(ARCHIVEFILE): Preserve prior definition as default.


Index: mingwPORT.question
===================================================================
RCS file: /cvsroot/mingw/portmaker/template/mingwPORT.question,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mingwPORT.question	3 Dec 2006 14:57:07 -0000	1.2
--- mingwPORT.question	9 Apr 2007 19:11:59 -0000	1.3
***************
*** 29,33 ****
  Select a numeric value:" "$ATN" ATN
    ask "Archive file?" "$ARCHIVEFILE" ARCHIVEFILE
!   ask "Download to path?" "/tmp" ARCHIVEPATH
  else
    ask "Unarchive file?" "Yes" UNARCHIVE
--- 29,33 ----
  Select a numeric value:" "$ATN" ATN
    ask "Archive file?" "$ARCHIVEFILE" ARCHIVEFILE
!   ask "Download directory?" "/tmp" ARCHIVEPATH
  else
    ask "Unarchive file?" "Yes" UNARCHIVE
***************
*** 35,39 ****
    then
      ask "Archive file type?" $ARCHIVETYPE ARCHIVETYPE
!     ask "Archive file?" "$PACKAGE-$VERSION.$ARCHIVETYPE" ARCHIVEFILE
      ask "Archive file path?" "/tmp" ARCHIVEPATH
    fi
--- 35,39 ----
    then
      ask "Archive file type?" $ARCHIVETYPE ARCHIVETYPE
!     ask "Archive file?" "${ARCHIVEFILE-$PACKAGE-$VERSION.$ARCHIVETYPE}" ARCHIVEFILE
      ask "Archive file path?" "/tmp" ARCHIVEPATH
    fi

Update of /cvsroot/mingw/portmaker
In directory sc8-pr-cvs16:/tmp/cvs-serv3473

Modified Files:
	ChangeLog 
Log Message:
	* template/mingwPORT.question (ARCHIVEPATH): Modify prompt;
	s/Download to path/Download directory/
	(ARCHIVEFILE): Preserve prior definition as default.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/portmaker/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ChangeLog	8 Apr 2007 21:58:51 -0000	1.12
--- ChangeLog	9 Apr 2007 19:11:59 -0000	1.13
***************
*** 1,2 ****
--- 1,8 ----
+ 2007-04-09  Jan Bruun Andersen  <jb...@us...>
+ 
+ 	* template/mingwPORT.question (ARCHIVEPATH): Modify prompt;
+ 	s/Download to path/Download directory/
+ 	(ARCHIVEFILE): Preserve prior definition as default.
+ 
  2007-04-08  Jan Bruun Andersen  <jb...@us...>
  

Update of /cvsroot/mingw/portmaker
In directory sc8-pr-cvs16:/tmp/cvs-serv24050

Modified Files:
	ChangeLog 
Log Message:
	* template/mingwPORT.help ($matched): Undefined variable...
	($match): ...should have been this; corrected.
	(--info): Don't duplicate $ARCHIVETYPE after $ARCHIVEFILE.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/portmaker/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ChangeLog	3 Dec 2006 14:57:06 -0000	1.11
--- ChangeLog	8 Apr 2007 21:58:51 -0000	1.12
***************
*** 1,2 ****
--- 1,8 ----
+ 2007-04-08  Jan Bruun Andersen  <jb...@us...>
+ 
+ 	* template/mingwPORT.help ($matched): Undefined variable...
+ 	($match): ...should have been this; corrected.
+ 	(--info): Don't duplicate $ARCHIVETYPE after $ARCHIVEFILE.
+ 
  2006-12-03  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/portmaker/template
In directory sc8-pr-cvs16:/tmp/cvs-serv24050/template

Modified Files:
	mingwPORT.help 
Log Message:
	* template/mingwPORT.help ($matched): Undefined variable...
	($match): ...should have been this; corrected.
	(--info): Don't duplicate $ARCHIVETYPE after $ARCHIVEFILE.


Index: mingwPORT.help
===================================================================
RCS file: /cvsroot/mingw/portmaker/template/mingwPORT.help,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mingwPORT.help	21 Apr 2006 19:26:08 -0000	1.1
--- mingwPORT.help	8 Apr 2007 21:58:51 -0000	1.2
***************
*** 12,16 ****
  ETX
  
! test opt${matched} = opt--version && cat << ETX
  
  mingwPORT and portmaker are free software packages.  They are distributed
--- 12,16 ----
  ETX
  
! test opt${match} = opt--version && cat << ETX
  
  mingwPORT and portmaker are free software packages.  They are distributed
***************
*** 27,31 ****
  ETX
  
! test opt${matched} = opt--help && cat << ETX
  
  Usage: ./mingwPORT.sh [--option ...]
--- 27,31 ----
  ETX
  
! test opt${match} = opt--help && cat << ETX
  
  Usage: ./mingwPORT.sh [--option ...]
***************
*** 62,70 ****
  ETX
  
! test opt${matched} = opt--info && cat << ETX
  
  Project Home URL:       $ARCHIVEHOME
  Download URL:           $DOWNLOADURI
! Download File:          $ARCHIVEFILE.$ARCHIVETYPE
  
  Installation Root:      $PREFIX
--- 62,70 ----
  ETX
  
! test opt${match} = opt--info && cat << ETX
  
  Project Home URL:       $ARCHIVEHOME
  Download URL:           $DOWNLOADURI
! Download File:          $ARCHIVEFILE
  
  Installation Root:      $PREFIX