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

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

Modified Files:
	ChangeLog Makefile.in 
Log Message:
Avoid accidental RCS keyword substitutions.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/mingw-get/Makefile.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Makefile.in	18 Jun 2011 09:53:21 -0000	1.28
--- Makefile.in	18 Jun 2011 12:32:23 -0000	1.29
***************
*** 244,252 ****
  	    -e s,'^# *cut:',, $< > $@
  
  # The following rule provides a mechanism for generating a composite from
  # README, INSTALL and NEWS, for use as an on-line package description.
  #
  readme.txt: gendoc.combined.sed readme.txt.tag readme.txt.in
! 	sed s,'$$Id$@.tag`", $@.in > $@
  	echo '$$Document: $@ $$: end of file' >> $@
  	rm -f gendoc.combined.sed $@.*
--- 244,258 ----
  	    -e s,'^# *cut:',, $< > $@
  
+ # The following rules use sed and awk to match the RCS Id keyword;
+ # we define and use the following macro, in the form "$(DOLLAR)Id:",
+ # to avoid unwanted substitution on CVS checkout.
+ #
+ DOLLAR = $$
+ 
  # The following rule provides a mechanism for generating a composite from
  # README, INSTALL and NEWS, for use as an on-line package description.
  #
  readme.txt: gendoc.combined.sed readme.txt.tag readme.txt.in
! 	sed s,'$(DOLLAR)Id:.*',"`cat $@.tag`", $@.in > $@
  	echo '$$Document: $@ $$: end of file' >> $@
  	rm -f gendoc.combined.sed $@.*
***************
*** 258,262 ****
  #
  readme.txt.tag: NEWS.in
! 	awk '/\$$Id$$2 = "readme.txt\\,v"; print }' $^ > $@
  
  # The tag-line generated by the preceding rule may then be substituted, by
--- 264,268 ----
  #
  readme.txt.tag: NEWS.in
! 	awk '/\$(DOLLAR)Id:/{ $$2 = "readme.txt\\,v"; print }' $^ > $@
  
  # The tag-line generated by the preceding rule may then be substituted, by

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** ChangeLog	18 Jun 2011 09:59:34 -0000	1.108
--- ChangeLog	18 Jun 2011 12:32:23 -0000	1.109
***************
*** 1,4 ****
--- 1,12 ----
  2011-06-18  Keith Marshall  <kei...@us...>
  
+ 	Avoid accidental RCS keyword substitutions.
+ 
+ 	* Makefile.in (DOLLAR): New macro; define it.
+ 	(readme.txt, readme.txt.in): Use it, where unexpanded RCS Id keyword
+ 	matching is intended.
+ 
+ 2011-06-18  Keith Marshall  <kei...@us...>
+ 
  	Mercurial support revisited.
  

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

Modified Files:
	.cvsignore ChangeLog 
Log Message:
Mercurial support revisited.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/mingw/mingw-get/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** .cvsignore	14 Jun 2011 20:34:39 -0000	1.4
--- .cvsignore	18 Jun 2011 09:59:34 -0000	1.5
***************
*** 1,3 ****
  configure autom4te.cache
  bin obj mingw-get.layout mingw-get.depend *.d
! .hg .hgignore
--- 1,3 ----
  configure autom4te.cache
  bin obj mingw-get.layout mingw-get.depend *.d
! .hg .hgignore .hgtags

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** ChangeLog	18 Jun 2011 09:53:21 -0000	1.107
--- ChangeLog	18 Jun 2011 09:59:34 -0000	1.108
***************
*** 1,4 ****
--- 1,10 ----
  2011-06-18  Keith Marshall  <kei...@us...>
  
+ 	Mercurial support revisited.
+ 
+ 	* .cvsignore (.hgtags): Add to CVS untracked list.
+ 
+ 2011-06-18  Keith Marshall  <kei...@us...>
+ 
  	Update readme.txt ID tag-line to track NEWS rather than README.
  

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

Modified Files:
	ChangeLog Makefile.in 
Log Message:
Update readme.txt ID tag-line to track NEWS rather than README.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/mingw-get/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Makefile.in	30 May 2011 08:42:52 -0000	1.27
--- Makefile.in	18 Jun 2011 09:53:21 -0000	1.28
***************
*** 247,259 ****
  # README, INSTALL and NEWS, for use as an on-line package description.
  #
! readme.txt: README.in NEWS.in INSTALL.in gendoc.combined.sed
  	rm -f $@
  	for input in $^; do \
