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

Update of /cvsroot/mingw/mingw-get
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23535

Modified Files:
	ChangeLog Makefile.in 
Log Message:
Work around an autoconf bug.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/mingw-get/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.in	10 Jun 2010 21:32:48 -0000	1.17
--- Makefile.in	24 Jun 2010 21:40:11 -0000	1.18
***************
*** 33,37 ****
  DEBUGLEVEL = 0
  
! VPATH = ${srcdir}/src ${srcdir}/src/pkginfo ${srcdir}/tinyxml
  
  CC = @CC@
--- 33,37 ----
  DEBUGLEVEL = 0
  
! VPATH = @top_srcdir@/src:@top_srcdir@/src/pkginfo:@top_srcdir@/tinyxml
  
  CC = @CC@

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** ChangeLog	24 Jun 2010 20:49:38 -0000	1.50
--- ChangeLog	24 Jun 2010 21:40:11 -0000	1.51
***************
*** 1,4 ****
--- 1,15 ----
  2010-06-24  Keith Marshall  <kei...@us...>
  
+ 	Work around an autoconf bug (reported by Stefano Sabatini).
+ 
+ 	* Makefile.in (VPATH): Use @top_srcdir@ instead of ${srcdir}; current
+ 	autoconf incorrectly elides references to @srcdir@ and ${srcdir} when
+ 	substituting within a VPATH specification for building `in-source'.
+ 	Also, prefer colons to blanks as path name separators, for improved
+ 	portability to non-GNU implementations of make; (recommendation by
+ 	Ralf Wildenhues).
+ 
+ 2010-06-24  Keith Marshall  <kei...@us...>
+ 
  	Include alias search, when matching component package name.
  

Update of /cvsroot/mingw/mingw-get/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8578/src

Modified Files:
	keyword.c pkgfind.cpp 
Log Message:
Include alias search, when matching component package name.


Index: pkgfind.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgfind.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pkgfind.cpp	17 Apr 2010 12:43:05 -0000	1.4
--- pkgfind.cpp	24 Jun 2010 20:49:39 -0000	1.5
***************
*** 32,40 ****
  
  pkgXmlNode *
! pkgXmlDocument::FindPackageByName( const char *name, const char *subsystem )
  {
    pkgXmlNode *dir = GetRoot()->GetChildren();
    /*
-    * Working from the root of the package directory tree...
     * search all "package-collection" XML nodes, to locate a package
     * by "name"; return a pointer to the XML node which contains the
--- 32,49 ----
  
  pkgXmlNode *
! pkgXmlDocument::FindPackageByName( const char *lookup, const char *subsystem )
  {
+   /* Create a local copy of the package "name" which we are required to
+    * "lookup"; this allows us to make temporary adjustments to facilitate
+    * stripping of any "component" identifying suffix, which might occlude
+    * a match for a package "alias" name.
+    */
+   int len; char name[ 1 + (len = strlen( lookup )) ];
+   strcpy( name, lookup );
+ 
+   /* Working from the root of the package directory tree...
+    */
    pkgXmlNode *dir = GetRoot()->GetChildren();
    /*
     * search all "package-collection" XML nodes, to locate a package
     * by "name"; return a pointer to the XML node which contains the
***************
*** 43,47 ****
    while( dir != NULL )
    {
!     /* Select only "package-collection" elements...
       */
      if( dir->IsElementOfType( package_collection_key )
--- 52,57 ----
    while( dir != NULL )
    {
!     /* Select only "package-collection" elements, which have been
!      * assigned the desired "subsystem" property...
       */
      if( dir->IsElementOfType( package_collection_key )
***************
*** 60,112 ****
  	   * property which matches the required package name...
  	   */
! 	  if( (strcmp( name, pkg->GetPropVal( name_key, "" )) == 0)
! 	  ||  (has_keyword( pkg->GetPropVal( alias_key, NULL ), name ) != 0)  )
  	    return pkg;
  
! 	  else
  	  {
! 	    /* We did find a "package" element, but neither its "name"
! 	     * nor its "alias" property provided a match; look within it,
! 	     * for a possible match on a "component" package element...
  	     */
! 	    pkgXmlNode *cpt = pkg->GetChildren();
! 	    while( cpt != NULL )
  	    {
! 	      /* For each element contained within the "package" definition,
! 	       * check if it represents a "component" package definition...
  	       */
! 	      if( cpt->IsElementOfType( component_key ) )
! 	      {
! 		/* ...and return immediately, when it does, AND it also has a
! 		 * "name" property which matches the required package name...
! 		 */
! 		if( strcmp( name, cpt->GetPropVal( name_key, "" )) == 0 )
! 		  return cpt;
! 
! 		else
! 		{ /* We did find a "component" package, but its "name"
! 		   * property didn't match; construct an alternative name,
! 		   * by combining the "class" property of the "component"
! 		   * with the "name" property of the containing "package",
! 		   * and evaluate that for a possible match...
! 		   */
! 		  const char *pkg_name = pkg->GetPropVal( name_key, "" );
! 		  const char *cpt_class = cpt->GetPropVal( class_key, "" );
! 		  char cpt_name[2 + strlen( pkg_name ) + strlen( cpt_class )];
! 		  sprintf( cpt_name, "%s-%s", pkg_name, cpt_class );
  
  		  /* Again, return the "component", if this identifies
  		   * a successful match...
  		   */
! 		  if( strcmp( name, cpt_name ) == 0 )
  		    return cpt;
  		}
  	      }
- 
- 	      /* ...otherwise, continue checking any other "components"
- 	       * which may be defined within the current "package.
- 	       */
- 	      cpt = cpt->GetNext();
  	    }
  	  }
  	}
--- 70,128 ----
  	   * property which matches the required package name...
  	   */
! 	  const char *pkg_name, *alias;
! 	  if( (strcmp( name, pkg_name = pkg->GetPropVal( name_key, "" )) == 0)
! 	  ||  (has_keyword( name, alias = pkg->GetPropVal( alias_key, NULL ) ) != 0)  )
  	    return pkg;
  
! 	  /* We did find a "package" element, but neither its "name"
! 	   * nor its "alias" property provided a match; look within it,
! 	   * for a possible match on a "component" package element...
! 	   */
! 	  pkgXmlNode *cpt = pkg->GetChildren();
! 	  while( cpt != NULL )
  	  {
! 	    /* For each element contained within the "package" definition,
! 	     * check if it represents a "component" package definition...
  	     */
! 	    if( cpt->IsElementOfType( component_key ) )
  	    {
! 	      /* ...and return immediately, when it does, AND it also has a
! 	       * "name" property which matches the required package name...
  	       */
! 	      if( strcmp( name, cpt->GetPropVal( name_key, "" )) == 0 )
! 		return cpt;
  
+ 	      else
+ 	      { /* We did find a "component" package, but its "name"
+ 		 * property didn't match; construct an alternative name,
+ 		 * by combining the "class" property of the "component"
+ 		 * with the "name" property of the containing "package",
+ 		 * and evaluate that for a possible match...
+ 		 */
+ 		const char *cpt_class = cpt->GetPropVal( class_key, "" );
+ 		char *cpt_name = name + len - strlen( cpt_class );
+ 		if( (strcmp( cpt_name, cpt_class ) == 0)
+ 		&&  (*--cpt_name == '-')  )
+ 		{
  		  /* Again, return the "component", if this identifies
  		   * a successful match...
  		   */
! 		  *cpt_name = '\0';
! 		  if( (strcmp( name, pkg_name ) == 0) || has_keyword( name, alias ) )
  		    return cpt;
+ 
+ 		  /* Otherwise, restore the original content of the
+ 		   * working copy of the "lookup name", in preperation
+ 		   * for any subsequent attempt to find a match.
+ 		   */
+ 		  *cpt_name = '-';
  		}
  	      }
  	    }
+ 
+ 	    /* ...otherwise, continue checking any other "components"
+ 	     * which may be defined within the current "package.
+ 	     */
+ 	    cpt = cpt->GetNext();
  	  }
  	}

Index: keyword.c
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/keyword.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** keyword.c	23 Nov 2009 20:44:25 -0000	1.1
--- keyword.c	24 Jun 2010 20:49:39 -0000	1.2
***************
*** 5,13 ****
   *
   * Written by Keith Marshall <kei...@us...>
!  * Copyright (C) 2009, MinGW Project
   *
   *
   * Implementation of "has_keyword()" function; this is used to check
!  * for the presence of a specified keyword with a wihtespace separated
   * list, appearing as an XML property string.
   *
--- 5,13 ----
   *
   * Written by Keith Marshall <kei...@us...>
!  * Copyright (C) 2009, 2010 MinGW Project
   *
   *
   * Implementation of "has_keyword()" function; this is used to check
!  * for the presence of a specified keyword with a whitespace separated
   * list, appearing as an XML property string.
   *
***************
*** 28,32 ****
   */
  #include <ctype.h>
- #include <string.h>
  #include <stdlib.h>
  
--- 28,31 ----
***************
*** 34,97 ****
  #define TRUE   !FALSE
  
! static inline
! char *safe_strdup( const char *src )
! {
!   /* Duplicate a "C" string into dynamically allocated memory,
!    * safely handling a NULL source reference.
!    */
!   return src ? strdup( src ) : NULL;
! }
! 
! int has_keyword( const char *keywords, const char *wanted )
  {
!   /* Check the given "keywords" list for the presence of
!    * the "wanted" keyword.
     */
!   char *inspect;
!   if( (inspect = safe_strdup( keywords )) != NULL )
    {
!     /* We've found a non-empty list of keywords to inspect;
!      * initialise a pointer to the first entry for matching...
       */
!     char *match = inspect;
!     while( *match )
      {
!       /* We haven't yet checked all of the available keywords;
!        * locate the end of the current inspection reference...
!        */
!       char *brk = match;
!       while( *brk && ! isspace( *brk ) )
! 	++brk;
! 
!       /* ...and append a NUL terminator.
         */
!       if( *brk )
! 	*brk++ = '\0';
  
!       /* Check the currently selected alias...
         */
!       if( strcmp( match, wanted ) == 0 )
!       {
! 	/* ...and if it's a match, then immediately release the
! 	 * scratch-pad memory we used for the keyword comparisons,
! 	 * and return "true".
  	 */
- 	free( (void *)(inspect) );
  	return TRUE;
-       }
  
!       /* Otherwise, proceed to check the next keyword, if any.
         */
!       match = brk;
      }
- 
-     /* If we get to here, then all assigned aliases have been
-      * checked, without finding a match; the scratch-pad memory
-      * remains allocated, so release it, before falling through
-      * to return "false".
-      */
-     free( (void *)(inspect) );
    }
!   /* Return "false" in all cases where no matching name can be found.
     */
    return FALSE;
--- 33,84 ----
  #define TRUE   !FALSE
  
! int has_keyword( const char *lookup, const char *in_list )
  {
!   /* Check if the keyword specified by "lookup" is present in
!    * the white-space separated list specified by "in_list".
     */
!   if( (lookup != NULL) && (in_list != NULL) )
    {
!     /* Provided both "lookup" and "in_list" are specified...
       */
!     while( *in_list )
      {
!       /* ...and while we haven't run out of list entries to match...
!        *
!        * Perform a character-by-character comparison between the
!        * "lookup" string and the leading entry in the currently
!        * unchecked section of "in_list"...
         */
!       const char *inspect = lookup;
!       while( *inspect && ! isspace( *in_list ) && (*inspect++ == *in_list++) )
! 	/*
! 	 * ...advancing pointers to both, with no further action,
! 	 * until we find a mismatch.
! 	 */
! 	;
  
!       /* If the mismatch coincides with the terminating NUL for "lookup",
!        * AND we've simultaneously encountered a keyword separator, or the
!        * terminating NUL for "in_list"...
         */
!       if( (*inspect == '\0') && ((*in_list == '\0') || isspace( *in_list )) )
! 	/*
! 	 * ...then we have found a keyword match...
  	 */
  	return TRUE;
  
!       /* Otherwise, we have not yet found a match...
!        * Step over any remaining non-white-space characters in the current
!        * "in_list" entry, and also the following space character if any...
         */
!       while( *in_list && ! isspace( *in_list++ ) )
! 	/*
! 	 * ...until we either exhaust "in_list", or we are ready to cycle
! 	 * back to evaluate the next potentially matching entry.
! 	 */
! 	;
      }
    }
!   /* If we get to here, then there was no match for "lookup" in "in_list"...
     */
    return FALSE;

Update of /cvsroot/mingw/mingw-get
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8578

Modified Files:
	ChangeLog 
Log Message:
Include alias search, when matching component package name.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** ChangeLog	10 Jun 2010 21:32:48 -0000	1.49
--- ChangeLog	24 Jun 2010 20:49:38 -0000	1.50
***************
*** 1,2 ****
--- 1,21 ----
+ 2010-06-24  Keith Marshall  <kei...@us...>
+ 
+ 	Include alias search, when matching component package name.
+ 
+ 	* src/keyword.c (has_keyword): Rearrange argument declarations for
+ 	more natural order; update all callers accordingly.  Simplify; compare
+ 	keyword to be matched with each successive candidate from match-list,
+ 	character-by-character and in-place, so avoiding memory allocation
+ 	for any local duplicate of the passed match-list; thus...
+ 	(safe_strdup): ...this static function no longer required; delete it.
+ 	(string.h): No references remain; do not include it.
+ 
+ 	* src/pkgfind.cpp (pkgXmlNode::FindPackageByName): Augment component
+ 	package name matching to include potential matches of the look-up name
+ 	with trailing component name stripped off, when that matches the class
+ 	name of an identified component package, and the initial substring of
+ 	the look-up name, after stripping, matches any specified alias name
+ 	for the containing package.
+ 
  2010-06-10  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-dist
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv560

Modified Files:
	ChangeLog 
Log Message:
2010-06-16  Chris Sutcliffe  <ir0...@us...>

        * mingw32/mingw32-binutils.xml: Updated for the 2.20.51-1 release.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog	15 Jun 2010 20:06:37 -0000	1.2
--- ChangeLog	17 Jun 2010 22:57:56 -0000	1.3
***************
*** 1,2 ****
--- 1,6 ----
+ 2010-06-16  Chris Sutcliffe  <ir0...@us...>
+ 
+ 	* mingw32/mingw32-binutils.xml: Updated for the 2.20.51-1 release.
+ 
  2010-06-15  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-dist/mingw32
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv560/mingw32

Modified Files:
	mingw32-binutils.xml 
Log Message:
2010-06-16  Chris Sutcliffe  <ir0...@us...>

        * mingw32/mingw32-binutils.xml: Updated for the 2.20.51-1 release.

Index: mingw32-binutils.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/mingw32/mingw32-binutils.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mingw32-binutils.xml	20 May 2010 21:32:21 -0000	1.1
--- mingw32-binutils.xml	17 Jun 2010 22:57:56 -0000	1.2
***************
*** 18,21 ****
--- 18,24 ----
  	</paragraph>
        </description>
+       <release tarname="binutils-2.20.51-1-mingw32-bin.tar.lzma">
+ 	<source tarname="binutils-2.20.51-1-mingw32-src.tar.lzma" />
+       </release>
        <release tarname="binutils-2.20.1-2-mingw32-bin.tar.gz">
  	<source tarname="binutils-2.20.1-src.tar.gz" />

Update of /cvsroot/mingw/mingw-dist
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28849

Modified Files:
	ChangeLog Makefile.comm.in Makefile.in 
Log Message:
Fix Makefile.comm bug reported by Chris Sutcliffe.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.in	4 May 2010 19:32:31 -0000	1.1
--- Makefile.in	15 Jun 2010 20:06:37 -0000	1.2
***************
*** 26,30 ****
  # arising from the use of this software.
  #
! all: @mingw_ac_subdirs@
  
  @mingw_ac_subdirs@: FORCE
--- 26,30 ----
  # arising from the use of this software.
  #
! update all-distfiles: @mingw_ac_subdirs@
  
  @mingw_ac_subdirs@: FORCE

Index: Makefile.comm.in
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/Makefile.comm.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.comm.in	4 May 2010 19:32:31 -0000	1.1
--- Makefile.comm.in	15 Jun 2010 20:06:37 -0000	1.2
***************
*** 42,46 ****
  #
  Makefile.sub: ${srcdir}/*.xml
! 	echo 'auto-distfiles = \\' > $@
  	for file in $^; do echo "$$file.lzma \\" | sed 's,.*/,  ,' >> $@; done
  	echo '  $$(EXTRA_DISTFILES)' >> $@
--- 42,46 ----
  #
  Makefile.sub: ${srcdir}/*.xml
! 	echo "auto-distfiles = \\" > $@
  	for file in $^; do echo "$$file.lzma \\" | sed 's,.*/,  ,' >> $@; done
  	echo '  $$(EXTRA_DISTFILES)' >> $@
***************
*** 50,54 ****
  
  # Distributed manifests are serialised by incorporating a date-stamped
! # issue number, of the form YYMMDDNN; we track issue numbers using the
  # issue.log file, (which we keep in CVS to ensure that all maintainers
  # can share a common issue number registry).
--- 50,54 ----
  
  # Distributed manifests are serialised by incorporating a date-stamped
! # issue number, of the form YYYYMMDDNN; we track issue numbers using the
  # issue.log file, (which we keep in CVS to ensure that all maintainers
  # can share a common issue number registry).
***************
*** 86,90 ****
  	  issue=$$mark || issue=`expr $$issue + 1`; \
  	sed "s/^\($(TAB)*$*.xml:\).*/\1$$issue/" issue.tmp | sort >> issue.new; \
! 	sed "s/@$(serial_number)@/$$issue/" $< | lzma -c > $@
  	sed -n 's/^$(TAB)*$$/break/;1,/^$(TAB)*[^#]/d;/^$(TAB)*#/p' \
  	  $(issue_log) >> issue.new
--- 86,90 ----
  	  issue=$$mark || issue=`expr $$issue + 1`; \
  	sed "s/^\($(TAB)*$*.xml:\).*/\1$$issue/" issue.tmp | sort >> issue.new; \
! 	sed "s/@$(issue_number)@/$$issue/" $< | lzma -c > $@
  	sed -n 's/^$(TAB)*$$/break/;1,/^$(TAB)*[^#]/d;/^$(TAB)*#/p' \
  	  $(issue_log) >> issue.new

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChangeLog	4 May 2010 19:32:31 -0000	1.1
--- ChangeLog	15 Jun 2010 20:06:37 -0000	1.2
***************
*** 1,2 ****
--- 1,13 ----
+ 2010-06-15  Keith Marshall  <kei...@us...>
+ 
+ 	Fix Makefile.comm bug reported by Chris Sutcliffe.
+ 
+ 	* Makefile.in: Itemise standard sub-make goals as top-level defaults.
+ 
+ 	* Makefile.com.in (Makefile.sub): Use double quotes in preference to
+ 	single, to avoid shell portability issue with quoted escapes.
+ 	(serial_number): Replace use of unintentionally undefined macro...
+ 	(issue_number): ...with this defined one.
+ 
  2010-05-04  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-get
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23830

Modified Files:
	ChangeLog Makefile.in configure.ac 
Removed Files:
	install-sh 
Log Message:
Address FIXME relating to identification of distributable files.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/mingw-get/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.in	12 May 2010 18:16:27 -0000	1.16
--- Makefile.in	10 Jun 2010 21:32:48 -0000	1.17
***************
*** 26,29 ****
--- 26,31 ----
  # arising from the use of this software.
  #
+ PACKAGE_SUBSYSTEM = @host_os@
+ 
  srcdir = @srcdir@
  abs_top_srcdir = @abs_top_srcdir@
***************
*** 129,137 ****
  # Packaging and distribution...
  #
- # FIXME: the PACKAGE_DISTVERSION and PACKAGE_ROOTVERSION macro definitions
- # and usage (below) will require modification, (most likely with help from
- # configure), to accommodate inclusion of the `mingw32' subsystem qualifier,
- # when the release status qualifier is dropped from PACKAGE_VERSION.
- #
  LICENCE_FILES = README COPYING
  SRCDIST_FILES = $(LICENCE_FILES) ChangeLog version.c.in \
