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

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv17611

Modified Files:
	ChangeLog 
Log Message:
2011-11-27  Chris Sutcliffe  <ir0...@us...>

        Correct versioning issue with msys-mksh contributed package.

        * msys/issue.log: Update for msys-mksh.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** ChangeLog	26 Nov 2011 03:04:46 -0000	1.114
--- ChangeLog	27 Nov 2011 15:08:03 -0000	1.115
***************
*** 1,3 ****
! 2011-11-17  Chris Sutcliffe  <ir0...@us...>
  
  	Update msys-mksh contributed package.
--- 1,9 ----
! 2011-11-27  Chris Sutcliffe  <ir0...@us...>
! 
! 	Correct versioning issue with msys-mksh contributed package.
! 
! 	* msys/issue.log: Update for msys-mksh.
! 
! 2011-11-25  Chris Sutcliffe  <ir0...@us...>
  
  	Update msys-mksh contributed package.

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv21713

Modified Files:
	ChangeLog 
Log Message:
2011-11-17  Chris Sutcliffe  <ir0...@us...>

        Update msys-mksh contributed package.

        * msys/issue.log: Update for msys-mksh.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** ChangeLog	18 Nov 2011 03:11:26 -0000	1.113
--- ChangeLog	26 Nov 2011 03:04:46 -0000	1.114
***************
*** 1,4 ****
--- 1,10 ----
  2011-11-17  Chris Sutcliffe  <ir0...@us...>
  
+ 	Update msys-mksh contributed package.
+ 
+ 	* msys/issue.log: Update for msys-mksh.
+ 
+ 2011-11-17  Chris Sutcliffe  <ir0...@us...>
+ 
  	Adopt msys-mksh as a contributed package.
  

Update of /cvsroot/mingw/mingw-get/src
In directory vz-cvs-4.sog:/tmp/cvs-serv3650/src

Modified Files:
	dmh.h 
Log Message:
Avoid implicit cast warnings; reported by Robert Hartmann.

Index: dmh.h
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/dmh.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dmh.h	5 Jan 2011 21:56:42 -0000	1.3
--- dmh.h	24 Nov 2011 21:50:46 -0000	1.4
***************
*** 61,66 ****
  EXTERN_C int dmh_printf( const char *fmt, ... );
  
! #define DMH_BEGIN_DIGEST  0x0001U, ~0x0001U
! #define DMH_END_DIGEST    0x0100U,  0x0000U
  
  EXTERN_C uint16_t dmh_control( const uint16_t, const uint16_t );
--- 61,66 ----
  EXTERN_C int dmh_printf( const char *fmt, ... );
  
! #define DMH_BEGIN_DIGEST  (uint16_t)(0x0001U), ~(uint16_t)(0x0001U)
! #define DMH_END_DIGEST    (uint16_t)(0x0100U),  (uint16_t)(0x0000U)
  
  EXTERN_C uint16_t dmh_control( const uint16_t, const uint16_t );

Update of /cvsroot/mingw/mingw-get-inst
In directory vz-cvs-4.sog:/tmp/cvs-serv30614

Modified Files:
	ChangeLog RELEASE_NOTES.txt mingw-get-inst.iss 
Added Files:
	Makefile cleanfile.c tee.c 
Log Message:
20111118 release

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get-inst/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog	3 Aug 2011 04:02:07 -0000	1.9
--- ChangeLog	18 Nov 2011 18:13:27 -0000	1.10
***************
*** 1,2 ****
--- 1,32 ----
+ 2011-08-18  Charles Wilson  <...>
+ 
+ 	20111118 release
+ 	* Makefile: New file.
+ 	* tee.c: New file.
+ 	* cleanfile.c: New file.
+ 	* mingw-get-inst.iss: Use mingw-get-0.4-alpha-1. Update
+ 	catalogue snapshot date.
+ 	[Files]: Add new helper applications tee and cleanfile.
+ 	[Dirs]: New section; add {app}\var\log.
+ 	[CustomMessages]: New section; add entry for showing log file.
+ 	[Run]: Don't run mingw-get here; do so from [Code]. Add new
+ 	postinstall entry for showing logfile.
+ 	(CreateTheWizardPages): Make C Compiler optional.
+ 	(GetMinGWGetArgs): Change signature, as no longer called from [Run].
+ 	Ripple from no longer requiring C Compiler to be checked: any other
+ 	compiler selected must now ensure 'base' is installed (but only want
+ 	'base' to appear once in args).
+ 	(DoExecMingwGet): New function launches mingw-get with specified
+ 	arguments, logs output via new tee utility, and handles any errors.
+ 	(DoCleanLog): New function 'cleans up' log file by launching new
+ 	cleanfile utility, and handles any errors.
+ 	(DoPostInstall): Invoke mingw-get here via DoExecMingwGet rather than
+ 	from [Run].  (Do so once or twice, depending on whether catalogue
+ 	update is selected). Then, clean up the log file via DoCleanLog before
+ 	establishing any /etc/fstab entries.
+ 	(CurStepChanged): Reverse order of variable equality comparison,
+ 	following Pascal convention.
+ 	* RELEASE_NOTES.txt: Document changes.
+ 
  2011-08-02  Charles Wilson  <...>
  

--- NEW FILE: tee.c ---
/*******************************************************************************
* tee.c
*	Splits standard input stream to standard output stream and
*	one or more output files.
*
* Notice
*	Copyright ©1985-2006 by David R Tribble, all rights reserved.
*
*       [csw: Website http://david.tribble.com/programs.html says
*             "Distribution and use is free and unlimited unless
*             otherwise noted."  As there is no contrary statement
*             concerning tee, I'm assuming this usage release applies.
*             No changes, other than this comment, have been made to
*             the source code. Recompiled using MinGW:
*                gcc -static -static-libgcc -o tee.exe tee.c
*                strip tee.exe
*       ]
*
* History
*	1.4 2006-06-26 drt.
*	Added command line options '-a', '-n'.
*/


/* Identification */

static const char	PROG[] =	"tee";
static const char	VERS[] =	"1.4";
static const char	DATE[] =	"2006-06-26";
static const char	AUTH[] =	"David R Tribble";

static const char	REV[] =
    "@(#)drt/src/cmd/tee.c $Revision: 1.1 $$Date: 2011/11/18 18:13:27 $";
static const char	BUILT[] =
    "@(#)" "Built: " __DATE__ " " __TIME__;

static const char	COPYRIGHT[] =
    "@(#)Copyright ©1985-2006 by David R Tribble, all rights reserved.";


/* System includes */

#include <iso646.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

#include <fcntl.h>

#if _WIN32
 #include <io.h>
#endif


/* Local manifest constants */

typedef int		bool;

#define false		0
#define true		1

#define MAXFILE		300		/* Maximum output files		*/


/* Local variables */

static bool	opt_nlflush =	false;	/* Flush after newlines		*/
static bool	opt_append =	false;	/* Append to output files	*/


/*******************************************************************************
* tee()
*	Split stdin input stream into stdout stream and one or more
*	output files.
*
* History
*	1.0 1985-04-15 drt.
*	First revision.
*
*	1.1 1987-10-15 drt.
*	File modes are now binary.
*
*	1.4 2006-06-26 drt.
*	Added 'opt_nlflush' and 'opt_append' flags.
*/

void tee(int numfiles, char *filename[])
{
    const char *	mode;		/* Output file mode		*/
    FILE *		fp[MAXFILE];	/* Output file pointers		*/
    int			i;		/* File counter			*/

    /* Open the output files */
    mode = "wb";
    if (opt_append)
        mode = "ab";

    for (i = 0;  i < numfiles  and  i < MAXFILE;  ++i)
    {
        fp[i] = fopen(filename[i], mode);
        if (fp[i] == NULL)
            fprintf(stderr, "%s: Can't write: %s\n",
                PROG, filename[i]);
    }

    /* Split the input to several output files */
    for (;;)
    {
        int	c;		/* Input/output char			*/

        c = getchar();
        if (c == EOF)
            break;

        /* Send char to output files */
        for (i = 0;  i < numfiles  and  i < MAXFILE;  ++i)
            if (fp[i] != NULL)
                putc(c, fp[i]);

        /* Send char to stdout */
        putchar(c);

        /* Handle flushing after newlines */
        if (c == '\n'  and  opt_nlflush)
        {
            /* Flush output files */
            for (i = 0;  i < numfiles  and  i < MAXFILE;  ++i)
                if (fp[i] != NULL)
                    fflush(fp[i]);

            /* Flush stdout */
            fflush(stdout);
        }
    }

    /* Close the files */
    for (i = 0;  i < numfiles  and  i < MAXFILE;  ++i)
    {
        if (fp[i] == NULL)
            fclose(fp[i]);
    }

    fflush(stdout);
}