! 	  case $$input in *.in) \
! 	    sed -f gendoc.combined.sed $$input | $(NROFF) >> $@ ;; \
! 	    esac; \
  	  done
- 	echo '$$Document: $@ $$: end of file' >> $@
- 	rm -f gendoc.combined.sed
  
  # Workspace clean-up...
--- 247,272 ----
  # README, INSTALL and NEWS, for use as an on-line package description.
  #
! readme.txt: gendoc.combined.sed readme.txt.tag readme.txt.in
! 	sed s,'$$Id$@.tag`", $@.in > $@
! 	echo '$$Document: $@ $$: end of file' >> $@
! 	rm -f gendoc.combined.sed $@.*
! 
! # There should be a new generation of readme.txt for each package release;
! # since each release should also include an updated NEWS file; we adopt the
! # ID tag-line from NEWS.in, as most the appropriate template for generation
! # of a corresponding tag-line for readme.in
! #
! readme.txt.tag: NEWS.in
! 	awk '/\$$Id$$2 = "readme.txt\\,v"; print }' $^ > $@
! 
! # The tag-line generated by the preceding rule may then be substituted, by
! # the primary readme.txt generation rule above, into the document template
! # generated by the following rule
! #
! readme.txt.in: README.in NEWS.in INSTALL.in
  	rm -f $@
  	for input in $^; do \
! 	  sed -f gendoc.combined.sed $$input | $(NROFF) >> $@; \
  	  done
  
  # Workspace clean-up...

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** ChangeLog	17 Jun 2011 07:02:18 -0000	1.106
--- ChangeLog	18 Jun 2011 09:53:21 -0000	1.107
***************
*** 1,2 ****
--- 1,10 ----
+ 2011-06-18  Keith Marshall  <kei...@us...>
+ 
+ 	Update readme.txt ID tag-line to track NEWS rather than README.
+ 
+ 	* Makefile.in (readme.txt.in): New rule; implement it.
+ 	(readme.txt.tag): Likewise; this implements the tag-line tracking.
+ 	(readme.txt): Rule redefined in terms of the preceding pair.
+ 
  2011-06-17  Keith Marshall  <kei...@us...>
  

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
mingw-get-0.3-mingw32-alpha-2 released.

Index: configure.ac
===================================================================
RCS file: /cvsroot/mingw/mingw-get/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** configure.ac	30 May 2011 09:01:52 -0000	1.18
--- configure.ac	17 Jun 2011 07:02:18 -0000	1.19
***************
*** 23,27 ****
  # arising from the use of this software.
  #