--- 131,134 ----
***************
*** 140,147 ****
  SRCDIST_SUBDIRS = src src/pkginfo tinyxml xml
  
! PACKAGE_DISTNAME = $(PACKAGE_TARNAME)-$(PACKAGE_DISTVERSION)
! PACKAGE_DISTVERSION = `echo $(PACKAGE_VERSION) | sed 's,-[^0-9],-mingw32&,'`
! PACKAGE_ROOTVERSION = `echo $(PACKAGE_VERSION) | sed 's,-[^0-9].*,,'`
  PACKAGE_DISTROOT = $(PACKAGE_TARNAME)-$(PACKAGE_ROOTVERSION)
  
  dist: srcdist bindist
--- 137,156 ----
  SRCDIST_SUBDIRS = src src/pkginfo tinyxml xml
  
! # The names of distributed pacakge archive files incorporate version
! # information, derived from PACKAGE_VERSION; this is decomposed, so that
! # the PACKAGE_SUBSYSTEM may be interposed between the principal version
! # number and any qualifying suffix, which specifies development status.
! # Additionally, the package maintainer may specify, (at `make dist' time),
! # a SNAPSHOT qualifier; if specified, this will be appended, (literally),
! # to the principal version number component of the package version number,
! # as it appears in the distributed archive file names.
! #
  PACKAGE_DISTROOT = $(PACKAGE_TARNAME)-$(PACKAGE_ROOTVERSION)