/*******************************************************************************
* main()
*
* History
*	1.0 1985-04-15 drt.
*	First revision.
*
*	1.1 1987-10-15 drt.
*	File modes are now binary.
*
*	1.2 1988-01-11 drt.
*	Uses setvbuf() for stdin.
*
*	1.4 2006-06-26 drt.
*	Added command line options '-a', '-n'.
*/

int main(int argc, char *argv[])
{
    char	invbuf[10*1024];	/* Stdin buffer			*/

    /* Parser command line options */
    while (argc > 1  and  argv[1][0] == '-')
    {
        if (strcmp(argv[1], "-a") == 0)
            opt_append = true;
        else if (strcmp(argv[1], "-n") == 0)
            opt_nlflush = true;
        else
            goto usage;

        argc--, argv++;
    }

    /* Check command line args */
    if (argc < 2  or  isatty(fileno(stdin)))
        goto usage;

#ifdef O_BINARY
    /* Open stdin in binary mode */
    if (setmode(fileno(stdin), O_BINARY) == -1)
    {
        fprintf(stderr, "%s: Can't set mode on standard input\n",
            PROG);
        return EXIT_FAILURE;
    }
#endif
    setvbuf(stdin, invbuf, _IOFBF, sizeof invbuf);

#ifdef O_BINARY
    /* Open stdout in binary mode */
    if (setmode(fileno(stdout), O_BINARY) == -1)
    {
        fprintf(stderr, "%s: Can't set mode on standard output\n",
            PROG);
        return EXIT_FAILURE;
    }
#endif

    /* Split output into one or more file streams */
    tee(argc-1, argv+1);
    return EXIT_SUCCESS;

usage:
    /* Display a usage message */
    printf("[%s %s, %s %s]\n\n",
        PROG, VERS, AUTH, DATE);
    printf("Split output into two or more streams.\n\n");

    printf("usage:  %s [-option...] file... <input\n\n", PROG);
    printf("Options:\n");
    printf("    -a      Append output to the file(s).\n");
    printf("    -n      Flush output after newlines.\n");

    return EXIT_FAILURE;
}

/* End tee.c */

--- NEW FILE: Makefile ---
# This is a really dumb makefile. Eventually
# it should be autoconf'ed. However, we support
# only host=mingw, so all we require is that CC
# be set appropriately.

CC = gcc
EXE_EXT = .exe
O = o

all: tee$(EXE_EXT) cleanfile$(EXE_EXT)

tee$(EXE_EXT): tee.$(O)
	$(CC) -s -static -static-libgcc -o $@ $^

cleanfile$(EXE_EXT): cleanfile.$(O)
	$(CC) -s -static -static-libgcc -o $@ $^

.PHONY: srcdist
srcdist:
	-rm -rf srcdir/mingw-get-inst
	mkdir -p srcdir/mingw-get-inst && \
	for f in Makefile RELEASE_NOTES.txt mingw-get-inst.iss \
		tee.c cleanfile.c msys.ico ChangeLog ; do \
		cp $$f srcdir/mingw-get-inst/ ;\
	done && \
	(cd srcdir && tar -cJf ../mingw-get-inst-src.tar.xz mingw-get-inst)

.PHONY: clean
clean:
	-rm -f tee$(EXE_EXT) cleanfile$(EXE_EXT) *.$(O)

Index: RELEASE_NOTES.txt
===================================================================
RCS file: /cvsroot/mingw/mingw-get-inst/RELEASE_NOTES.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RELEASE_NOTES.txt	3 Aug 2011 04:02:07 -0000	1.6
--- RELEASE_NOTES.txt	18 Nov 2011 18:13:27 -0000	1.7
***************
*** 8,12 ****
  
     MinGW Compiler Suite
!       C Compiler             always installed
        C++ Compiler           optional
        Fortran Compiler       optional
--- 8,12 ----
  
     MinGW Compiler Suite
!       C Compiler             optional (*)
        C++ Compiler           optional
        Fortran Compiler       optional
***************
*** 15,18 ****
--- 15,21 ----
     MinGW Developer Toolkit   optional
  
+ (*) Note that if any component of the compiler suite is selected, then
+     the C Compiler component is also installed, whether selected or not.
+ 
  After the GUI phase of the installation is complete, mingw-get will be
  invoked to download and install all of the selected components.
***************
*** 28,32 ****
  The 'update' command updates the local copy of the package information
  database.  This version of mingw-get-inst ships with a snapshot of that
! database, from 2011 Aug 02. (During the GUI phase of the installation, you
  will be given the option of automatically updating the database to the
  latest version, or using the pre-packaged snapshot).
--- 31,35 ----
  The 'update' command updates the local copy of the package information
  database.  This version of mingw-get-inst ships with a snapshot of that
! database, from 2011 Nov 18. (During the GUI phase of the installation, you
  will be given the option of automatically updating the database to the
  latest version, or using the pre-packaged snapshot).
***************
*** 42,45 ****
--- 45,65 ----
  Changes
  ==========
+ 20111118:
+ 	* Ship with mingw-get-0.4-alpha-1. This release fixes a critical
+ 	  bug in the upgrade code, whereby an existing DLL could be replaced
+ 	  by an alternative with an incompatible ABI version, where the
+ 	  correct action is to install both concurrently. It also adds
+ 	  several new features, including anonymous upgrade, the 'source'
+ 	  and 'license' actions; and the new --print-uris, --download-only,
+ 	  and --all-related options. For more information on these new
+ 	  features, see the NEWS items listed here:
+ 	  http://sourceforge.net/projects/mingw/files/Installer/mingw-get/mingw-get-0.4-alpha-1/
+ 	* mingw-get-inst now allows to install MSYS alone, without
+ 	  automatically installing the MinGW C compiler.
+ 	* mingw-get-inst now logs the output of mingw-get. The log is
+ 	  stored in <top>/var/log/mingw-get-log.txt, and may optionally
+ 	  be displayed when mingw-get-inst is finished.
+ 	* Update catalogue to 2011-11-17.
+ 
  20110802:
  	* Ship with mingw-get-0.3-alpha-2.1.  This bugfix release corrects

Index: mingw-get-inst.iss
===================================================================
RCS file: /cvsroot/mingw/mingw-get-inst/mingw-get-inst.iss,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mingw-get-inst.iss	3 Aug 2011 04:02:07 -0000	1.8
--- mingw-get-inst.iss	18 Nov 2011 18:13:27 -0000	1.9
***************
*** 27,34 ****
  ; the _inst subdirectory of the directory in which this file is located.
  ;
! ;   $ V=0.3-mingw32-alpha-2.1
  ;   $ S=http://downloads.sourceforge.net/mingw
  ;   $ rm -rf _inst && mkdir _inst
! ;   $ for f in mingw-get-$V-bin.tar.gz mingw-get-$V-lic.tar.gz pkginfo-$V-bin.tar.gz; do
  ;       wget --no-check-certificate $S/$f
  ;       tar -C _inst -xf $f
--- 27,34 ----
  ; the _inst subdirectory of the directory in which this file is located.
  ;
! ;   $ V=0.4-mingw32-alpha-1
  ;   $ S=http://downloads.sourceforge.net/mingw
  ;   $ rm -rf _inst && mkdir _inst
! ;   $ for f in mingw-get-$V-bin.tar.xz mingw-get-$V-lic.tar.xz pkginfo-$V-bin.tar.xz; do
  ;       wget --no-check-certificate $S/$f
  ;       tar -C _inst -xf $f
***************
*** 61,68 ****
  
  #define MyAppName "MinGW-Get"
! #define MyAppVersion "0.3-alpha-2.1"
  #define MyAppPublisher "MinGW"
  #define MyAppURL "http://www.mingw.org/"
! #define MyCatalogueSnapshotDate "20110802"
  
  [Setup]
--- 61,70 ----
  
  #define MyAppName "MinGW-Get"