!   AC_INIT([mingw-get],[0.3-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.3-alpha-2],[http://mingw.org/Reporting_Bugs])
  
    AC_SUBST([COPYRIGHT_HOLDER],["MinGW Project"])

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** ChangeLog	15 Jun 2011 18:48:10 -0000	1.105
--- ChangeLog	17 Jun 2011 07:02:18 -0000	1.106
***************
*** 1,2 ****
--- 1,10 ----
+ 2011-06-17  Keith Marshall  <kei...@us...>
+ 
+ 	mingw-get-0.3-mingw32-alpha-2 released.
+ 
+ 	* configure.ac (AC_INIT): Adjust version number.
+ 	* srcdist-doc/NEWS.in: Updated; document new features and bugs fixed.
+ 	* All files (r0-3-alpha-2): Tag assigned.
+ 
  2011-06-15  Keith Marshall  <kei...@us...>
  

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

Modified Files:
	clistub.c 
Log Message:
Add internal documentation for --reinstall option.

Index: clistub.c
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/clistub.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** clistub.c	13 Jun 2011 19:00:14 -0000	1.13
--- clistub.c	15 Jun 2011 18:48:10 -0000	1.14
***************
*** 183,186 ****
--- 183,193 ----
  "  --trace=N       Enable tracing feature N; (debugging aid)\n"
  #endif
+ 
+ /* The following are always available...
+  */
+ "  --reinstall     When performing an install or upgrade\n"
+ "                  operation, reinstall any named package\n"
+ "                  for which the most recent release is\n"
+ "                  already installed\n"
  "\n"
  "Actions:\n"

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

Modified Files:
	ChangeLog .cvsignore 
Log Message:
Support use of Mercurial within a CVS working copy.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/mingw/mingw-get/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore	23 Mar 2010 19:05:06 -0000	1.3
--- .cvsignore	14 Jun 2011 20:34:39 -0000	1.4
***************
*** 1,2 ****
--- 1,3 ----
  configure autom4te.cache
  bin obj mingw-get.layout mingw-get.depend *.d
+ .hg .hgignore

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** ChangeLog	13 Jun 2011 19:00:14 -0000	1.103
--- ChangeLog	14 Jun 2011 20:34:38 -0000	1.104
***************
*** 1,2 ****
--- 1,8 ----
+ 2011-06-14  Keith Marshall  <kei...@us...>
+ 
+ 	Support use of Mercurial within a CVS working copy.
+ 
+ 	* .cvsignore (.hg, .hgignore): Don't have CVS track these.
+ 
  2011-06-13  Keith Marshall  <kei...@us...>
  

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

Modified Files:
	ChangeLog 
Log Message:
Implement --reinstall option.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** ChangeLog	12 Jun 2011 19:38:11 -0000	1.102
--- ChangeLog	13 Jun 2011 19:00:14 -0000	1.103
***************
*** 1,2 ****
--- 1,23 ----
+ 2011-06-13  Keith Marshall  <kei...@us...>
+ 
+ 	Implement --reinstall option.
+ 
+ 	* src/pkgopts.h (OPTION_REINSTALL): New macro; define it.
+ 	(OPTION_GENERIC, OPTION_SHIFT_MASK): Likewise.
+ 	(OPTION_EXTRA_FLAGS): New field; declare it.
+ 
+ 	* src/clistub.c (options): Add "reinstall".
+ 	(OPTION_GENERIC): Use it where appropriate; within its scope...
+ 	(OPTION_STORAGE_CLASS): Improve descriptive comments; add handling for
+ 	default case of flag type options requiring an alignment shift.
+ 
+ 	* src/pkgexec.cpp: Remove previous "always reinstall" kludge.
+ 	(pkgOptionSelected, PKG_OPTION_REINSTALL): Remove obsolete macros.
+ 	(pkgActionItem::Execute): Check for "upgrade" request on any package
+ 	which is already up to date; report this state, otherwise...
+ 	[OPTION_REINSTALL || ACTION_UPGRADE]: Mark package as "removed", to
+ 	avoid bail-out on "package already installed", when calling...
+ 	(pkgInstall): ...this.
+ 
  2011-06-12  Keith Marshall  <kei...@us...>
  

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

Modified Files:
	pkgbind.cpp 
Log Message:
Don't require -vv to report progress of update operation.

Index: pkgbind.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgbind.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pkgbind.cpp	21 May 2011 18:38:11 -0000	1.6
--- pkgbind.cpp	12 Jun 2011 19:38:11 -0000	1.7
***************
*** 27,31 ****
  #include <stdio.h>
  #include <stdlib.h>
- #include <libgen.h>
  #include <string.h>
  #include <unistd.h>
--- 27,30 ----
***************
*** 79,87 ****
         */
        if( force_update || (access( dfile, F_OK ) != 0) )
! 	/*
! 	 * When performing an "update", or if no local copy is available...
  	 * Force a "sync", to fetch a copy from the public host.
  	 */
  	owner->SyncRepository( dname, repository );
  
        /* We SHOULD now have a locally cached copy of the package-list;
--- 78,88 ----
         */
        if( force_update || (access( dfile, F_OK ) != 0) )
!       {
! 	/* When performing an "update", or if no local copy is available...
  	 * Force a "sync", to fetch a copy from the public host.
  	 */
+ 	dmh_printf( "Update catalogue: %s.xml\n", dname );
  	owner->SyncRepository( dname, repository );
+       }
  
        /* We SHOULD now have a locally cached copy of the package-list;
***************
*** 94,102 ****
  	 * root element...
  	 */
- 	char catname[ 1 + strlen( merge.Value() ) ];
  	if( pkgOptions()->Test( OPTION_VERBOSE ) > 1 )
! 	  dmh_printf(
! 	      "Load catalogue: %s\n", basename( strcpy( catname, merge.Value() ))
! 	    );
  	pkgXmlNode *catalogue, *pkglist;
  	if( (catalogue = merge.GetRoot()) != NULL )
--- 95,100 ----
  	 * root element...
  	 */
  	if( pkgOptions()->Test( OPTION_VERBOSE ) > 1 )
! 	  dmh_printf( "Load catalogue: %s.xml\n", dname );
  	pkgXmlNode *catalogue, *pkglist;
  	if( (catalogue = merge.GetRoot()) != NULL )
***************
*** 128,135 ****
  	 * emit a warning diagnostic message, and otherwise ignore it.
  	 */
! 	char catname[ 1 + strlen( dfile ) ];
! 	dmh_notify( DMH_WARNING,
! 	    "Load catalogue: FAILED: %s\n", basename( strcpy( catname, dfile ))
! 	  );
        }
  
--- 126,130 ----
  	 * emit a warning diagnostic message, and otherwise ignore it.
  	 */
! 	dmh_notify( DMH_WARNING, "Load catalogue: FAILED: %s.xml\n", dname );
        }
  

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