+ PACKAGE_ROOTVERSION = `echo $(PACKAGE_VERSION) | sed 's,-[^0-9].*,,'`
+ PACKAGE_DISTVERSION = `echo $(PACKAGE_VERSION)-$(PACKAGE_SUBSYSTEM) | sed \
+   -e 's,-[^0-9],-$(PACKAGE_SUBSYSTEM)&,' \
+   -e 's,\(-$(PACKAGE_SUBSYSTEM).*\)-$(PACKAGE_SUBSYSTEM),\1,' \
+   -e 's,-$(PACKAGE_SUBSYSTEM),$(SNAPSHOT)&,'`
+ PACKAGE_DISTNAME = $(PACKAGE_TARNAME)-$(PACKAGE_DISTVERSION)
  
  dist: srcdist bindist

--- install-sh DELETED ---

Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/mingw-get/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.ac	17 May 2010 20:27:45 -0000	1.7
--- configure.ac	10 Jun 2010 21:32:48 -0000	1.8
***************
*** 33,36 ****
--- 33,50 ----
    AC_PREFIX_DEFAULT([C:/MinGW])
  
+ # We need the canonical representation of the intended host platform
+ # identification triplet, from which to deduce the subsystem designator
+ # in distributed tarball names.  (Note that we explicitly override any
+ # user specified "build_alias", because autoconf gets upset if "host"
+ # is specified without "build", and we need "host" if cross-compiling;
+ # all we need in this case is "host" != "build", and we don't really
+ # care what "build" is, but AC_CANONICAL_HOST gets very upset, when it
+ # calls ${srcdir}/build-aux/config.sub, if the user specifies a short
+ # form which it cannot resolve -- e.g. "--build=linux" will fail).
+ #
+   AC_CONFIG_AUX_DIR([build-aux])
+   build_alias=`${srcdir}/build-aux/config.guess`
+   AC_CANONICAL_HOST
+ 
  # We need both C and C++ compilers; check how to invoke them
  #

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** ChangeLog	17 May 2010 20:27:45 -0000	1.48
--- ChangeLog	10 Jun 2010 21:32:48 -0000	1.49
***************
*** 1,2 ****
--- 1,20 ----
+ 2010-06-10  Keith Marshall  <kei...@us...>
+ 
+ 	Address FIXME relating to identification of distributable files.
+ 
+ 	* install-sh: Move to...
+ 	* build-aux: ...this new directory.
+ 
+ 	* Makefile.in (PACKAGE_DISTVERSION): Modify `sed' edit sequence; make
+ 	it depend on, and ensure that it incorporates the expansion of...
+ 	(PACKAGE_SUBSYSTEM): ...this new macro; defined as substitution of...
+ 	(host_os): ...this autoconf variable, set by...
+ 
+ 	* configure.ac (AC_CANONICAL_HOST): ...this; add it, requiring...
+ 	(AC_CONFIG_AUX_DIR): ...`build-aux' directory reference, providing...
+ 
+ 	* build-aux/config.guess, build-aux/config.sub: ...these new standard
+ 	files; import them from the standard `build-aux' repository.
+ 
  2010-05-17  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/build-aux
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2921

Modified Files:
	ChangeLog 
Added Files:
	install-sh 
Log Message:
Add install-sh script.

--- NEW FILE: install-sh ---
#!/bin/sh
# install - install a program, script, or datafile

scriptversion=2006-12-25.00

# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
#
# Copyright (C) 1994 X Consortium
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the X Consortium shall not
# be used in advertising or otherwise to promote the sale, use or other deal-
# ings in this Software without prior written authorization from the X Consor-
# tium.
#
#
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.

nl='
'
IFS=" ""	$nl"

# set DOITPROG to echo to test this script

# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
if test -z "$doit"; then
  doit_exec=exec
else
  doit_exec=$doit
fi

# Put in absolute file names if you don't have them in your path;
# or use environment vars.

chgrpprog=${CHGRPPROG-chgrp}
chmodprog=${CHMODPROG-chmod}
chownprog=${CHOWNPROG-chown}
cmpprog=${CMPPROG-cmp}
cpprog=${CPPROG-cp}
mkdirprog=${MKDIRPROG-mkdir}
mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}

posix_glob='?'
initialize_posix_glob='
  test "$posix_glob" != "?" || {
    if (set -f) 2>/dev/null; then
      posix_glob=
    else
      posix_glob=:
    fi
  }
'

posix_mkdir=

# Desired mode of installed file.
mode=0755

chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
mvcmd=$mvprog
rmcmd="$rmprog -f"
stripcmd=

src=
dst=
dir_arg=
dst_arg=

copy_on_change=false
no_target_directory=

usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
   or: $0 [OPTION]... SRCFILES... DIRECTORY
   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
   or: $0 [OPTION]... -d DIRECTORIES...

In the 1st form, copy SRCFILE to DSTFILE.
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.

Options:
     --help     display this help and exit.
     --version  display version info and exit.

  -c            (ignored)
  -C            install only if different (preserve the last data modification time)
  -d            create directories instead of installing files.
  -g GROUP      $chgrpprog installed files to GROUP.
  -m MODE       $chmodprog installed files to MODE.
  -o USER       $chownprog installed files to USER.
  -s            $stripprog installed files.
  -t DIRECTORY  install into DIRECTORY.
  -T            report an error if DSTFILE is a directory.

Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
  RMPROG STRIPPROG
"

while test $# -ne 0; do
  case $1 in
    -c) ;;

    -C) copy_on_change=true;;

    -d) dir_arg=true;;

    -g) chgrpcmd="$chgrpprog $2"
	shift;;

    --help) echo "$usage"; exit $?;;

    -m) mode=$2
	case $mode in
	  *' '* | *'	'* | *'
'*	  | *'*'* | *'?'* | *'['*)
	    echo "$0: invalid mode: $mode" >&2
	    exit 1;;
	esac
	shift;;

    -o) chowncmd="$chownprog $2"
	shift;;

    -s) stripcmd=$stripprog;;

    -t) dst_arg=$2
	shift;;

    -T) no_target_directory=true;;

    --version) echo "$0 $scriptversion"; exit $?;;

    --)	shift
	break;;

    -*)	echo "$0: invalid option: $1" >&2
	exit 1;;

    *)  break;;
  esac
  shift
done

if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
    if test -n "$dst_arg"; then
      # $@ is not empty: it contains at least $arg.
      set fnord "$@" "$dst_arg"
      shift # fnord
    fi
    shift # arg
    dst_arg=$arg
  done
fi

if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
  fi
  # It's OK to call `install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