! #define MyAppVersion "0.4-alpha-1"
  #define MyAppPublisher "MinGW"
  #define MyAppURL "http://www.mingw.org/"
! #define MyCatalogueSnapshotDate "20111118"
! #define MyInitLogPath "\var\log\mingw-get-log.orig.txt"
! #define MyLogPath "\var\log\mingw-get-log.txt"
  
  [Setup]
***************
*** 95,98 ****
--- 97,108 ----
  Source: _inst\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs
  ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+ Source: tee.exe; DestDir: {app}\libexec\mingw-get; Flags: ignoreversion
+ Source: cleanfile.exe; DestDir: {app}\libexec\mingw-get; Flags: ignoreversion
+ 
+ [Dirs]
+ Name: {app}\var\log;
+ 
+ [CustomMessages]
+ LaunchProgram=Display mingw-get log (%1)
  
  [Icons]
***************
*** 102,107 ****
  
  [Run]
! Filename: {app}\bin\mingw-get.exe; Parameters: update; Check: CheckUpdateCatalogues
! Filename: {app}\bin\mingw-get.exe; Parameters: {code:GetMinGWGetArgs}
  
  [Code]
--- 112,116 ----
  
  [Run]
! Filename: {app}{#MyLogPath}; Description: {cm:LaunchProgram,{app}{#MyLogPath}}; Flags: shellexec skipifdoesntexist postinstall skipifsilent nowait
  
  [Code]
***************
*** 143,147 ****
    CheckListBox.Parent := Page.Surface;
    CheckListBox.AddCheckBox('MinGW Compiler Suite', '', 0, True, True, True, False, nil);
!   C_Index :=    CheckListBox.AddCheckBox('C Compiler',       '', 1, True,  False, False, False, nil);
    CXX_Index :=  CheckListBox.AddCheckBox('C++ Compiler',     '', 1, False, True,  False, True, nil);
  
--- 152,156 ----
    CheckListBox.Parent := Page.Surface;
    CheckListBox.AddCheckBox('MinGW Compiler Suite', '', 0, True, True, True, False, nil);
!   C_Index :=    CheckListBox.AddCheckBox('C Compiler',       '', 1, True,  True,  False, True, nil);
    CXX_Index :=  CheckListBox.AddCheckBox('C++ Compiler',     '', 1, False, True,  False, True, nil);
  
***************
*** 210,250 ****
  end;
  
! function GetMinGWGetArgs(Param: String): String;
  var
    args: String;
  begin
    { Return the selected DataDir }
!   args := 'install mingw-get pkginfo base ';
  
!   { Don't need to do this, because 'base' takes care of it }
!   { if CheckListBox.Checked[C_Index] then begin }
!   {   args := args +  'gcc-core '; }
!   { end }
  
    if CheckListBox.Checked[CXX_Index] then begin
!     args := args +  'gcc-g++ ';
    end;
  
    { FIXME: no java package at present }
    { if CheckListBox.Checked[Java_Index] then begin }
!   {   args := args +  'gcc-java '; }
!   { end }
  
    if CheckListBox.Checked[F_Index] then begin
!     args := args +  'gcc-fortran ';
    end;
    if CheckListBox.Checked[ObjC_Index] then begin
!     args := args +  'gcc-objc ';
    end;
    { FIXME: Ada package temporarily removed }
    { if CheckListBox.Checked[Ada_Index] then begin }
!   {  args := args +  'gcc-ada '; }
    { end; }
    if CheckListBox.Checked[Msys_Index] then begin
!     args := args +  'msys-base ';
    end;
    if CheckListBox.Checked[MinGW_DTK_Index] then begin
      args := args +  'mingw-dtk ';
    end;
    Result := args;
  end;
--- 219,283 ----
  end;
  
! function GetMinGWGetArgs(): String;
  var
    args: String;
  begin
    { Return the selected DataDir }
!   args := 'install mingw-get pkginfo ';
  
!   if CheckListBox.Checked[C_Index] then begin
!      args := args + 'base gcc-core ';
!   end;
  
    if CheckListBox.Checked[CXX_Index] then begin
!     if (Pos(' base ', args) <= 0) then begin
!       args := args + 'base gcc-g++ ';
!     end else begin
!       args := args + 'gcc-g++ ';
!     end;
    end;
  
    { FIXME: no java package at present }
    { if CheckListBox.Checked[Java_Index] then begin }
!   {   if (Pos(' base ', args) <= 0) then begin }
!   {     args := args + 'base gcc-java '; }
!   {   end else begin }
!   {    args := args + 'gcc-java '; }
!   {   end; }
!   { end; }
  
    if CheckListBox.Checked[F_Index] then begin
!     if (Pos(' base ', args) <= 0) then begin
!       args := args + 'base gcc-fortran ';
!     end else begin
!       args := args + 'gcc-fortran ';
!     end;
    end;
+   
    if CheckListBox.Checked[ObjC_Index] then begin
!     if (Pos(' base ', args) <= 0) then begin
!       args := args + 'base gcc-objc ';
!     end else begin
!       args := args + 'gcc-objc ';
!     end;
    end;
+   
    { FIXME: Ada package temporarily removed }
    { if CheckListBox.Checked[Ada_Index] then begin }
!   {   if (Pos(' base ', args) <= 0) then begin }
!   {     args := args + 'base gcc-ada '; }
!   {   end else begin }
!   {    args := args + 'gcc-ada '; }
!   {   end; }
    { end; }
+   
    if CheckListBox.Checked[Msys_Index] then begin
!     args := args + 'msys-base ';
    end;
+   
    if CheckListBox.Checked[MinGW_DTK_Index] then begin
      args := args +  'mingw-dtk ';
    end;
+   
    Result := args;
  end;
***************
*** 317,321 ****
  end;
  
! procedure DoPostInstall();
  var
    fstabFileName: String;
--- 350,416 ----
  end;
  
! function DoExecMingwGet(Args: String; Append: Boolean): Integer;
! var
!   WorkingDir:   String;
!   ReturnCode:   Integer;
!   LogFileName:  String;
!   TeeUtility:   String;
!   FullCmd:      String;
! begin
!   WorkingDir := ExpandConstant ('{app}\bin');
!   LogFileName := ExpandConstant ('{app}{#MyInitLogPath}');
!   TeeUtility := ExpandConstant ('{app}\libexec\mingw-get\tee.exe');
!   
!   FullCmd := ' /c mingw-get.exe ' + Args + ' 2>&1 | "' + TeeUtility + '"';
!   if (Append) then begin
!     FullCmd := FullCmd + ' -a "' + LogFileName + '"';
!   end else begin
!     FullCmd := FullCmd + ' "' + LogFileName + '"';
!   end;
!   
!   Log(ExpandConstant ('{%COMSPEC|cmd.exe}') + FullCmd);
!   if (not Exec (ExpandConstant ('{%COMSPEC|cmd.exe}'), FullCmd,
!             WorkingDir, SW_SHOW, ewWaitUntilTerminated, ReturnCode)) then
!   begin
!     {failed to even launch the command}
!     MsgBox(SysErrorMessage(ReturnCode), mbError, MB_OK);
!   end else if (ReturnCode <> 0) then
!   begin
!     MsgBox('Encountered an error executing mingw-get (' +
!       IntToStr(ReturnCode) + ')', mbError, MB_OK);
!   end;
!   Result := ReturnCode;
! end;
! 
! procedure DoCleanLog();
! var
!   WorkingDir:        String;
!   InitLogFileName:   String;
!   FinalLogFileName:  String;
!   CleanUtility:      String;
!   FullCmd:           String;
!   ReturnCode:        Integer;
! begin
!   WorkingDir := ExpandConstant ('{app}\libexec\mingw-get');
!   InitLogFileName := ExpandConstant ('{app}{#MyInitLogPath}');
!   FinalLogFileName := ExpandConstant ('{app}{#MyLogPath}');
!   CleanUtility := ExpandConstant ('{app}\libexec\mingw-get\cleanfile.exe');
!   
!   FullCmd := ' "' + InitLogFileName + '" "' + FinalLogFileName + '"';
!   
!   Log(CleanUtility + FullCmd);
!   if (not Exec (CleanUtility, FullCmd, WorkingDir, SW_SHOW,
!                 ewWaitUntilTerminated, ReturnCode)) then
!   begin
!     {failed to even launch the command}
!     MsgBox(SysErrorMessage(ReturnCode), mbError, MB_OK);
!   end else if (ReturnCode <> 0) then
!   begin
!     MsgBox('Encountered an error cleaning log file (' +
!       IntToStr(ReturnCode) + ')', mbError, MB_OK);
!   end;
! end;
! 
! procedure DoFstabEntries();
  var
    fstabFileName: String;
***************
*** 330,338 ****
  end;
  
  procedure CurStepChanged(CurStep: TSetupStep);
  begin
!   if CurStep = ssPostInstall then
    begin
      DoPostInstall();
    end;
  end;
--- 425,453 ----
  end;
  
+ procedure DoPostInstall();
+ var
+   ReturnCode1:   Integer;
+   ReturnCode2:   Integer;
+ begin
+   ReturnCode1 := 0;
+   ReturnCode2 := 0;
+   if CheckUpdateCatalogues() then
+   begin
+     ReturnCode1 := DoExecMingwGet('update',False);
+     ReturnCode2 := DoExecMingwGet(GetMinGWGetArgs(),True);
+   end else begin
+     ReturnCode1 := DoExecMingwGet(GetMinGWGetArgs(),False);
+   end;
+   { should actually DO something with ReturnCodes here }
+   DoCleanLog();
+   DoFstabEntries();
+ end;
+ 
  procedure CurStepChanged(CurStep: TSetupStep);
  begin
!   if (ssPostInstall = CurStep) then
    begin
      DoPostInstall();
    end;
  end;
+ 

--- NEW FILE: cleanfile.c ---
/**
 * cleanlog.c -- cleans text files with embedded control characters
 *    Currently only handles "CR" used for terminal updates:
 *      file-downloading  |=====                   |  15%^M
 *      file-downloading  |======                  |  17%^M
 *      ...
 *      file-downloading  |========================| 100%^M^J
 *    is transformed by retaining only the last "line", just
 *    as it would appear on a terminal, where each CR (^M)
 *    without a LF (^J) would cause the preceeding "line" to
 *    be overwritten.
 *
 * Copyright 2011 by Charles Wilson
 * All rights reserved.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 * See the COPYING file for full license information.
 */

#include <stdlib.h>
#include <stdio.h>
#include <getopt.h>
#include <string.h>
#include <errno.h>

#if defined(__WIN32__) && !defined(__CYGWIN__)
# include <io.h>
# include <conio.h>
#endif

static void usage (FILE * f, char *name);
static int  cleanfile (FILE * in, FILE * out);

static char *program_name;

int
main (int argc, char **argv)
{
  int rc;
  int ec = 0;
  int c;
  FILE * in = stdin;
  FILE * out = stdout;

  if ((program_name = strdup (argv[0])) == NULL)
    {
      fprintf (stderr, "%s: memory allocation error\n", argv[0]);
      exit (1);
    }

  opterr = 0;
  while ((c = getopt (argc, argv, "h")) != -1)
    switch (c)
      {
      case 'h':
        usage (stdout, program_name);
        ec = 0;
        goto finish;
      case '?':
        if (isprint (optopt))
          fprintf (stderr, "Unknown option `-%c'.\n", optopt);
        else
          fprintf (stderr,
                   "Unknown option character `\\x%x'.\n",
                   optopt);
        ec = 2;
        goto finish;
      default:
        fprintf (stderr, "Internal error processing options\n");
        ec = 2;
        goto finish;
      }

  if (optind < argc - 2)
    {
      fprintf (stderr, "Too many arguments.\n");
      usage (stderr, program_name);
      ec = 2;
      goto finish;
    }
  if (optind < argc - 1)
    {
      if (strcmp (argv[optind], argv[optind+1]) == 0)
        {
          fprintf (stderr,
                   "Can't use same file %s as both input and output\n",
                   argv[optind]);
          ec = 1;
          goto finish;
        }
      out = fopen (argv[optind+1], "wb");
      if (out == NULL)
        {
          int serrno = errno;
          fprintf (stderr, "Can't open output file %s (%s)\n",
                   argv[optind+1], strerror(serrno));
          ec = 1;
          goto finish;
        }
    }
  if (optind < argc)
    {
      in = fopen (argv[optind], "rb");
      if (in == NULL)
        {
          int serrno = errno;
          fprintf (stderr, "Can't open input file %s (%s)\n",
                   argv[optind], strerror(serrno));
          ec = 1;
          goto finish;
        }
    }

  ec = cleanfile (in, out);

finish:
  free (program_name);
  if (out && out != stdout) fclose (out);
  if (in  && in  != stdin)  fclose (in);
  return (ec);
}

static void
usage (FILE * f, char *name)
{
  fprintf (f, "%s [-h] [inputfile [outputfile]]\n", name);
}

#define MAX_LINE 1024
static int
cleanfile (FILE * in, FILE * out)
{
  char linebuf[MAX_LINE];
  int pos = 0;
  int gotCR = 0;
  int ec = 0;
  int c;
  while (1)
    {
      c = getc (in);
      if (c == EOF)
        {
          if (pos > 0)
            {
              if (fwrite (linebuf, sizeof (char), pos, out) != pos)
                {
                  fprintf (stderr, "Error writing output\n");
                  ec = 3;
                }
            }
          break;
        }
      if (c == '\r')
        {
          gotCR = 1;
          linebuf[pos++] = c;
        }
      else if (c == '\n')
        {
          linebuf[pos++] = c;
          if (fwrite (linebuf, sizeof (char), pos, out) != pos)
            {
              fprintf (stderr, "Error writing output\n");
              ec = 3;
            }
          pos = 0;
          gotCR = 0;
        }
      else
        {
          if (gotCR)
            {
              pos = 0;
              gotCR = 0;
            }
          linebuf[pos++] = c;
        }
      if (pos == MAX_LINE)
        {
          /* line too long; just write what we have */
          if (fwrite (linebuf, sizeof (char), pos, out) != pos)
            {
              fprintf (stderr, "Error writing output\n");
              ec = 4;
            }
          pos = 0;
          gotCR = 0;
          fprintf (stderr, "Line too long...continuing\n");
        }
    }
    return ec;
}

Update of /cvsroot/mingw/mingw-dist/msys
In directory vz-cvs-4.sog:/tmp/cvs-serv9556/msys

Modified Files:
	msys-package-list.xml issue.log 
Log Message:
2011-11-17  Chris Sutcliffe  <ir0...@us...>

        Adopt msys-mksh as a contributed package.

        * msys/msys-package-list.xml: Add msys-mksh.xml hook.
        * msys/issue.log: Update accordingly.

Index: msys-package-list.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-package-list.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** msys-package-list.xml	26 Aug 2011 16:07:26 -0000	1.16
--- msys-package-list.xml	18 Nov 2011 03:11:27 -0000	1.17
***************
*** 81,84 ****
--- 81,87 ----
    <package-list catalogue="msys-zlib" />
  
+   <!-- "real" packages ~~ user contributed -->
+   <package-list catalogue="msys-mksh" />
+ 
    <!-- "virtual" packages -->
    <package-list catalogue="msys-base" />

Index: issue.log
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/issue.log,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** issue.log	17 Nov 2011 03:55:43 -0000	1.45
--- issue.log	18 Nov 2011 03:11:27 -0000	1.46
***************
*** 69,76 ****
    83461b0df222247284893defdeab8179f1f45ab1 2011101100 msys-minires.xml
    f79d4485d3e51d5cf03964c44da576c483c7770c 2011101100 msys-mintty.xml
    d6919edb030a8a129da743f1c05756d99f5b6c81 2011101100 msys-mktemp.xml
    6ffc1c28147bd62d234f71070d53f9cb99a2cfe0 2011101100 msys-openssh.xml
    148f363053f2c38739fe30ccd980afc40e2d9b8b 2011101100 msys-openssl.xml
!   3b32fd408512138a48e3c2e18de8ef8c153dd97d 2011082600 msys-package-list.xml
    667afd4295b0aab7eef5682de27d2bfc6d80b03f 2011101100 msys-patch.xml
    1c2617eb65b17b242641af116b294523987dc32e 2011101100 msys-perl.xml
--- 69,77 ----
    83461b0df222247284893defdeab8179f1f45ab1 2011101100 msys-minires.xml
    f79d4485d3e51d5cf03964c44da576c483c7770c 2011101100 msys-mintty.xml
+   72af7e46286188796925c8421154977ef3747435 2011111800 msys-mksh.xml
    d6919edb030a8a129da743f1c05756d99f5b6c81 2011101100 msys-mktemp.xml
    6ffc1c28147bd62d234f71070d53f9cb99a2cfe0 2011101100 msys-openssh.xml
    148f363053f2c38739fe30ccd980afc40e2d9b8b 2011101100 msys-openssl.xml
!   0bef7d4988dc20387f08126f82fb7ca386bfd65a 2011111800 msys-package-list.xml
    667afd4295b0aab7eef5682de27d2bfc6d80b03f 2011101100 msys-patch.xml
    1c2617eb65b17b242641af116b294523987dc32e 2011101100 msys-perl.xml

Update of /cvsroot/mingw/mingw-dist/msys
In directory vz-cvs-4.sog:/tmp/cvs-serv11551/msys

Modified Files:
	issue.log msys-rebase.xml 
Log Message:
Update & publish msys-rebase

Index: issue.log
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/issue.log,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** issue.log	7 Nov 2011 00:51:21 -0000	1.44
--- issue.log	17 Nov 2011 03:55:43 -0000	1.45
***************
*** 76,80 ****
    1c2617eb65b17b242641af116b294523987dc32e 2011101100 msys-perl.xml
    fb5aa962dfcb854674196f008e1a170ac70d4a4f 2011101100 msys-popt.xml
!   da86a3d83b8f07205b09cab088bf82aea6cd82c0 2011101100 msys-rebase.xml
    cbb26911ffd0d94320ba1f3266eb5d1188a7b3fe 2011101100 msys-regex.xml
    348cc56fadea2bfbb0b9136363893226b250f903 2011101100 msys-rsync.xml
--- 76,80 ----
    1c2617eb65b17b242641af116b294523987dc32e 2011101100 msys-perl.xml
    fb5aa962dfcb854674196f008e1a170ac70d4a4f 2011101100 msys-popt.xml
!   735eb971306adf1b7a5968e462bd3980f660f72c 2011111700 msys-rebase.xml
    cbb26911ffd0d94320ba1f3266eb5d1188a7b3fe 2011101100 msys-regex.xml
    348cc56fadea2bfbb0b9136363893226b250f903 2011101100 msys-rsync.xml

Index: msys-rebase.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-rebase.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** msys-rebase.xml	11 Oct 2011 18:25:56 -0000	1.4
--- msys-rebase.xml	17 Nov 2011 03:55:43 -0000	1.5
***************
*** 43,54 ****
--- 43,63 ----
          <requires eq="msys-sed-*-msys-*-bin.tar" />
          <release tarname="rebase-3.0.1_1-2-msys-1.0.15-bin.tar.lzma" />
+         <release tarname="rebase-4.0.1_1-1-msys-1.0.17-bin.tar.lzma" />
+       </component>
+ 
+       <component class="dev">
+         <requires eq="msys-core-*-msys-*-bin.tar" />
+         <requires eq="msys-rebase-%-msys-%-bin.tar" />
+         <release tarname="rebase-4.0.1_1-1-msys-1.0.17-dev.tar.lzma" />
        </component>
  
        <component class="doc">
          <release tarname="rebase-3.0.1_1-2-msys-1.0.15-doc.tar.lzma" />
+         <release tarname="rebase-4.0.1_1-1-msys-1.0.17-doc.tar.lzma" />
        </component>
  
        <component class="lic">
          <release tarname="rebase-3.0.1_1-2-msys-1.0.15-lic.tar.lzma" />
+         <release tarname="rebase-4.0.1_1-1-msys-1.0.17-lic.tar.lzma" />
        </component>
      </package>

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv11551

Modified Files:
	ChangeLog 
Log Message:
Update & publish msys-rebase

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** ChangeLog	15 Nov 2011 20:34:08 -0000	1.111
--- ChangeLog	17 Nov 2011 03:55:42 -0000	1.112
***************
*** 1,2 ****
--- 1,9 ----
+ 2011-11-16  Charles Wilson  <mi...@cw...>
+ 
+ 	Update & publish msys-rebase.
+ 
+ 	* msys/msys-rebase.xml: Update to 4.0.1_1.
+ 	* msys/issue.log: Update accordingly.
+ 
  2011-11-15  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv7848

Modified Files:
	ChangeLog 
Log Message:
Fix source and licence package associations for GDB.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** ChangeLog	9 Nov 2011 04:04:43 -0000	1.110
--- ChangeLog	15 Nov 2011 20:34:08 -0000	1.111
***************
*** 1,2 ****
--- 1,11 ----
+ 2011-11-15  Keith Marshall  <kei...@us...>
+ 
+ 	Fix source and licence package associations for GDB.
+ 
+ 	* mingw32/mingw32-gdb.xml: Add generic source and licence package
+ 	association declarations for all mingw32-gdb package components;
+ 	remove release specific declarations where equivalent.
+ 	* mingw32/issue.log: Update accordingly.
+ 
  2011-11-08  Charles Wilson  <mi...@cw...>
  

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv13354

Modified Files:
	ChangeLog 
Log Message:
Avoid unnecessary downloads for already installed packages.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** ChangeLog	6 Nov 2011 21:30:14 -0000	1.126
--- ChangeLog	9 Nov 2011 05:54:57 -0000	1.127
***************
*** 1,2 ****
--- 1,22 ----
+ 2011-11-09  Keith Marshall  <kei...@us...>
+ 
+ 	Avoid unnecessary downloads for already installed packages.
+ 
+ 	* src/pkginet.cpp (pkgActionItem::DownloadSingleArchive): Require
+ 	external scheduling of ACTION_DOWNLOAD; cancel the scheduled request
+ 	on completion, or when not required due to pre-existing local copy.
+ 
+ 	* src/climain.cpp (pkgActionItem::GetSourceArchive): Must always be
+ 	prepared to download the associated archive; enable ACTION_DOWNLOAD.
+ 
+ 	* src/pkgexec.cpp (pkgActionItem::Schedule) [OPTION_REINSTALL]:
+ 	May need to download the archive, even when the requested package was
+ 	previously installed; schedule ACTION_DOWNLOAD to enable this.
+ 
+ 	* src/pkgdeps.cpp (promote): Macro redefined in terms of...
+ 	(with_flags, with_download): ...these new macros; implement and...
+ 	(pkgXmlDocument::ResolveDependencies): ...use them to enable/schedule
+ 	ACTION_DOWNLOAD only when expected that it may be necessary.
+ 
  2011-11-06  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv20209

Modified Files:
	ChangeLog 
Log Message:
Correct dependencies for mingw32-gettext-dev, again

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** ChangeLog	9 Nov 2011 03:26:44 -0000	1.109
--- ChangeLog	9 Nov 2011 04:04:43 -0000	1.110
***************
*** 1,4 ****
--- 1,13 ----
  2011-11-08  Charles Wilson  <mi...@cw...>
  
+ 	Correct dependencies for mingw32-gettext-dev, again.
+ 
+ 	* mingw32/mingw32-gettext.xml: Also add libexpat dependency
+ 	for -dev component. Remove unnecessary dependencies for
+ 	gettext-dev 0.17-1.
+ 	* mingw32/issue.log: Update accordingly.
+ 
+ 2011-11-08  Charles Wilson  <mi...@cw...>
+ 
  	Correct dependencies for mingw32-gettext-dev.
  

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv7684

Modified Files:
	ChangeLog 
Log Message:
Correct dependencies for mingw32-gettext-dev

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** ChangeLog	7 Nov 2011 00:51:21 -0000	1.108
--- ChangeLog	9 Nov 2011 03:26:44 -0000	1.109
***************
*** 1,2 ****
--- 1,11 ----
+ 2011-11-08  Charles Wilson  <mi...@cw...>
+ 
+ 	Correct dependencies for mingw32-gettext-dev.
+ 
+ 	* mingw32/mingw32-gettext.xml: Add libstdc++ and libgomp
+ 	dependencies for -dev component. Modify all libgcc dependency
+ 	specifications to include subsystem version wildcard.
+ 	* mingw32/issue.log: Update accordingly.
+ 
  2011-11-06  Charles Wilson  <mi...@cw...>
  

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv17706

Modified Files:
	ChangeLog 
Log Message:
Update & publish msys-xz

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** ChangeLog	6 Nov 2011 23:58:41 -0000	1.107
--- ChangeLog	7 Nov 2011 00:51:21 -0000	1.108
***************
*** 1,4 ****
--- 1,11 ----
  2011-11-06  Charles Wilson  <mi...@cw...>
  
+ 	Update & publish msys-xz.
+ 
+ 	* msys/msys-xz.xml: Update to xz-5.0.3-1.
+ 	* msys/issue.log: Update accordingly.
+ 
+ 2011-11-06  Charles Wilson  <mi...@cw...>
+ 
  	Update & publish mgwport-0.10.6-1.
  

Update of /cvsroot/mingw/mingw-dist/mingw32
In directory vz-cvs-4.sog:/tmp/cvs-serv32331/mingw32

Modified Files:
	issue.log mingw32-mgwport.xml 
Log Message:
Update & publish mgwport-0.10.6-1

Index: mingw32-mgwport.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/mingw32/mingw32-mgwport.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mingw32-mgwport.xml	11 Oct 2011 18:25:56 -0000	1.2
--- mingw32-mgwport.xml	6 Nov 2011 23:58:42 -0000	1.3
***************
*** 59,70 ****
--- 59,73 ----
          -->
          <release tarname="mgwport-0.10.5-1-mingw32-bin.tar.lzma" />
+         <release tarname="mgwport-0.10.6-1-mingw32-bin.tar.lzma" />
        </component>
  
        <component class="doc">
          <release tarname="mgwport-0.10.5-1-mingw32-doc.tar.lzma" />
+         <release tarname="mgwport-0.10.6-1-mingw32-doc.tar.lzma" />
        </component>
  
        <component class="lic">
          <release tarname="mgwport-0.10.5-1-mingw32-lic.tar.lzma" />
+         <release tarname="mgwport-0.10.6-1-mingw32-lic.tar.lzma" />
        </component>
      </package>

Index: issue.log
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/mingw32/issue.log,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** issue.log	6 Nov 2011 17:39:33 -0000	1.54
--- issue.log	6 Nov 2011 23:58:42 -0000	1.55
***************
*** 44,48 ****
    9fb60f097832c4b192a13f6c524fe8020f2326e5 2011101100 mingw32-libtool.xml
    aaa310c7d830e7e9eef6738273630dda8e70d674 2011101100 mingw32-make.xml
!   54c581f4c27ebe5a53aa1f358899d2c59b6f750a 2011101100 mingw32-mgwport.xml
    a80ddc9b75352027ec1a8e4f43838133c88fb1d1 2011110600 mingw32-mingw-get.xml
    c22c976533d4437a89af9a11c2bb188506f85952 2011101100 mingw32-mingw-utils.xml
--- 44,48 ----
    9fb60f097832c4b192a13f6c524fe8020f2326e5 2011101100 mingw32-libtool.xml
    aaa310c7d830e7e9eef6738273630dda8e70d674 2011101100 mingw32-make.xml
!   d72826fa6526c7253dc7d6c0a5be4846df11a995 2011110600 mingw32-mgwport.xml
    a80ddc9b75352027ec1a8e4f43838133c88fb1d1 2011110600 mingw32-mingw-get.xml
    c22c976533d4437a89af9a11c2bb188506f85952 2011101100 mingw32-mingw-utils.xml

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv3943

Modified Files:
	ChangeLog Makefile.in 
Log Message:
Fix packaging anomalies for source and licence distributions.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/mingw-get/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Makefile.in	29 Jul 2011 19:52:32 -0000	1.30
--- Makefile.in	6 Nov 2011 21:30:14 -0000	1.31
***************
*** 200,209 ****
  	  do test -f ${abs_top_srcdir}/$$file \
  	    && $(LN_S) ${abs_top_srcdir}/$$file . \
! 	    || $(LN_S) ../$$file .; \
  	  done
  	tar chf - share | $(TARZIP) -c > $(PACKAGE_DISTNAME)-lic.$(TAREXT)
  	rm -rf share
  
! srcdist: pkginfo.c srcdist-doc
  	rm -rf ${PACKAGE_DISTROOT} && mkdir ${PACKAGE_DISTROOT}
  	cd ${PACKAGE_DISTROOT}; for file in $(SRCDIST_FILES); do \
--- 200,209 ----
  	  do test -f ${abs_top_srcdir}/$$file \
  	    && $(LN_S) ${abs_top_srcdir}/$$file . \
! 	    || $(LN_S) ${CURDIR}/$$file .; \
  	  done
  	tar chf - share | $(TARZIP) -c > $(PACKAGE_DISTNAME)-lic.$(TAREXT)
  	rm -rf share
  
! srcdist: srcdist-doc
  	rm -rf ${PACKAGE_DISTROOT} && mkdir ${PACKAGE_DISTROOT}
  	cd ${PACKAGE_DISTROOT}; for file in $(SRCDIST_FILES); do \
***************
*** 220,224 ****
  	  done; \
  	cd ${CURDIR}; done
! 	cd ${PACKAGE_DISTROOT}/src/pkginfo; $(LN_S) ${CURDIR}/$^ .
  	tar chf - ${PACKAGE_DISTROOT} | $(TARZIP) -c > \
  	  ${PACKAGE_DISTNAME}-src.$(TAREXT)
--- 220,224 ----
  	  done; \
  	cd ${CURDIR}; done
! 	cd ${PACKAGE_DISTROOT}/src/pkginfo; $(LN_S) ${CURDIR}/pkginfo.c .
  	tar chf - ${PACKAGE_DISTROOT} | $(TARZIP) -c > \
  	  ${PACKAGE_DISTNAME}-src.$(TAREXT)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** ChangeLog	6 Nov 2011 21:19:17 -0000	1.125
--- ChangeLog	6 Nov 2011 21:30:14 -0000	1.126
***************
*** 1,4 ****
--- 1,13 ----
  2011-11-06  Keith Marshall  <kei...@us...>
  
+ 	Fix packaging anomalies for source and licence distributions.
+ 
+ 	* Makefile.in (licdist): Link README from ${CURDIR}, not from '..'.
+ 	(srcdist): Explicitly link pkginfo.c from ${CURDIR} to src/pkginfo,
+ 	rather than as implied prerequisite; this avoids a bogus attempt to
+ 	link srcdist-doc into src/pkginfo.
+ 
+ 2011-11-06  Keith Marshall  <kei...@us...>
+ 
  	Bump version number for subsequent CVS snapshots.
  

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv1743

Modified Files:
	ChangeLog configure.ac 
Log Message:
Bump version number for subsequent CVS snapshots.

Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/mingw-get/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** configure.ac	6 Nov 2011 10:53:25 -0000	1.21
--- configure.ac	6 Nov 2011 21:19:17 -0000	1.22
***************
*** 23,27 ****
  # arising from the use of this software.
  #
!   AC_INIT([mingw-get],[0.4-alpha-1],[http://mingw.org/Reporting_Bugs])
  
    AC_SUBST([COPYRIGHT_HOLDER],["MinGW Project"])
--- 23,27 ----
  # arising from the use of this software.
  #
!   AC_INIT([mingw-get],[0.4-alpha-1.1cvs],[http://mingw.org/Reporting_Bugs])
  
    AC_SUBST([COPYRIGHT_HOLDER],["MinGW Project"])

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** ChangeLog	6 Nov 2011 10:53:25 -0000	1.124
--- ChangeLog	6 Nov 2011 21:19:17 -0000	1.125
***************
*** 1,4 ****
--- 1,10 ----
  2011-11-06  Keith Marshall  <kei...@us...>
  
+ 	Bump version number for subsequent CVS snapshots.
+ 
+ 	* configure.ac (AC_INIT): Set version to 0.4-alpha-1.1cvs
+ 
+ 2011-11-06  Keith Marshall  <kei...@us...>
+ 
  	mingw-get-0.4-mingw32-alpha-1 released.
  

Update of /cvsroot/mingw/mingw-dist/mingw32
In directory vz-cvs-4.sog:/tmp/cvs-serv30641/mingw32

Modified Files:
	issue.log mingw32-mingw-get.xml 
Log Message:
Update for mingw-get-0.4-alpha-1 release.

Index: mingw32-mingw-get.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/mingw32/mingw32-mingw-get.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mingw32-mingw-get.xml	11 Oct 2011 18:25:56 -0000	1.12
--- mingw32-mingw-get.xml	6 Nov 2011 17:39:33 -0000	1.13
***************
*** 28,31 ****
--- 28,32 ----
  
        <component class="bin">
+         <release tarname="mingw-get-0.4-mingw32-alpha-1-bin.tar.xz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-2.1-bin.tar.xz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-2-bin.tar.gz" />
***************
*** 35,38 ****
--- 36,40 ----
  
        <component class="lic">
+         <release tarname="mingw-get-0.4-mingw32-alpha-1-lic.tar.xz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-2.1-lic.tar.xz" />
          <release tarname="mingw-get-0.3-mingw32-alpha-2-lic.tar.gz" />
***************
*** 61,64 ****
--- 63,67 ----
  
        <component class="bin">
+         <release tarname="pkginfo-0.4-mingw32-alpha-1-bin.tar.xz" />
          <release tarname="pkginfo-0.3-mingw32-alpha-2.1-bin.tar.xz" />
          <release tarname="pkginfo-0.3-mingw32-alpha-2-bin.tar.gz" />

Index: issue.log
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/mingw32/issue.log,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** issue.log	1 Nov 2011 22:00:18 -0000	1.53
--- issue.log	6 Nov 2011 17:39:33 -0000	1.54
***************
*** 45,49 ****
    aaa310c7d830e7e9eef6738273630dda8e70d674 2011101100 mingw32-make.xml
    54c581f4c27ebe5a53aa1f358899d2c59b6f750a 2011101100 mingw32-mgwport.xml
!   59258cfbddd949879a01f55c93da0e90ccd26e32 2011101100 mingw32-mingw-get.xml
    c22c976533d4437a89af9a11c2bb188506f85952 2011101100 mingw32-mingw-utils.xml
    397021010754b50cdbbe5d5003b1f6217158ec8e 2010083100 mingw32-mpc.xml
--- 45,49 ----
    aaa310c7d830e7e9eef6738273630dda8e70d674 2011101100 mingw32-make.xml
    54c581f4c27ebe5a53aa1f358899d2c59b6f750a 2011101100 mingw32-mgwport.xml
!   a80ddc9b75352027ec1a8e4f43838133c88fb1d1 2011110600 mingw32-mingw-get.xml
    c22c976533d4437a89af9a11c2bb188506f85952 2011101100 mingw32-mingw-utils.xml
    397021010754b50cdbbe5d5003b1f6217158ec8e 2010083100 mingw32-mpc.xml

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv30365

Modified Files:
	ChangeLog configure.ac 
Log Message:
mingw-get-0.4-mingw32-alpha-1 released.

Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/mingw-get/configure.ac,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** configure.ac	29 Jul 2011 20:21:57 -0000	1.20
--- configure.ac	6 Nov 2011 10:53:25 -0000	1.21
***************
*** 23,27 ****
  # arising from the use of this software.
  #
!   AC_INIT([mingw-get],[0.3-alpha-2.1],[http://mingw.org/Reporting_Bugs])
  
    AC_SUBST([COPYRIGHT_HOLDER],["MinGW Project"])
--- 23,27 ----
  # arising from the use of this software.
  #
!   AC_INIT([mingw-get],[0.4-alpha-1],[http://mingw.org/Reporting_Bugs])
  
    AC_SUBST([COPYRIGHT_HOLDER],["MinGW Project"])

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** ChangeLog	4 Nov 2011 22:25:10 -0000	1.123
--- ChangeLog	6 Nov 2011 10:53:25 -0000	1.124
***************
*** 1,2 ****
--- 1,10 ----
+ 2011-11-06  Keith Marshall  <kei...@us...>
+ 
+ 	mingw-get-0.4-mingw32-alpha-1 released.
+ 
+ 	* configure.ac (AC_INIT): Adjust version number.
+ 	* srcdist-doc/NEWS.in: Updated; document new features and bugs fixed.
+ 	* All files (r0-4-alpha-1): Tag assigned.
+ 
  2011-11-04  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-get/src
In directory vz-cvs-4.sog:/tmp/cvs-serv18087/src

Modified Files:
	pkgdeps.cpp pkgexec.cpp pkgspec.cpp 
Log Message:
Don't upgrade installed DLL components to incompatible version.  Provide clearer diagnostics for failed requests on implied packages.

Index: pkgspec.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgspec.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pkgspec.cpp	27 Jul 2011 20:36:00 -0000	1.4
--- pkgspec.cpp	4 Nov 2011 22:25:10 -0000	1.5
***************
*** 177,186 ****
    const char *rhs_build_spec = rhs.GetPackageBuild();
  
-   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
-       dmh_printf( "  LHS: %s-%s-%s-%s\n  RHS: %s-%s-%s-%s\n",
- 	lhs_version_spec, lhs_build_spec, GetReleaseStatus(), GetReleaseIndex(),
- 	rhs_version_spec, rhs_build_spec, rhs.GetReleaseStatus(), rhs.GetReleaseIndex())
-       );
- 
    /* Initially, we compare just the package version itself...
     */
--- 177,180 ----
***************
*** 194,201 ****
    if( lhs_version > rhs_version ) return +1;
  
-   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
-       dmh_printf( "   base versions match\n" )
-     );
- 
    /* If we get to here, then the package versions of LHS and RHS
     * are effectively matched; however, unless there is a wildcard
--- 188,191 ----
***************
*** 225,231 ****
  	 * confirm the LHS as the "lesser" release.
  	 */
- 	DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
- 	    dmh_printf( "  mismatched: LHS is qualified; RHS is not, and is not a wildcard\n" )
- 	  );
  	return -1;
        }
--- 215,218 ----
***************
*** 267,280 ****
         * value to indicate LHS > RHS.
         */
-       DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
- 	  dmh_printf( "  mismatched: RHS qualified; LHS is not, and is not a wildcard\n" )
- 	);
        return +1;
      }
    }
-   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
-       dmh_printf( "   package versions match; checking subsystem\n" )
-     );
- 
    /* If we get to here, then LHS and RHS represent the same
     * version of the package, at the same phase of development;
--- 254,260 ----
***************
*** 297,303 ****
     * to assert their equality.
     */
-   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
-       dmh_printf( "   match found\n" )
-     );
    return 0;
  }