Modified Files:
	pkginfo.l 
Log Message:
Fix MinGW-Bug #3313806.

Index: pkginfo.l
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkginfo/pkginfo.l,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pkginfo.l	18 May 2011 18:34:51 -0000	1.3
--- pkginfo.l	11 Jun 2011 12:39:01 -0000	1.4
***************
*** 154,158 ****
       */
      BEGIN INITIAL; yyless( 0 );
!     if( index < PACKAGE_RELEASE_STATUS )
      {
        /* and, when the <status> descriptor is appropriately placed,
--- 154,158 ----
       */
      BEGIN INITIAL; yyless( 0 );
!     if( (PACKAGE_NAME < index) && (index < PACKAGE_RELEASE_STATUS) )
      {
        /* and, when the <status> descriptor is appropriately placed,

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

Modified Files:
	ChangeLog 
Log Message:
Provisional correction for MinGW-bug #3309438.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** ChangeLog	30 May 2011 09:01:52 -0000	1.99
--- ChangeLog	7 Jun 2011 21:03:36 -0000	1.100
***************
*** 1,2 ****
--- 1,13 ----
+ 2011-06-07  Keith Marshall  <kei...@us...>
+ 
+ 	Provisional correction for MinGW-bug #3309438.
+ 
+ 	* src/debug.h [DEBUGLEVEL == 0]: Provide defaults for...
+ 	(DEBUG_ENABLED, DEBUG_REQUEST): ...these macros.
+ 
+ 	* src/tarproc.cpp (pkgTarArchiveInstaller::ProcessDirectory):
+ 	(pkgTarArchiveInstaller::ProcessDataStream): Use DEBUG_REQUEST to
+ 	enable runtime trace activation for previous compile time choices.
+ 
  2011-05-30  Keith Marshall  <kei...@us...>
  

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

Modified Files:
	issue.log msys-base.xml 
Log Message:
Add new aliases for mingw32-base and msys-base

Index: issue.log
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/issue.log,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** issue.log	31 May 2011 02:36:00 -0000	1.36
--- issue.log	5 Jun 2011 21:43:25 -0000	1.37
***************
*** 28,32 ****
    f8c23efaeaf06405cd535a6ae5959b0983516d00 2010090600 msys-autogen.xml
    acc3d8687855178ac17c98d655743ccf80a916ae 2010090600 msys-automake.xml
!   686ef0ba0dea36ed8a6f296aade584cbc37085fb 2011011000 msys-base.xml
    c3c0cdf4e07d21dcc2e48278258996973f929d07 2010120400 msys-bash.xml
    e52982cbff0b0bb825461deb9af0411f72f2e4a2 2010090600 msys-binutils.xml
--- 28,32 ----
    f8c23efaeaf06405cd535a6ae5959b0983516d00 2010090600 msys-autogen.xml
    acc3d8687855178ac17c98d655743ccf80a916ae 2010090600 msys-automake.xml
!   02484856dd19f2feae156932e04165f11b7f2cdc 2011060500 msys-base.xml
    c3c0cdf4e07d21dcc2e48278258996973f929d07 2010120400 msys-bash.xml
    e52982cbff0b0bb825461deb9af0411f72f2e4a2 2010090600 msys-binutils.xml

Index: msys-base.xml
===================================================================
RCS file: /cvsroot/mingw/mingw-dist/msys/msys-base.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** msys-base.xml	10 Jan 2011 22:01:29 -0000	1.6
--- msys-base.xml	5 Jun 2011 21:43:25 -0000	1.7
***************
*** 29,33 ****
      </package>
  
!     <package name="msys-base" class="virtual">
        <affiliate group="MSYS Base System" />
        <description lang="en" title="A Basic MSYS Installation (meta)">
--- 29,33 ----
      </package>
  
!     <package name="msys-base" alias="msys" class="virtual">
        <affiliate group="MSYS Base System" />
        <description lang="en" title="A Basic MSYS Installation (meta)">