fi

if test -z "$dir_arg"; then
  trap '(exit $?); exit' 1 2 13 15

  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;

    *[0-7])
      if test -z "$stripcmd"; then
	u_plus_rw=
      else
	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
	u_plus_rw=
      else
	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
fi

for src
do
  # Protect names starting with `-'.
  case $src in
    -*) src=./$src;;
  esac

  if test -n "$dir_arg"; then
    dst=$src
    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
  else

    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
    if test ! -f "$src" && test ! -d "$src"; then
      echo "$0: $src does not exist." >&2
      exit 1
    fi

    if test -z "$dst_arg"; then
      echo "$0: no destination specified." >&2
      exit 1
    fi

    dst=$dst_arg
    # Protect names starting with `-'.
    case $dst in
      -*) dst=./$dst;;
    esac

    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
      if test -n "$no_target_directory"; then
	echo "$0: $dst_arg: Is a directory" >&2
	exit 1
      fi
      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
	(dirname "$dst") 2>/dev/null ||
	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
	     X"$dst" : 'X\(//\)[^/]' \| \
	     X"$dst" : 'X\(//\)$' \| \
	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
	echo X"$dst" |
	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
		   s//\1/
		   q
		 }
		 /^X\(\/\/\)[^/].*/{
		   s//\1/
		   q
		 }
		 /^X\(\/\/\)$/{
		   s//\1/
		   q
		 }
		 /^X\(\/\).*/{
		   s//\1/
		   q
		 }
		 s/.*/./; q'
      `

      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi

  obsolete_mkdir_used=false

  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
	# Create intermediate dirs using mode 755 as modified by the umask.
	# This is like FreeBSD 'install' as of 1997-10-28.
	umask=`umask`
	case $stripcmd.$umask in
	  # Optimize common cases.
	  *[2367][2367]) mkdir_umask=$umask;;
	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;

	  *[0-7])
	    mkdir_umask=`expr $umask + 22 \
	      - $umask % 100 % 40 + $umask % 20 \
	      - $umask % 10 % 4 + $umask % 2
	    `;;
	  *) mkdir_umask=$umask,go-w;;
	esac

	# With -d, create the new directory with the user-specified mode.
	# Otherwise, rely on $mkdir_umask.
	if test -n "$dir_arg"; then
	  mkdir_mode=-m$mode
	else
	  mkdir_mode=
	fi

	posix_mkdir=false
	case $umask in
	  *[123567][0-7][0-7])
	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
	    ;;
	  *)
	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0

	    if (umask $mkdir_umask &&
		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
	    then
	      if test -z "$dir_arg" || {
		   # Check for POSIX incompatibilities with -m.
		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
		   # other-writeable bit of parent directory when it shouldn't.
		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
		   case $ls_ld_tmpdir in
		     d????-?r-*) different_mode=700;;
		     d????-?--*) different_mode=755;;
		     *) false;;
		   esac &&
		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
		   }
		 }
	      then posix_mkdir=:
	      fi
	      rmdir "$tmpdir/d" "$tmpdir"
	    else
	      # Remove any dirs left behind by ancient mkdir implementations.
	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
	    fi
	    trap '' 0;;
	esac;;
    esac

    if
      $posix_mkdir && (
	umask $mkdir_umask &&
	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else

      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.

      case $dstdir in
	/*) prefix='/';;
	-*) prefix='./';;
	*)  prefix='';;
      esac

      eval "$initialize_posix_glob"

      oIFS=$IFS
      IFS=/
      $posix_glob set -f
      set fnord $dstdir
      shift
      $posix_glob set +f
      IFS=$oIFS

      prefixes=

      for d
      do
	test -z "$d" && continue

	prefix=$prefix$d
	if test -d "$prefix"; then
	  prefixes=
	else
	  if $posix_mkdir; then
	    (umask=$mkdir_umask &&
	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
	    # Don't fail if two instances are running concurrently.
	    test -d "$prefix" || exit 1
	  else
	    case $prefix in
	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
	      *) qprefix=$prefix;;
	    esac
	    prefixes="$prefixes '$qprefix'"
	  fi
	fi
	prefix=$prefix/
      done

      if test -n "$prefixes"; then
	# Don't fail if two instances are running concurrently.
	(umask $mkdir_umask &&
	 eval "\$doit_exec \$mkdirprog $prefixes") ||
	  test -d "$dstdir" || exit 1
	obsolete_mkdir_used=true
      fi
    fi
  fi

  if test -n "$dir_arg"; then
    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
  else

    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
    rmtmp=$dstdir/_rm.$$_

    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0

    # Copy the file name to the temp name.
    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&

    # and set any options; do chmod last to preserve setuid bits.
    #
    # If any of these fail, we abort the whole thing.  If we want to
    # ignore errors from any of these, just make sure not to ignore
    # errors from the above "$doit $cpprog $src $dsttmp" command.
    #
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&

    # If -C, don't bother to copy if it wouldn't change the file.
    if $copy_on_change &&
       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&

       eval "$initialize_posix_glob" &&
       $posix_glob set -f &&
       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
       $posix_glob set +f &&

       test "$old" = "$new" &&
       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
      rm -f "$dsttmp"
    else
      # Rename the file to the real destination.
      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||

      # The rename failed, perhaps because mv can't rename something else
      # to itself, or perhaps because mv is so ancient that it does not
      # support -f.
      {
	# Now remove or move aside any old file at destination location.
	# We try this two ways since rm can't unlink itself on some
	# systems and the destination file might be busy for other
	# reasons.  In this case, the final cleanup might fail but the new
	# file should still install successfully.
	{
	  test ! -f "$dst" ||
	  $doit $rmcmd -f "$dst" 2>/dev/null ||
	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
	  } ||
	  { echo "$0: cannot unlink or rename $dst" >&2
	    (exit 1); exit 1
	  }
	} &&

	# Now rename the file to the real destination.
	$doit $mvcmd "$dsttmp" "$dst"
      }
    fi || exit 1

    trap '' 0
  fi
done

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/build-aux/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog	18 May 2010 20:41:17 -0000	1.2
--- ChangeLog	9 Jun 2010 20:08:58 -0000	1.3
***************
*** 1,2 ****
--- 1,8 ----
+ 2010-06-09  Keith Marshall  <kei...@us...>
+ 
+ 	Add install-sh script.
+ 
+ 	* install-sh: New file; copy it from autoconf-2.63 sources.
+ 
  2010-05-18  Keith Marshall  <kei...@us...>