--- 277,280 ----

Index: pkgdeps.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgdeps.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pkgdeps.cpp	7 Oct 2011 20:58:57 -0000	1.9
--- pkgdeps.cpp	4 Nov 2011 22:25:10 -0000	1.10
***************
*** 167,178 ****
  }
  
  DEBUG_INVOKED static void
  DEBUG_INVOKED show_required( pkgSpecs *req )
  DEBUG_INVOKED {
  DEBUG_INVOKED   const char *tarname = NULL;
! DEBUG_INVOKED   dmh_printf( " require: %s\n", req->GetTarName( tarname ) );
  DEBUG_INVOKED   free( (void *)(tarname) );
  DEBUG_INVOKED }
  
  void
  pkgXmlDocument::ResolveDependencies( pkgXmlNode* package, pkgActionItem* rank )
--- 167,200 ----
  }
  
+ DEBUG_INVOKED static int indent = -1;
+ 
  DEBUG_INVOKED static void
  DEBUG_INVOKED show_required( pkgSpecs *req )
  DEBUG_INVOKED {
  DEBUG_INVOKED   const char *tarname = NULL;
! DEBUG_INVOKED   dmh_printf( "%*s require: %s\n", indent, "", req->GetTarName( tarname ) );
  DEBUG_INVOKED   free( (void *)(tarname) );
  DEBUG_INVOKED }
  
+ static inline
+ bool is_abi_compatible( pkgSpecs *refdata, const char *version )
+ {
+   /* Local helper, used by pkgXmlDocument::ResolveDependencies(),
+    * to confirm that the ABI identification number of a selected
+    * component package is an exact match to a requirement spec.
+    */
+   const char *ref_version;
+   if( (ref_version = refdata->GetComponentVersion()) == NULL )
+     /*
+      * Here, confirm that both are unversioned...
+      */
+     return (version == NULL);
+ 
+   /* ...otherwise, fall through to check that both bear IDENTICALLY
+    * the same ABI version number.
+    */
+   return ((version != NULL) && (strcmp( version, ref_version ) == 0));
+ }
+ 
  void
  pkgXmlDocument::ResolveDependencies( pkgXmlNode* package, pkgActionItem* rank )
***************
*** 185,194 ****
     * additional dependencies common to the containing package group.
     */
-   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
-       dmh_printf( "ResolveDependencies: begin function\n" )
-     );
    pkgSpecs *refdata = NULL;
    pkgXmlNode *refpkg = package;
  
    while( package != NULL )
    {
--- 207,215 ----
     * additional dependencies common to the containing package group.
     */
    pkgSpecs *refdata = NULL;
    pkgXmlNode *refpkg = package;
  
+   DEBUG_INVOKED ++indent;
+ 
    while( package != NULL )
    {
***************
*** 217,221 ****
  	{
  	  DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
! 	      dmh_printf( "%s: resolve dependencies\n", refname )
  	    );
  	  refdata = new pkgSpecs( refname );
--- 238,242 ----
  	{
  	  DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
! 	      dmh_printf( "%*s%s: resolve dependencies\n", indent, "", refname )
  	    );
  	  refdata = new pkgSpecs( refname );
***************
*** 268,291 ****
  	    */
  	    const char *tstclass;
  	    pkgSpecs tst( tstclass = required->GetPropVal( tarname_key, NULL ) );
  	    DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
! 		dmh_printf( " considering: %s\n", tstclass )
  	      );
  	    if( (tstclass = tst.GetComponentClass()) == NULL )
  	      tstclass = value_unknown;
  
! 	    if( is_installed( required ) && (strcmp( tstclass, reqclass ) == 0) )
  	      installed = required;
! 
      	    /* ...and identify the most suitable candidate "release"
  	     * to satisfy the current dependency...
  	     */
  	    if( wanted.SelectIfMostRecentFit( required ) == required )
  	      selected = component = required;
! 
  	    /* ...continuing, until all available "releases"
  	     * have been evaluated accordingly.
  	     */
  	    required = required->FindNextAssociate( release_key );
  	  }
  
--- 289,329 ----
  	    */
  	    const char *tstclass;
+ 	    DEBUG_INVOKED const char *already, *viable;
  	    pkgSpecs tst( tstclass = required->GetPropVal( tarname_key, NULL ) );
  	    DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
! 		dmh_printf( "%*s  considering: %s", indent, "", tstclass )
  	      );
  	    if( (tstclass = tst.GetComponentClass()) == NULL )
  	      tstclass = value_unknown;
  
! 	    DEBUG_INVOKED already = viable = "";
! 	    if( is_installed( required ) && (strcmp( tstclass, reqclass ) == 0)
! 	    /*
! 	     * We found an installed version of the requisite component,
! 	     * but we ignore it unless it is ABI version compatible with
! 	     * the version we need; (the intent of ABI versioning is to
! 	     * accommodate multiple concurrent installations of shared
! 	     * objects supporting the differing ABI specifications).
! 	     */
! 	    &&  is_abi_compatible( &tst, req.GetComponentVersion() )  )
! 	    {
  	      installed = required;
! 	      DEBUG_INVOKED already = " (already installed)";
! 	    }
      	    /* ...and identify the most suitable candidate "release"
  	     * to satisfy the current dependency...
  	     */
  	    if( wanted.SelectIfMostRecentFit( required ) == required )
+ 	    {
  	      selected = component = required;
! 	      DEBUG_INVOKED viable = ": viable candidate";
! 	    }
  	    /* ...continuing, until all available "releases"
  	     * have been evaluated accordingly.
  	     */
  	    required = required->FindNextAssociate( release_key );
+ 	    DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+ 		dmh_printf( "%s%s\n", viable, already )
+ 	      );
  	  }
  
***************
*** 311,314 ****
--- 349,357 ----
  	     */
  	    fallback |= ACTION_UPGRADE;
+ 	    DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
+ 		dmh_printf( "%*s%s: schedule replacement\n", indent, "",
+ 		    installed->GetPropVal( tarname_key, value_unknown )
+ 		  )
+ 	      );
  	    wanted.SelectPackage( installed, to_remove );
  	  }
***************
*** 373,379 ****
      package = (package == GetRoot()) ? NULL : package->GetParent();
    }
!   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
!       dmh_printf( "ResolveDependencies: end function\n" )
!     );
    delete refdata;
  }
--- 416,420 ----
      package = (package == GetRoot()) ? NULL : package->GetParent();
    }
!   DEBUG_INVOKED --indent;
    delete refdata;
  }
***************
*** 594,603 ****
  
  	  else
! 	    /* attempting ACTION_UPGRADE or ACTION_REMOVE
  	     * is an error; diagnose it.
  	     */
! 	    dmh_notify( DMH_ERROR, "%s %s: package is not installed\n",
! 		action_name( action & ACTION_MASK ), name
! 	      );
  	}
  
--- 635,676 ----
  
  	  else
! 	  { /* attempting ACTION_UPGRADE or ACTION_REMOVE
  	     * is an error; diagnose it.
  	     */
! 	    if( component == NULL )
! 	      /*
! 	       * In this case, the user explicitly specified a single
! 	       * package component, so it's a simple error...
! 	       */
! 	      dmh_notify( DMH_ERROR, "%s %s: package is not installed\n",
! 		  action_name( action & ACTION_MASK ), name
! 		);
! 	    else
! 	    {
! 	      /* ...but here, the user specified only the package name,
! 	       * which implicitly applies to all associated components;
! 	       * since some may be installed, prefer to issue a warning
! 	       * in respect of any which aren't.
! 	       */
! 	      const char *extname = component->GetPropVal( class_key, "" );
! 	      char full_package_name[2 + strlen( name ) + strlen( extname )];
! 	      sprintf( full_package_name, *extname ? "%s-%s" : "%s", name, extname );
! 
! 	      dmh_control( DMH_BEGIN_DIGEST );
! 	      dmh_notify( DMH_WARNING, "%s %s: request ignored...\n",
! 		  extname = action_name( action & ACTION_MASK ), full_package_name
! 		);
! 	      dmh_notify( DMH_WARNING, "%s: package was not previously installed\n",
! 		  full_package_name
! 		);
! 	      dmh_notify( DMH_WARNING, "%s: it will remain this way until you...\n",
! 		  full_package_name
! 		);
! 	      dmh_notify( DMH_WARNING, "use 'mingw-get install %s' to install it\n",
! 		  full_package_name
! 		);
! 	      dmh_control( DMH_END_DIGEST );
! 	    }
! 	  }
  	}
  

Index: pkgexec.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgexec.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** pkgexec.cpp	11 Oct 2011 20:56:58 -0000	1.19
--- pkgexec.cpp	4 Nov 2011 22:25:10 -0000	1.20
***************
*** 279,285 ****
  pkgXmlNode *pkgActionItem::SelectIfMostRecentFit( pkgXmlNode *package )
  {
-   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
-       dmh_printf( "SelectIfMostRecentFit: begin function\n" )
-     );
    /* Assign "package" as the "selection" for the referring action item,
     * provided it matches the specified selection criteria and it represents
--- 279,282 ----
***************
*** 319,325 ****
    /* Whatever choice we make, we return the resultant selection...
     */
-   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_DEPENDENCIES ),
-       dmh_printf( "SelectIfMostRecentFit: end function\n" )
-     );
    return Selection();
  }
--- 316,319 ----

Update of /cvsroot/mingw/mingw-dist
In directory vz-cvs-4.sog:/tmp/cvs-serv12225

Modified Files:
	ChangeLog 
Log Message:
Adopt mingw32-libunistring as a contributed package; 	relegate mingw32-pdcurses to contributed status.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** ChangeLog	31 Oct 2011 18:16:43 -0000	1.104
--- ChangeLog	1 Nov 2011 22:00:18 -0000	1.105
***************
*** 1,2 ****
--- 1,14 ----
+ 2011-11-01  Keith Marshall  <kei...@us...>
+ 
+ 	Adopt mingw32-libunistring as a contributed package;
+ 	relegate mingw32-pdcurses to contributed status.
+ 
+ 	* mingw32/mingw32-package-list.xml: Add mingw32-libunistring.xml hook;
+ 	relocate mingw32-pdcurses.xml reference to contributed package group.
+ 
+ 	* mingw32/mingw32-pdcurses.xml: Remove file.
+ 
+ 	* mingw32/issue.log: Update accordingly.
+ 
  2011-10-31  Charles Wilson  <mi...@cw...>