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

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6716

Modified Files:
	ChangeLog.MSYS environ.cc fhandler.cc 
Log Message:

2006.04.27  Earnie Boyd <ea...@us...>

	* environ.cc: Add MUNGEPREFIX preprocessor variable.
	(_addenv): Use MUNGEPREFIX to conditionally add auto conversion of the
	"prefix" environment variable.
	(environ_init): Ditto.
	* fhandler.cc (fhandler_disk_file:open): Revert 2005.07.05
	Max T. Woodbury change.



Index: environ.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/environ.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** environ.cc	30 Mar 2005 00:45:38 -0000	1.11
--- environ.cc	27 Apr 2006 15:40:27 -0000	1.12
***************
*** 8,11 ****
--- 8,17 ----
  details. */
  
+ #ifndef MUNGEPREFIX
+ #define MUNGEPREFIX 0 // If not zero will cause environment variable named
+ 		      // "prefix" to be set to its win32 absolute value by 
+ 		      // default.
+ #endif
+ 
  #include "winsup.h"
  #include <errno.h>
***************
*** 223,228 ****
--- 229,236 ----
    char *p;
  
+ #if MUNGEPREFIX
    if (!strcmp (name, "prefix"))
      value = msys_p2w (value);
+ #endif
    unsigned int valuelen = strlen (value);
    if ((p = my_findenv (name, &offset)))
***************
*** 739,744 ****
--- 747,754 ----
        if (*newp == 'C' && strncmp (newp, "CYGWIN=", sizeof("CYGWIN=") - 1) == 0)
  	parse_options (newp + sizeof("CYGWIN=") - 1);
+ #if MUNGEPREFIX
        if (*newp == 'p' && strncmp (newp, "prefix=", 6) == 0)
  	_addenv ("prefix", newp + 6, 1);
+ #endif
        if (*eq && conv_start_chars[(unsigned char)envp[i][0]])
  	posify (envp + i, *++eq ? eq : --eq);

Index: fhandler.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/fhandler.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** fhandler.cc	6 Jul 2005 02:33:48 -0000	1.9
--- fhandler.cc	27 Apr 2006 15:40:27 -0000	1.10
***************
*** 1245,1253 ****
    set_name (path, real_path.get_win32 ());
    set_no_free_names (0);
!   int res = open (real_path, flags, mode);
!   if (!res && !iswinnt && !(flags & (O_WRONLY | O_RDWR)) &&
!       FILE_ATTRIBUTE_DIRECTORY & real_path.file_attributes ())
!     res = 1;
!   return res;
  }
  
--- 1245,1249 ----
    set_name (path, real_path.get_win32 ());
    set_no_free_names (0);
!   return open (real_path, flags, mode);
  }
  

Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** ChangeLog.MSYS	23 Apr 2006 13:01:56 -0000	1.82
--- ChangeLog.MSYS	27 Apr 2006 15:40:26 -0000	1.83
***************
*** 1,2 ****
--- 1,11 ----
+ 2006.04.27  Earnie Boyd <ea...@us...>
+ 
+ 	* environ.cc: Add MUNGEPREFIX preprocessor variable.
+ 	(_addenv): Use MUNGEPREFIX to conditionally add auto conversion of the
+ 	"prefix" environment variable.
+ 	(environ_init): Ditto.
+ 	* fhandler.cc (fhandler_disk_file:open): Revert 2005.07.05
+ 	Max T. Woodbury change.
+ 
  2006.04.23  Earnie Boyd <ea...@us...>
  

Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29017

Modified Files:
	ChangeLog.MSYS fhandler_console.cc fhandler_tty.cc path.cc 
	path.h spawn.cc syscalls.cc tty.cc window.cc 
Log Message:

2006.04.23  Earnie Boyd <ea...@us...>

	* fhandler_console.cc (set_console_state_for_spawn): Add FIXME.
	* fhandler_tty.cc (fhandler_tty_master::init): Reinstate code
	with FIXME.
	(fhandler_pty_master::hit_eof): Add Comment.
	(fhandler_tty_slave::read): Remove OutputDebugString.
	* path.cc (msys_p2w): Add explicit typing.
	(suffix_scan::): Reinstate previous code and conditionalize
	with NEW_SUFFIX_METHOD being defined.
	* path.h (suffix_scan::): Ditto.
	* spawn.cc (std_suffixes): Readd suffix_info "".
	* syscalls.cc (stat_suffixes): Ditto.
	(stat_worker): Add O_NOSYMLINK flag to fh.open.
	* tty.cc (create_tty_master): Reinstate.
	(tty_list::allocate_tty): Remove OutputDebugString. Reinstate call of
	create_tty_master.
	(tty::make_pipes): Remove SetConsoleMode for from_slave and to_slave
	with comment.
	* window.cc (Winmain): Remove ShowWindow, UpdateWindow and reinstate
	DispatchMessage instead of TranslateMessage with FIXME comment.




Index: path.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** path.h	30 Mar 2004 12:31:56 -0000	1.8
--- path.h	23 Apr 2006 13:01:56 -0000	1.9
***************
*** 191,196 ****
--- 191,200 ----
    const char *path;
    char *has (const char *, const suffix_info *);
+ #ifdef NEW_SUFFIX_METHOD
    void add(const char *);
    void del();
+ #else // *not* NEW_SUFFIX_METHOD
+   int next();
+ #endif // *not* NEW_SUFFIX_METHOD
    int lnk_match () {return nextstate >= SCAN_EXTRALNK;}
  };

Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/ChangeLog.MSYS,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** ChangeLog.MSYS	3 Oct 2005 19:14:58 -0000	1.81
--- ChangeLog.MSYS	23 Apr 2006 13:01:56 -0000	1.82
***************
*** 1,2 ****
--- 1,24 ----
+ 2006.04.23  Earnie Boyd <ea...@us...>
+ 
+ 	* fhandler_console.cc (set_console_state_for_spawn): Add FIXME.
+ 	* fhandler_tty.cc (fhandler_tty_master::init): Reinstate code
+ 	with FIXME.
+ 	(fhandler_pty_master::hit_eof): Add Comment.
+ 	(fhandler_tty_slave::read): Remove OutputDebugString.
+ 	* path.cc (msys_p2w): Add explicit typing.
+ 	(suffix_scan::): Reinstate previous code and conditionalize
+ 	with NEW_SUFFIX_METHOD being defined.
+ 	* path.h (suffix_scan::): Ditto.
+ 	* spawn.cc (std_suffixes): Readd suffix_info "".
+ 	* syscalls.cc (stat_suffixes): Ditto.
+ 	(stat_worker): Add O_NOSYMLINK flag to fh.open.
+ 	* tty.cc (create_tty_master): Reinstate.
+ 	(tty_list::allocate_tty): Remove OutputDebugString. Reinstate call of
+ 	create_tty_master.
+ 	(tty::make_pipes): Remove SetConsoleMode for from_slave and to_slave
+ 	with comment.
+ 	* window.cc (Winmain): Remove ShowWindow, UpdateWindow and reinstate
+ 	DispatchMessage instead of TranslateMessage with FIXME comment.
+ 
  2005.10.03  Earnie Boyd <ea...@us...>
  

Index: tty.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/tty.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tty.cc	13 May 2005 11:55:04 -0000	1.5
--- tty.cc	23 Apr 2006 13:01:56 -0000	1.6
***************
*** 72,76 ****
  
  // FIXME: create_tty_master doesn't appear to be called at all.
! #if 0
  void __stdcall
  create_tty_master (int ttynum)
--- 72,76 ----
  
  // FIXME: create_tty_master doesn't appear to be called at all.
! #if 1
  void __stdcall
  create_tty_master (int ttynum)
***************
*** 79,87 ****
    tty_master = (fhandler_tty_master *)
      cygheap->fdtab.build_fhandler (-1, FH_TTYM, "/dev/ttym", ttynum);
!   /*
    if (tty_master->init (ttynum))
      api_fatal ("Can't create master tty");
    else
!   */
      {
        /* Log utmp entry */
--- 79,87 ----
    tty_master = (fhandler_tty_master *)
      cygheap->fdtab.build_fhandler (-1, FH_TTYM, "/dev/ttym", ttynum);
! #if 1
    if (tty_master->init (ttynum))
      api_fatal ("Can't create master tty");
    else
! #endif
      {
        /* Log utmp entry */
***************
*** 306,312 ****
    if (with_console)
      {
-       OutputDebugString ("<with_console>");
        termios_printf ("console %x associated with tty%d", console, freetty);
!       //create_tty_master (freetty);
      }
    else
--- 306,313 ----
    if (with_console)
      {
        termios_printf ("console %x associated with tty%d", console, freetty);
! #if 1
!       create_tty_master (freetty);
! #endif
      }
    else
***************
*** 406,411 ****
--- 407,415 ----
    if (!SetNamedPipeHandleState (to_slave, &pipe_mode, NULL, NULL))
      termios_printf ("can't set to_slave to non-blocking mode");
+ #if 0
+   // Do these help? - Not that I have found.
    SetConsoleMode (from_slave, ENABLE_PROCESSED_OUTPUT | ENABLE_PROCESSED_INPUT);
    SetConsoleMode (to_slave, ENABLE_PROCESSED_OUTPUT | ENABLE_PROCESSED_INPUT);
+ #endif
    ptym->set_io_handle (from_slave);
    ptym->set_output_handle (to_slave);

Index: spawn.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/spawn.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** spawn.cc	13 May 2005 15:05:45 -0000	1.25
--- spawn.cc	23 Apr 2006 13:01:56 -0000	1.26
***************
*** 42,45 ****
--- 42,46 ----
  static suffix_info std_suffixes[] =
  {
+   suffix_info ("", 1),
    suffix_info (".exe", 1),
    suffix_info (NULL)

Index: window.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/window.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** window.cc	30 Apr 2004 12:42:49 -0000	1.5
--- window.cc	23 Apr 2006 13:01:56 -0000	1.6
***************
*** 112,119 ****
--- 112,127 ----
      }
  
+ #if 0
+   // I don't think these are needed.
+   ShowWindow (ourhwnd, SW_SHOW);
+   UpdateWindow (ourhwnd);
+ #endif
+ 
    /* Start the message loop. */
  
    while (GetMessage (&msg, ourhwnd, 0, 0) == TRUE)
      {
+       // FIXME: Should we use DispatchMessage instead of TranslateMessage.
+       //TranslateMessage (&msg);
        DispatchMessage (&msg);
      }

Index: fhandler_console.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/fhandler_console.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fhandler_console.cc	7 May 2005 00:47:47 -0000	1.5
--- fhandler_console.cc	23 Apr 2006 13:01:56 -0000	1.6
***************
*** 152,156 ****
  {
    TRACE_IN;
!   HANDLE hconin = CreateFileA ("CONIN$", GENERIC_READ, FILE_SHARE_WRITE | FILE_FLAG_NO_BUFFERING,
  			  &sec_none_nih, OPEN_EXISTING,
  			  FILE_ATTRIBUTE_NORMAL, NULL);
--- 152,158 ----
  {
    TRACE_IN;
!   // FIXME: Does using FILE_FLAG_NO_BUFFERING help or hurt or do nothing?
!   HANDLE hconin = CreateFileA ("CONIN$", GENERIC_READ, FILE_SHARE_WRITE,
!   //HANDLE hconin = CreateFileA ("CONIN$", GENERIC_READ, FILE_SHARE_WRITE | FILE_FLAG_NO_BUFFERING,
  			  &sec_none_nih, OPEN_EXISTING,
  			  FILE_ATTRIBUTE_NORMAL, NULL);
***************
*** 163,167 ****
      {
  #     define tc shared_console_info	/* ACK.  Temporarily define for use in TTYSETF macro */
!       SetConsoleMode (hconin, ENABLE_PROCESSED_INPUT);
        TTYSETF (RSTCONS);
  #     undef tc
--- 165,171 ----
      {
  #     define tc shared_console_info	/* ACK.  Temporarily define for use in TTYSETF macro */
!       // FIXME: Does *not* using ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT help, hurt or do nothing?
!       SetConsoleMode (hconin, ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT);
!       //SetConsoleMode (hconin, ENABLE_PROCESSED_INPUT);
        TTYSETF (RSTCONS);
  #     undef tc

Index: fhandler_tty.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/fhandler_tty.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** fhandler_tty.cc	13 May 2005 11:55:03 -0000	1.7
--- fhandler_tty.cc	23 Apr 2006 13:01:56 -0000	1.8
***************
*** 44,49 ****
  }
  
! /*
!  * This appears not to be needed.
  int
  fhandler_tty_master::init (int ntty)
--- 44,49 ----
  }
  
! #if 1
!  // FIXME: This appears not to be needed.
  int
  fhandler_tty_master::init (int ntty)
***************
*** 104,108 ****
    return 0;
  }
! */
  
  #ifdef DEBUGGING
--- 104,108 ----
    return 0;
  }
! #endif
  
  #ifdef DEBUGGING
***************
*** 256,259 ****
--- 256,263 ----
  fhandler_pty_master::process_slave_output (char *buf, size_t len, int pktmode_on)
  {
+   // The code for this function was refactored to remove GOTO.  Other things
+   // may have also changed in trying to resolve the PTY issue still ongoing.
+   // Should we be badly broken, I suggest starting with the the original code
+   // and refactor again to remove the GOTO.
    TRACETTY;
    size_t rlen;
***************
*** 696,700 ****
        if (!PeekNamedPipe (get_handle (), NULL, 0, NULL, &CharsInPipe, NULL))
  	{
- 	  OutputDebugString ("PeekNamedPipe Failed");
  	  termios_printf ("PeekNamedPipe failed, %E");
  	  _raise (SIGHUP);
--- 700,703 ----
***************
*** 707,711 ****
  	  if (ReadFile (get_handle (), buf, readlen, &CharsRead, NULL) == FALSE)
  	    {
- 	      OutputDebugString ("ReadFile Failed");
  	      termios_printf ("read failed, %E");
  	      _raise (SIGHUP);
--- 710,713 ----

Index: path.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/path.cc,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** path.cc	5 Sep 2004 16:13:21 -0000	1.46
--- path.cc	23 Apr 2006 13:01:56 -0000	1.47
***************
*** 2377,2380 ****
--- 2377,2381 ----
  }
  
+ #ifdef NEW_SUFFIX_METHOD
  char *
  suffix_scan::has (const char *in_path, const suffix_info *in_suffixes)
***************
*** 2408,2411 ****
--- 2409,2487 ----
  }
  
+ #else // *not* NEW_SUFFIX_METHOD
+ char *
+ suffix_scan::has (const char *in_path, const suffix_info *in_suffixes)
+ {
+   TRACE_IN;
+   nextstate = SCAN_BEG;
+   suffixes = suffixes_start = in_suffixes;
+ 
+   char *ext_here = strrchr (in_path, '.');
+   path = in_path;
+   eopath = strchr (path, '\0');
+ 
+   if (!ext_here)
+     goto noext;
+ 
+   if (suffixes)
+     {
+       /* Check if the extension matches a known extension */
+       for (const suffix_info *ex = in_suffixes; ex->name != NULL; ex++)
+ 	if (strcasematch (ext_here, ex->name))
+ 	  {
+ 	    nextstate = SCAN_JUSTCHECK;
+ 	    suffixes = NULL;	/* Has an extension so don't scan for one. */
+ 	    goto done;
+ 	  }
+     }
+ 
+  noext:
+   ext_here = eopath;
+ 
+  done:
+   return ext_here;
+ }
+ 
+ int
+ suffix_scan::next ()
+ {
+   TRACE_IN;
+   if (suffixes)
+     {
+       while (suffixes && suffixes->name)
+ 	if (!suffixes->addon)
+ 	  suffixes++;
+ 	else
+ 	  {
+ 	    strcpy (eopath, suffixes->name);
+ 	    suffixes++;
+ 	    return 1;
+ 	  }
+       suffixes = NULL;
+     }
+ 
+   switch (nextstate)
+     {
+     case SCAN_BEG:
+       suffixes = suffixes_start;
+       if (!suffixes)
+ 	nextstate = SCAN_JUSTCHECK;
+       else
+ 	{
+ 	  if (!*suffixes->name)
+ 	    suffixes++;
+ 	  nextstate = SCAN_DONE;
+ 	}
+       return 1;
+     case SCAN_JUSTCHECK:
+       nextstate = SCAN_DONE;
+       return 1;
+     default:
+       *eopath = '\0';
+       return 0;
+     }
+ }
+ #endif // *not* NEW_SUFFIX_METHOD
+ 
  /* Check if PATH is a symlink.  PATH must be a valid Win32 path name.
  
***************
*** 2425,2428 ****
--- 2501,2505 ----
     stored into BUF if PATH is a symlink.  */
  
+ #ifdef NEW_SUFFIX_METHOD
  int
  symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt)
***************
*** 2472,2475 ****
--- 2549,2603 ----
    return 0;
  }
+ #else // *not* NEW_SUFFIX_METHOD
+ int
+ symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt)
+ {
+   TRACE_IN;
+   HANDLE h = (HANDLE)NULL;
+   int res = 0;
+   suffix_scan suffix;
+   contents[0] = '\0';
+ 
+   debug_printf("path: %s", path);
+ 
+   is_symlink = TRUE;
+   ext_here = suffix.has (path, suffixes);
+   extn = ext_here - path;
+ 
+   pflags &= ~PATH_SYMLINK;
+ 
+   case_clash = FALSE;
+ 
+   while (suffix.next ())
+     {
+       error = 0;
+       fileattr = GetFileAttributesA (suffix.path);
+       if (fileattr == (DWORD) -1)
+ 	{
+ 	  /* The GetFileAttributesA call can fail for reasons that don't
+ 	     matter, so we just return 0.  For example, getting the
+ 	     attributes of \\HOST will typically fail.  */
+ 	  debug_printf ("GetFileAttributesA (%s) failed", suffix.path);
+ 	  error = geterrno_from_win_error (GetLastError (), EACCES);
+ 	  continue;
+ 	}
+ 
+ 
+       ext_tacked_on = !!*ext_here;
+ 
+       is_symlink = FALSE;
+       syscall_printf ("not a symlink");
+       res = 0;
+       break;
+     }
+ 
+   if (h != INVALID_HANDLE_VALUE)
+       CloseHandle(h);
+   syscall_printf ("%d = symlink.check (%s, %p) (%p)",
+ 		  res, suffix.path, contents, pflags);
+   return res;
+ }
+ 
+ #endif // *not* NEW_SUFFIX_METHOD
  
  /* Check the correct case of the last path component (given in DOS style).
***************
*** 3161,3165 ****
  	      char *tpath = strchr(&spath[1], '"');
  	      if (tpath)
! 		*tpath = NULL;
  	      char *swin32_path = msys_p2w (&spath[1]);
  	      if (swin32_path == &spath[1])
--- 3289,3293 ----
  	      char *tpath = strchr(&spath[1], '"');
  	      if (tpath)
! 		*tpath = (char)NULL;
  	      char *swin32_path = msys_p2w (&spath[1]);
  	      if (swin32_path == &spath[1])
***************
*** 3186,3190 ****
  	      char *tpath = strchr(&spath[1], '\'');
  	      if (tpath)
! 		*tpath = NULL;
  	      char *swin32_path = msys_p2w (&spath[1]);
  	      if (swin32_path == &spath[1])
--- 3314,3318 ----
  	      char *tpath = strchr(&spath[1], '\'');
  	      if (tpath)
! 		*tpath = (char)NULL;
  	      char *swin32_path = msys_p2w (&spath[1]);
  	      if (swin32_path == &spath[1])

Index: syscalls.cc
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/syscalls.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** syscalls.cc	2 Jul 2005 23:52:42 -0000	1.12
--- syscalls.cc	23 Apr 2006 13:01:56 -0000	1.13
***************
*** 1052,1055 ****
--- 1052,1056 ----
  suffix_info stat_suffixes[] =
  {
+   suffix_info ("", 1),
    suffix_info (".exe", 1),
    suffix_info (NULL)
***************
*** 1103,1107 ****
  	&& dtype != DRIVE_UNKNOWN)))
      {
!       oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN, 0);
        /* If we couldn't open the file, try a "query open" with no permissions.
  	 This will allow us to determine *some* things about the file, at least. */
--- 1104,1108 ----
  	&& dtype != DRIVE_UNKNOWN)))
      {
!       oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN | O_NOSYMLINK, 0);
        /* If we couldn't open the file, try a "query open" with no permissions.
  	 This will allow us to determine *some* things about the file, at least. */
***************
*** 1109,1113 ****
  	{
  	  fh.set_query_open (TRUE);
! 	  oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN, 0);
  	}
        /* Check a special case here. If ntsec is ON it happens
--- 1110,1114 ----
  	{
  	  fh.set_query_open (TRUE);
! 	  oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN | O_NOSYMLINK, 0);
  	}
        /* Check a special case here. If ntsec is ON it happens
***************
*** 1121,1125 ****
  	{
  	  set_file_attribute (TRUE, real_path, 0400);
! 	  oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN, 0);
  	  set_file_attribute (TRUE, real_path.get_win32 (), 0);
  	}
--- 1122,1126 ----
  	{
  	  set_file_attribute (TRUE, real_path, 0400);
! 	  oret = fh.open (real_path, O_RDONLY | O_BINARY | O_DIROPEN | O_NOSYMLINK, 0);
  	  set_file_attribute (TRUE, real_path.get_win32 (), 0);
  	}

Update of /cvsroot/mingw/portmaker
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31502

Modified Files:
	ChangeLog 
Log Message:
	* lib/mingwPORT.functions: Add comments to document function usage.
	(win32path, pref, perform, require, action, step, die): New functions.
	(ask): Add optional `QueryMark' argument; force expansion of possible
	shell variables specified in reply.

	* src/portmaker.sh (ask): Use `QueryMark' feature.
	
	* template/mingwPORT.help, template/mingwPORT.messages: New files.
	
	* template/mingwPORT.getopts: New file.
	(CLEAN_UP_ON_EXIT): Defined.
	
	* template/Makefile (template_SOURCES): Add above three new files.

	* template/mingwPORT.sh (mingwPORT.functions): Use new functions.
	(mingwPORT): New shell variable; define and use it.
	(mingwPORT.help, mingwPORT.messages, mingwPORT.getopts): Source them.
	(mingwPORT.site): New site customisation hook; source preferentially.
	(CLEANUP_ON_EXIT): Eval it.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/portmaker/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChangeLog	8 Apr 2006 17:47:13 -0000	1.5
--- ChangeLog	21 Apr 2006 19:26:05 -0000	1.6
***************
*** 1,2 ****
--- 1,24 ----
+ 2006-04-21  Keith Marshall  <kei...@us...>
+ 
+ 	* lib/mingwPORT.functions: Add comments to document function usage.
+ 	(win32path, pref, perform, require, action, step, die): New functions.
+ 	(ask): Add optional `QueryMark' argument; force expansion of possible
+ 	shell variables specified in reply.
+ 
+ 	* src/portmaker.sh (ask): Use `QueryMark' feature.
+ 	
+ 	* template/mingwPORT.help, template/mingwPORT.messages: New files.
+ 	
+ 	* template/mingwPORT.getopts: New file.
+ 	(CLEAN_UP_ON_EXIT): Defined.
+ 	
+ 	* template/Makefile (template_SOURCES): Add above three new files.
+ 
+ 	* template/mingwPORT.sh (mingwPORT.functions): Use new functions.
+ 	(mingwPORT): New shell variable; define and use it.
+ 	(mingwPORT.help, mingwPORT.messages, mingwPORT.getopts): Source them.
+ 	(mingwPORT.site): New site customisation hook; source preferentially.
+ 	(CLEANUP_ON_EXIT): Eval it.
+ 
  2006-04-08  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/portmaker/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31502/template

Modified Files:
	Makefile mingwPORT.sh 
Added Files:
	mingwPORT.getopts mingwPORT.help mingwPORT.messages 
Log Message:
	* lib/mingwPORT.functions: Add comments to document function usage.
	(win32path, pref, perform, require, action, step, die): New functions.
	(ask): Add optional `QueryMark' argument; force expansion of possible
	shell variables specified in reply.

	* src/portmaker.sh (ask): Use `QueryMark' feature.
	
	* template/mingwPORT.help, template/mingwPORT.messages: New files.
	
	* template/mingwPORT.getopts: New file.
	(CLEAN_UP_ON_EXIT): Defined.
	
	* template/Makefile (template_SOURCES): Add above three new files.

	* template/mingwPORT.sh (mingwPORT.functions): Use new functions.
	(mingwPORT): New shell variable; define and use it.
	(mingwPORT.help, mingwPORT.messages, mingwPORT.getopts): Source them.
	(mingwPORT.site): New site customisation hook; source preferentially.
	(CLEANUP_ON_EXIT): Eval it.


--- NEW FILE: mingwPORT.messages ---
# mingwPORT.messages
# Required.  Message strings used by mingwPORT.

CMD=`echo $0 | sed 's?.*[\\/]??'`

MSG_EARGV="unexpected argument."
MSG_ENOOPT="unknown option:"
MSG_EAMBIG="ambiguous option:"
MSG_ENOENT="required file not found."
MSG_EACCESS="cannot access file."

# $RCSfile: mingwPORT.messages,v $: end of file: vim: ft=sh

Index: mingwPORT.sh
===================================================================
RCS file: /cvsroot/mingw/portmaker/template/mingwPORT.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mingwPORT.sh	3 Apr 2005 19:45:22 -0000	1.1
--- mingwPORT.sh	21 Apr 2006 19:26:08 -0000	1.2
***************
*** 1,67 ****
  #! /bin/sh
! # mingwPORT.template
! # Required but name changed to reflect package ported.
! # Used to execute commands to build the ported package.
  
  CURDIR=`pwd`
  
! . ${CURDIR}/mingwPORT.functions
  
! if [ -f ${CURDIR}/mingwPORT.ini ]
! then
!   . ${CURDIR}/mingwPORT.ini
! fi
  
! if [ -f ${CURDIR}/mingwPORT.question ]
! then
!   if [ -f ${CURDIR}/mingwPORT.beforequestion ]
!   then
!     . ${CURDIR}/mingwPORT.beforequestion
!   fi
  
!   . ${CURDIR}/mingwPORT.question
  
!   if [ -f ${CURDIR}/mingwPORT.afterquestion ]
!   then
!     . ${CURDIR}/mingwPORT.afterquestion
!   fi
! fi
  
! if [ -f ${CURDIR}/mingwPORT.exports ]
! then
!   . ${CURDIR}/mingwPORT.exports
! fi
  
! if [ -f ${CURDIR}/mingwPORT.patch ]
! then
!   if [ -f ${CURDIR}/mingwPORT.beforepatch ]
!   then
!    . ${CURDIR}/mingwPORT.beforepatch ]
!   fi
  
!   patch -t $PATCHFLAGS < ${CURDIR}/mingwPORT.patch
  
!   if [ -f ${CURDIR}/mingwPORT.afterpatch ]
!   then
!    . ${CURDIR}/mingwPORT.afterpatch ]
!   fi
! fi
  
! if [ -f ${CURDIR}/mingwPORT.beforeconfigure ]
! then
!     . ${CURDIR}/mingwPORT.beforeconfigure
! fi
! if [ -z "$BUILDDIR" ]
! then
!   BUILDDIR=bld
! fi
  
! if [ -z "$SRCDIR" ]
  then
!   SRCDIR=`pwd`
  fi
! cd $SRCDIR
! ABSSRCDIR=`pwd`
! cd $CURDIR
  
  if [ ! -d ${BUILDDIR} ]
--- 1,48 ----
  #! /bin/sh
! # mingwPORT.sh
! # Required.  Used to execute commands to build the ported package.
  
  CURDIR=`pwd`
+ mingwPORT="${CURDIR}/mingwPORT"
  
! # Load mingwPORT function library and message catalogue,
! # and parse any options specified on the command line.
  
! . "$mingwPORT.functions"
! . "$mingwPORT.messages"
! . "$mingwPORT.getopts"
  
! # Initialise the target package configuration.
  
! pref "$mingwPORT.ini"
  
! # Apply any `mingwPORT.site' customisations, as specified
! # in any of the standard site configuration directories.
  
! pref "/etc/mingwPORT/mingwPORT.site"
! pref "/usr/lib/mingwPORT/mingwPORT.site"
! pref "/usr/local/lib/mingwPORT/mingwPORT.site"
! pref "$HOME/.mingwPORT/mingwPORT.site"
  
! perform action question
  
! cd ${CURDIR}
  
! pref "$mingwPORT.exports"
  
! [ -z "$SRCDIR" ] && SRCDIR=`pwd` || eval SRCDIR=\"$SRCDIR\"
! ABSSRCDIR=`cd $SRCDIR >/dev/null 2>&1; pwd`
  
! if [ -f $mingwPORT.patch ]
  then
!   pref $mingwPORT.beforepatch
! 
!   eval sed \"${PATCHFILTER-"s/x/x/"}\" $mingwPORT.patch \
!   | patch -t -N $PATCHFLAGS 
! 
!   pref $mingwPORT.afterpatch
  fi
! 
! [ -z "$BUILDDIR" ] && BUILDDIR=bld
  
  if [ ! -d ${BUILDDIR} ]
***************
*** 76,113 ****
  ABSBUILDDIR=`pwd`
  
! . ${CURDIR}/mingwPORT.configure
! 
! if [ -f ${CURDIR}/mingwPORT.afterconfigure ]
! then
!     . ${CURDIR}/mingwPORT.afterconfigure
! fi
! 
! if [ -f ${CURDIR}/mingwPORT.beforemake ]
! then
!   . ${CURDIR}/mingwPORT.beforemake
! fi
! 
! . ${CURDIR}/mingwPORT.make
! 
! if [ -f ${CURDIR}/mingwPORT.aftermake ]
! then
!   . ${CURDIR}/mingwPORT.aftermake
! fi
! 
! if [ -f ${CURDIR}/mingwPORT.beforeinsall ]
! then
!   . ${CURDIR}/mingwPORT.beforeinstall
! fi
! 
! . ${CURDIR}/mingwPORT.install
! 
! if [ -f ${CURDIR}/mingwPORT.afterinstall ]
! then
!   . ${CURDIR}/mingwPORT.afterinstall
! fi
  
  cd ${CURDIR}
  
! . ${CURDIR}/mingwPORT.cleanup
  
! # end of port
--- 57,67 ----
  ABSBUILDDIR=`pwd`
  
! require action configure
! require action make
! require action install
  
  cd ${CURDIR}
  
! eval ${CLEANUP_ON_EXIT}
  
! # $RCSfile$: end of file: vim: ft=sh

Index: Makefile
===================================================================
RCS file: /cvsroot/mingw/portmaker/template/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	26 Jun 2005 11:51:19 -0000	1.1
--- Makefile	21 Apr 2006 19:26:08 -0000	1.2
***************
*** 18,24 ****
--- 18,27 ----
  	mingwPORT.configure \
  	mingwPORT.exports \
+ 	mingwPORT.getopts \
+ 	mingwPORT.help \
  	mingwPORT.ini \
  	mingwPORT.install \
  	mingwPORT.make \
+ 	mingwPORT.messages \
  	mingwPORT.patch \
  	mingwPORT.question \

--- NEW FILE: mingwPORT.help ---
# mingwPORT.help
# Required.  Display summary info, for the `--help' and `--version' options.

PACKAGE=@PACKAGE_NAME@
VERSION=@PACKAGE_VERSION@
PORTMAKER=@PORTMAKER@

pref ${mingwPORT}.ini

cat << ETX
mingwPORT installer for $PACKAGE-$VERSION
ETX

test opt${matched} = opt--version && cat << ETX

mingwPORT and portmaker are free software packages.  They are distributed
in the hope that they may be useful, but WITHOUT WARRANTY OF ANY KIND, not
even an implied WARRANTY OF MERCHANTABILITY, nor of FITNESS FOR PURPOSE.

The authors of mingwPORT and portmaker accept NO LIABILITY for DAMAGE of
ANY KIND, resulting from the use of this software.

The software package which is installed by this mingwPORT is subject to
its own licensing terms.  Please refer to the source for the installed
package, for details of its licensing and distribution conditions.

ETX

test opt${matched} = opt--help && cat << ETX

Usage: ./mingwPORT.sh [--option ...]

Options:
   Processed strictly in left to right order.  Where two conflicting options
   are specified, the last one interpreted overrides.  Each option name may
   be abbreviated to its shortest unambiguous initial substring.

   --help               Display this help summary, and exit.

   --version            Display the identification notice for this
                        mingwPORT, and exit.

   --info               Display the package resources referenced while
                        installing this mingwPORT, and exit.

   --cleanup            Delete all uninstalled files created by this
                        mingwPORT, on completion.  (This is the default).

   --no-cleanup         Suppress the normal cleanup action on completion.

Environment:
   The following environment variable may be defined, and exported, to set
   up the user's preferred behaviour for mingwPORT.

   MINGWPORT            Declares any of the above options, as a space
                        separated list, which the user would like to be
                        passed to mingwPORT as defaults.  By default,
                        mingwPORT behaves as if MINGWPORT="--cleanup" is
                        exported.  Options set on the command line will
                        override settings specified in MINGWPORT.

ETX

test opt${matched} = opt--info && cat << ETX

Project Home URL:       $ARCHIVEHOME
Download URL:           $DOWNLOADURI
Download File:          $ARCHIVEFILE.$ARCHIVETYPE

Installation Root:      $PREFIX

ETX

exit 0

# mingwPORT.help: end of file
# vim: ft=sh

--- NEW FILE: mingwPORT.getopts ---
# mingwPORT.getopts
# Required.  Establish optional behaviour set from command line.

OPTIONS="help info version"
TOGGLES="cleanup"

DEFAULT="--cleanup"

for argv in ${DEFAULT} ${MINGWPORT} "$@"
do
  case ${argv} in

    # Option arguments...
    #
    -*)
      # Attempt to identify a match to a defined option name,
      # treating all as GNU style long form options, and allowing
      # for abbreviations, but rejecting ambiguities.
      #
      arg=${argv} match=""
      case ${arg} in --*) ;; -*) arg=-${arg} ;; esac
      for opt in ${OPTIONS} ${TOGGLES}
      do
	case --${opt} in ${arg}*) match=${match}--${opt} ;; esac
      done
      for opt in ${TOGGLES}
      do
	case --no-${opt} in ${arg}*) match=${match}--no-${opt} ;; esac
      done

      case ${match} in

	--help | --info | --version) . ${mingwPORT}.help ;;

	--cleanup)     CLEANUP_ON_EXIT=". '${mingwPORT}.cleanup'" ;;
	--no-cleanup)  CLEANUP_ON_EXIT=": '${mingwPORT}.cleanup'" ;;

	--*) die getopts "${MSG_EAMBIG} ${argv}" ;;
	*)   die getopts "${MSG_ENOOPT} ${argv}" ;;

      esac ;;

    # Assignment arguments...
    #
    *=*)
      # Simply add these to the environment,
      # to be passed to the build process.
      #
      eval export \"${argv}\" ;;

    # Anything else is invalid...
    #
    *) die getopts "${argv}: ${MSG_EARGV}" ;;

  esac
done

# $RCSfile: mingwPORT.getopts,v $: end of file: vim: ft=sh

Update of /cvsroot/mingw/portmaker/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31502/src

Modified Files:
	portmaker.sh 
Log Message:
	* lib/mingwPORT.functions: Add comments to document function usage.
	(win32path, pref, perform, require, action, step, die): New functions.
	(ask): Add optional `QueryMark' argument; force expansion of possible
	shell variables specified in reply.

	* src/portmaker.sh (ask): Use `QueryMark' feature.
	
	* template/mingwPORT.help, template/mingwPORT.messages: New files.
	
	* template/mingwPORT.getopts: New file.
	(CLEAN_UP_ON_EXIT): Defined.
	
	* template/Makefile (template_SOURCES): Add above three new files.

	* template/mingwPORT.sh (mingwPORT.functions): Use new functions.
	(mingwPORT): New shell variable; define and use it.
	(mingwPORT.help, mingwPORT.messages, mingwPORT.getopts): Source them.
	(mingwPORT.site): New site customisation hook; source preferentially.
	(CLEANUP_ON_EXIT): Eval it.


Index: portmaker.sh
===================================================================
RCS file: /cvsroot/mingw/portmaker/src/portmaker.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** portmaker.sh	8 Apr 2006 17:47:14 -0000	1.4
--- portmaker.sh	21 Apr 2006 19:26:08 -0000	1.5
***************
*** 10,30 ****
  . ${LIBDIR}/mingwPORT.functions
  
! ask "PACKAGE" "" PACKAGE
! ask "VERSION" "" VERSION
! ask "ARCHIVETYPE" "tar.gz" ARCHIVETYPE
! ask "ARCHIVEFILE" "$PACKAGE-$VERSION.$ARCHIVETYPE" ARCHIVEFILE
! ask "ARCHIVEHOME" "http://www.${PACKAGE}.org" ARCHIVEHOME
! ask "ARCHIVEPATH" "/tmp" ARCHIVEPATH
! ask "DOWNLOADURI" "http://ftp.gnu.org/gnu/$PACKAGE" DOWNLOADURI
! ask "SRCDIR" "/usr/src/${PACKAGE}-${VERSION}" SRCDIR
! ask "BUILDDIR" "./bld" BUILDDIR
! ask "PREFIX" "/mingw" PREFIX
! ask "CFLAGS" "-O3 -s -mms-bitfields -march=\\\`uname -m\\\`" CFLAGS
! ask "CXXFLAGS" "\\\$CFLAGS" CXXFLAGS
  
! PORTPATH=${SRCDIR}/mingwPORT
! ask "PORTPATH" "$PORTPATH" PORTPATH
  
- eval PORTPATH=\"$PORTPATH\"
  [ -d "$PORTPATH" ] || mkdir -p "$PORTPATH"
  cat <<EOD>$PORTPATH/mingwPORT.ini
--- 10,29 ----
  . ${LIBDIR}/mingwPORT.functions
  
! ask "PACKAGE" "" PACKAGE \?
! ask "VERSION" "" VERSION \?
! ask "ARCHIVETYPE" "tar.gz" ARCHIVETYPE \?
! ask "ARCHIVEFILE" "$PACKAGE-$VERSION.$ARCHIVETYPE" ARCHIVEFILE \?
! ask "ARCHIVEHOME" "http://www.${PACKAGE}.org" ARCHIVEHOME \?
! ask "ARCHIVEPATH" "/tmp" ARCHIVEPATH \?
! ask "DOWNLOADURI" "http://ftp.gnu.org/gnu/$PACKAGE" DOWNLOADURI \?
! ask "SRCDIR" "\$HOME/src/${PACKAGE}-${VERSION}" SRCDIR \?
! ask "BUILDDIR" "./bld" BUILDDIR \?
! ask "PREFIX" "/mingw" PREFIX \?
! ask "CFLAGS" "-O3 -s -mms-bitfields -march=\\\`uname -m\\\`" CFLAGS \?
! ask "CXXFLAGS" "\\\$CFLAGS" CXXFLAGS \?
  
! eval PORTPATH=\"${SRCDIR}/mingwPORT\"
! ask "PORTPATH" "$PORTPATH" PORTPATH \?
  
  [ -d "$PORTPATH" ] || mkdir -p "$PORTPATH"
  cat <<EOD>$PORTPATH/mingwPORT.ini
***************
*** 43,46 ****
--- 42,48 ----
  EOD
  cat ${TMPLDIR}/mingwPORT.README | sed -e "s@\[PACKAGEFILE\]@${ARCHIVEFILE}@" -e "s@\[PACKAGEHOME\]@${ARCHIVEHOME}@" > $PORTPATH/mingwPORT.README
+ cp ${TMPLDIR}/mingwPORT.help $PORTPATH
+ cp ${TMPLDIR}/mingwPORT.messages $PORTPATH
+ cp ${TMPLDIR}/mingwPORT.getopts $PORTPATH
  cp ${TMPLDIR}/mingwPORT.question $PORTPATH
  cp ${TMPLDIR}/mingwPORT.afterquestion $PORTPATH

Update of /cvsroot/mingw/portmaker/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31502/lib

Modified Files:
	mingwPORT.functions 
Log Message:
	* lib/mingwPORT.functions: Add comments to document function usage.
	(win32path, pref, perform, require, action, step, die): New functions.
	(ask): Add optional `QueryMark' argument; force expansion of possible
	shell variables specified in reply.

	* src/portmaker.sh (ask): Use `QueryMark' feature.
	
	* template/mingwPORT.help, template/mingwPORT.messages: New files.
	
	* template/mingwPORT.getopts: New file.
	(CLEAN_UP_ON_EXIT): Defined.
	
	* template/Makefile (template_SOURCES): Add above three new files.

	* template/mingwPORT.sh (mingwPORT.functions): Use new functions.
	(mingwPORT): New shell variable; define and use it.
	(mingwPORT.help, mingwPORT.messages, mingwPORT.getopts): Source them.
	(mingwPORT.site): New site customisation hook; source preferentially.
	(CLEANUP_ON_EXIT): Eval it.


Index: mingwPORT.functions
===================================================================
RCS file: /cvsroot/mingw/portmaker/lib/mingwPORT.functions,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mingwPORT.functions	12 Sep 2005 19:49:00 -0000	1.2
--- mingwPORT.functions	21 Apr 2006 19:26:06 -0000	1.3
***************
*** 2,15 ****
  # Required.  Shell functions used by mingwPORT.
  
! # ask "User prompt" "Default response" VariableToStoreResponse
! function ask() {
!   echo -n "$1 "
!   [ -n "$2" ] && echo -n "($2) "
!   read $3
!   [ -z "$(eval echo \${$3\})" ] && eval $3=\"$2\"
  }
  
! # isyes $variable
! function isyes() {
    case $1 in
      [Yy] | [Yy][Ee] | [Yy][Ee][Ss]) true ;;
--- 2,26 ----
  # Required.  Shell functions used by mingwPORT.
  
! ask()
! # usage: ask "User prompt" "Default response" ResponseVar [QueryMark]
! #
! # Display "User prompt", then wait for user's response, assigning it
! # to `ResponseVar'; if user enters nothing, then substitute the default
! # assignment `ResponseVar="Default response"'.
! #
! # If "Default response" is non-null, it is appended to "User prompt",
! # generating a prompt of the form `User prompt (Default response)';
! # if `QueryMark' is specified, it is appended to the displayed prompt.
! {
!   echo -n "$1"; [ -n "$2" ] && echo -n " ($2)"; echo -n "$4 "; read $3
!   eval '[ -z "$'$3'" ] && '$3'=$2 || '$3'=`eval echo "$'$3'"`'
  }
  
! isyes()
! # usage: isyes $variable
! #
! # Test the value stored in $variable for a case insensitive match to
! # the string "yes", or any abbreviated form thereof.
! {
    case $1 in
      [Yy] | [Yy][Ee] | [Yy][Ee][Ss]) true ;;
***************
*** 17,18 ****
--- 28,125 ----
    esac
  }
+ 
+ win32path()
+ # usage: Win32PathName=`win32path "/MSYS/PathName"`
+ #
+ # Determine the native Win32 path name equivalent for the POSIX style
+ # "/MSYS/PathName";  (CAVEAT:  the specified "/MSYS/PathName" *must*
+ # reference an existing *directory* on the MSYS or POSIX host).
+ {
+   2>/dev/null cd $1; pwd -W
+ }
+ 
+ pref()
+ # usage: pref "OptionallySourcedCommandFile" [OptionalArguments [...]]
+ #
+ # Source a `preferential' configuration overlay script, *if* the named
+ # "OptionallySourcedCommandFile" has been provided.  If the named script
+ # is not present, then this function silently does nothing.
+ #
+ # If any "OptionalArguments" are specified, then they will be available
+ # as command line arguments, within the scope of execution of the named
+ # "OptionallySourcedCommandFile".
+ {
+   [ -f "$1" ] && . "$@"
+ }
+ 
+ perform()
+ # usage: perform Action OptionalStep
+ #
+ # If a file "mingwPORT.OptionalStep" exists, then source it according
+ # to the designated strategy for the specified Action.  The supported
+ # Action keywords, and their effects are:
+ #
+ #  step    simply source the "mingwPORT.OptionalStep" file.
+ #
+ #  action  if the additional file "mingwPORT.beforeOptionalStep" exists,
+ #          then source it first;  then source "mingwPORT.OptionalStep";
+ #          finally, if "mingwPORT.afterOptionalStep" exists, source it.
+ #
+ # If any "OptionalArguments" are specified, then they will be available
+ # as command line arguments, within the scope of execution of all files
+ # sourced by this function call.
+ {
+   [ -f "$mingwPORT.$2" ] && "$@"
+ }
+ 
+ require()
+ # usage: require Action RequiredStep
+ #
+ # If the file "mingwPORT.RequiredStep" exists, and is readable, then
+ # this function sources it, exactly analogously to the `perform' function,
+ # in accordance with identical strategies specified by the Action keyword;
+ # otherwise, this function causes the mingwPORT to issue an appropriate
+ # diagnostic message, and abort.
+ {
+   [ -f "$mingwPORT.$2" ] || die $2 "$MSG_ENOENT"
+   [ -r "$mingwPORT.$2" ] || die $2 "$MSG_EACCESS"
+   "$@"
+ }
+ 
+ step()
+ # usage: step ModuleName
+ #
+ # Source the file "mingwPORT.ModuleName"; this is the function dispatcher
+ # invoked when either `perform' or `require' is called with Action = step.
+ {
+   . "$mingwPORT.$@"
+ }
+ 
+ action()
+ # usage: action StepWithOptionalWrapperActions
+ #
+ # If file "mingwPORT.beforeStepWithOptionalWrapperActions" exists, then
+ # source it; then source "mingwPORT.StepWithOptionalWrapperActions"; and
+ # finally, if file "mingwPORT.afterStepWithOptionalWrapperActions" exists,
+ # source it; this is the function dispatcher invoked when either `perform'
+ # or `require' is called with Action = action.
+ {
+   pref "$mingwPORT.before$@"
+   . "$mingwPORT.$@"
+   pref "$mingwPORT.after$@"
+ }
+ 
+ die()
+ # usage: die ModuleName "Message Saying Why"
+ #
+ # Display a diagnostic message, and cause the mingwPORT to abort; this
+ # is the function dispatcher invoked by `require', when the specified
+ # "mingwPORT.ModuleName" file cannot be sourced; it may also be invoked
+ # directly from any sourced "mingwPORT.ModuleName" file, to diagnose
+ # any fatal condition.
+ {
+   echo >&2 "$CMD:mingwPORT.$1: $2"
+   exit 1
+ }
+ 
+ # $RCSfile$: end of file: vim: ft=sh

Update of /cvsroot/mingw/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24649

Modified Files:
      Tag: DVLPR-BRANCH
	bugs.shtml docs.shtml download.shtml history.shtml 
	licensing.shtml links.shtml lists.shtml mingwfaq.shtml 
	msys.shtml 
Log Message:
XHTML 1.0 compliance reached

Index: licensing.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/licensing.shtml,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** licensing.shtml	21 Nov 2005 15:10:18 -0000	1.11
--- licensing.shtml	11 Apr 2006 07:40:13 -0000	1.11.2.1
***************
*** 1,15 ****
! <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
! 	<title>MinGW - Licensing Terms</title>
! </head>
  
  <body>
- <span style="visibility: hidden;">.</span>
- 
  <!--#include virtual="ssi/header.html" -->
  
--- 1,16 ----
! <!DOCTYPE html 
!      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
!   <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
!     <link rel="stylesheet" type="text/css" href="mingw.css" />
  
+     <title>MinGW - Licensing Terms</title>
+   </head>
+   
  <body>
  <!--#include virtual="ssi/header.html" -->
  
***************
*** 17,21 ****
  
  
! <div id="Content">
  <h1>MinGW - Licensing Terms</h1>
  <p>Various pieces distributed with MinGW come with its own copyright and
--- 18,22 ----
  
  
! <div id="mainContent">
  <h1>MinGW - Licensing Terms</h1>
  <p>Various pieces distributed with MinGW come with its own copyright and

Index: msys.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/msys.shtml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** msys.shtml	2 Aug 2005 14:27:35 -0000	1.13
--- msys.shtml	11 Apr 2006 07:40:13 -0000	1.13.2.1
***************
*** 1,21 ****
! <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html>
    <head>
!     <meta name="generator" content="HTML Tidy, see www.w3.org">
!     <meta name="description" content=
!     "Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!     <meta name="keywords" content=
!     "mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
!     <link rel="stylesheet" type="text/css" href="mingw.css">
! 
      <title>MinGW - Minimal SYStem</title>
    </head>
  
    <body>
-     <span style="visibility: hidden;">.</span> 
      <!--#include virtual="ssi/header.html" -->
      <!--#include virtual="ssi/lside.html" -->
  
!     <div id="Content">
        <h1>MinGW - Minimal SYStem</h1>
  
--- 1,19 ----
! <!DOCTYPE html 
!      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
    <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
!     <link rel="stylesheet" type="text/css" href="mingw.css" />
      <title>MinGW - Minimal SYStem</title>
    </head>
  
    <body>
      <!--#include virtual="ssi/header.html" -->
      <!--#include virtual="ssi/lside.html" -->
  
!     <div id="mainContent">
        <h1>MinGW - Minimal SYStem</h1>
  

Index: docs.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/docs.shtml,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -C2 -d -r1.28 -r1.28.2.1
*** docs.shtml	6 Apr 2005 11:07:07 -0000	1.28
--- docs.shtml	11 Apr 2006 07:40:13 -0000	1.28.2.1
***************
*** 1,14 ****
! <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
  	<title>MinGW - Documentation</title>
  </head>
  
  <body>
- <span style="visibility: hidden;">.</span>
  
  <!--#include virtual="ssi/header.html" -->
--- 1,15 ----
! <!DOCTYPE html 
!      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
!   <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
!     <link rel="stylesheet" type="text/css" href="mingw.css" />
  	<title>MinGW - Documentation</title>
  </head>
  
  <body>
  
  <!--#include virtual="ssi/header.html" -->
***************
*** 17,25 ****
  
  
! <div id="Content">
! <h1>MinGW - Documentation</h1>
! <p>
!          <a name="index"></a>
!          <h2 align="left">Table of Contents</h2>
  	
           <ul>
--- 18,24 ----
  
  
! <div id="mainContent">
!     <h1>MinGW - Documentation</h1>
!          <h2 id="index">Table of Contents</h2>
  	
           <ul>
***************
*** 31,36 ****
           </ul>
           <hr />
!          <a name="installation"></a>
!          <h2 align="left">Installing MinGW</h2>
           <p>
              For now, installation information can be found on the 
--- 30,34 ----
           </ul>
           <hr />
!          <h2 id="installation">Installing MinGW</h2>
           <p>
              For now, installation information can be found on the 
***************
*** 39,95 ****
           <p><a href="#index">Back to index</a></p>
           <hr />
!          <a name="compilingandbuilding"></a>
!          <h2 align="left">Compiling and Building with MinGW</h2>
!          <ul>
!             <li> 
!                <h3>How to create a console application</h3></a>
!                <p>
!                   Here's an example.  The following is a code sample for a simple C program.  Cut 
!                   and paste it into a file named hello.c to try it out.
!                </p>
!                <pre>
!    #include &lt;stdio.h&gt;
  
-    int main(int argc, char **argv)
-    {
-       printf ("Hello\n");
-       return (0);
-    }
-                </pre>  
-                If you want to create a console mode executable hello.exe
-                from a c file called hello.c, try the following:
-                <pre>
-    gcc -c hello.c
-                </pre>
-                This compiles hello.c into an object file, hello.o
-                <pre>
-    gcc -o hello hello.o
-                </pre>
-                This creates an executable hello.exe from hello.o. Alternatively, you can compile 
-                and link in one step using:
-                <pre>
-    gcc -o hello hello.c 
-                </pre>
-                <p>
-                   The following is a code sample for a simple C++ program.  Cut and paste it into 
-                   a file named hello.cpp to try it out.
-                </p>
-                <pre>
-    #include &lt;iostream&gt;
-    int main(int argc, char **argv)
-    {
-      std::cout &lt;&lt; "Hello" &lt;&lt; std::endl;
-      return (0);
-    }
-                </pre>
-                <p>
-                   For the C++ program, use the following to compile and link:
-                </p>
-                <pre>
-    g++ -c hello.cpp
-    g++ -o hello hello.o
-                </pre>
-             </li>
-             <li>
                 <h3>How to create a windows application?</h3>
                 <p>
--- 37,90 ----
           <p><a href="#index">Back to index</a></p>
           <hr />
!          <h2 id="compilingandbuilding">Compiling and Building with MinGW</h2>
!            
!          <h3>How to create a console application</h3>
!            <p>
!               Here's an example.  The following is a code sample for a simple C program.  Cut 
!               and paste it into a file named hello.c to try it out.
!            </p>
!            <pre>
! #include &lt;stdio.h&gt;
! 
! int main(int argc, char **argv)
! {
!   printf ("Hello\n");
!   return (0);
! }
!            </pre>  
!            If you want to create a console mode executable hello.exe
!            from a c file called hello.c, try the following:
!            <pre>
! gcc -c hello.c
!            </pre>
!            This compiles hello.c into an object file, hello.o
!            <pre>
! gcc -o hello hello.o
!            </pre>
!            This creates an executable hello.exe from hello.o. Alternatively, you can compile 
!            and link in one step using:
!            <pre>
! gcc -o hello hello.c 
!            </pre>
!            <p>
!               The following is a code sample for a simple C++ program.  Cut and paste it into 
!               a file named hello.cpp to try it out.
!            </p>
!            <pre>
! #include &lt;iostream&gt;
! int main(int argc, char **argv)
! {
!  std::cout &lt;&lt; "Hello" &lt;&lt; std::endl;
!  return (0);
! }
!            </pre>
!            <p>
!               For the C++ program, use the following to compile and link:
!            </p>
!            <pre>
! g++ -c hello.cpp
! g++ -o hello hello.o
!            </pre>
  
                 <h3>How to create a windows application?</h3>
                 <p>
***************
*** 136,141 ****
     gcc -o hello hello.o resfile.o -mwindows
                 </pre>
!             </li>
!             <li>
                 <h3>How to create a dll</h3>
                 <p>
--- 131,136 ----
     gcc -o hello hello.o resfile.o -mwindows
                 </pre>
! 
! 
                 <h3>How to create a dll</h3>
                 <p>
***************
*** 193,198 ****
                    http://www.nanotech.wisc.edu/&#126;khan/software/gnu-win32/dllhelpers.html</a>
                 </p>
!             </li>
!             <li>
                 <h3>How to create a def file for a dll</h3>
                 <p>
--- 188,193 ----
                    http://www.nanotech.wisc.edu/&#126;khan/software/gnu-win32/dllhelpers.html</a>
                 </p>
! 
! 
                 <h3>How to create a def file for a dll</h3>
                 <p>
***************
*** 293,296 ****
--- 288,292 ----
                          </li>
                       </ul>
+                      </li>
                       <li>
                          <p>
***************
*** 320,330 ****
                       </li>
                    </ul>
-                </li>
-             </li>
              <p><a href="#index">Back to index</a></p>
!          </ul>
           <hr />
!          <a name="gnutools"></a>
!          <h2 align="left">GNU Development Tools Documentation</h2>
           <ul>
              <li>
--- 316,323 ----
                       </li>
                    </ul>
              <p><a href="#index">Back to index</a></p>
! 
           <hr />
!          <h2 id="gnutools">GNU Development Tools Documentation</h2>
           <ul>
              <li>
***************
*** 350,358 ****
  			<a href="http://mefriss1.swan.ac.uk/~jfonseca/gnu-win32/documentation/chm/index.html">Compiled HTML Help</a> (various documentation for GNU tools in MS HTML Help format, provided by José Fonseca).
              </li>
-             <p><a href="#index">Back to index</a></p>
           </ul>
           <hr />
!          <a name="win32api"></a>
!          <h2 align="left">Win32 API Documentation</h2>
           <p>
              MinGW uses the runtime libraries distributed with the OS, but 
--- 343,351 ----
  			<a href="http://mefriss1.swan.ac.uk/~jfonseca/gnu-win32/documentation/chm/index.html">Compiled HTML Help</a> (various documentation for GNU tools in MS HTML Help format, provided by José Fonseca).
              </li>
           </ul>
+          <p><a href="#index">Back to index</a></p>
+ 
           <hr />
!          <h2 id="win32api">Win32 API Documentation</h2>
           <p>
              MinGW uses the runtime libraries distributed with the OS, but 
***************
*** 381,399 ****
                 C runtime library documentation.
              </li>
-             <p><a href="#index">Back to index</a></p>
           </ul>
           <hr />
!          <a name="etc"></a>
!          <h2 align="left">Tips, Howtos, Contributed Documentation, etc.</h2>
           <p>
-             <font size="+1"><b>** NOTE ** </b></font><i>
              Some of the information in this section is grossly 
              out of date, and currently here for historical purposes only.  
              In particular, more recent and relevant information about "-mno-cygwin" 
              and using MinGW within a Cygwin development environment can be found 
!             on the <a href="mingwfaq.shtml#faq-usingwithcygwin">FAQ</a> page.</i>
           </p>
!          <ul>
!             <li><h3>Introductions and Tutorials</h3></li>
              <ul>
                 <li>
--- 374,392 ----
                 C runtime library documentation.
              </li>
           </ul>
+          <p><a href="#index">Back to index</a></p>
           <hr />
!          
!          <h2 id="etc">Tips, Howtos, Contributed Documentation, etc.</h2>
!          <h3>** NOTE **</h3>
           <p>
              Some of the information in this section is grossly 
              out of date, and currently here for historical purposes only.  
              In particular, more recent and relevant information about "-mno-cygwin" 
              and using MinGW within a Cygwin development environment can be found 
!             on the <a href="mingwfaq.shtml#faq-usingwithcygwin">FAQ</a> page.
           </p>
! 
!             <h3>Introductions and Tutorials</h3>
              <ul>
                 <li>
***************
*** 408,412 ****
                 <li> 
                    <a href="http://www12.canvas.ne.jp/peters/colin/win32/index.html">
!                   Programming Win32 with GNU C and C++</a><br>
  		  A tutorial by Coin Peters, the original author of MinGW.
                 </li>
--- 401,405 ----
                 <li> 
                    <a href="http://www12.canvas.ne.jp/peters/colin/win32/index.html">
!                   Programming Win32 with GNU C and C++</a><br />
  		  A tutorial by Coin Peters, the original author of MinGW.
                 </li>
***************
*** 429,433 ****
              </ul>
              <br />
!             <li><h3>Developing Modules for Specific Software Packages</h3></li>
              <ul>
                 <li> 
--- 422,427 ----
              </ul>
              <br />
!             
!             <h3>Developing Modules for Specific Software Packages</h3>
              <ul>
                 <li> 
***************
*** 460,464 ****
              </ul>
              <br />
!             <li><h3>Cross-compilation and Using with Other Tools</h3></li>
              <ul>
                 <li> 
--- 454,459 ----
              </ul>
              <br />
!             
!             <h3>Cross-compilation and Using with Other Tools</h3>
              <ul>
                 <li> 
***************
*** 476,484 ****
              </ul>
              <p><a href="#index">Back to index</a></p>
-          </ul>
           <hr />
  
  
- </p>
  </div>
  
--- 471,477 ----

Index: lists.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/lists.shtml,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** lists.shtml	2 May 2004 19:03:02 -0000	1.18
--- lists.shtml	11 Apr 2006 07:40:13 -0000	1.18.2.1
***************
*** 1,15 ****
! <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
  	<title>MinGW - Mailing Lists &amp; Forums</title>
  </head>
  
  <body>
- <span style="visibility: hidden;">.</span>
- 
  <!--#include virtual="ssi/header.html" -->
  
--- 1,15 ----
! <!DOCTYPE html 
!      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
!   <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
!     <link rel="stylesheet" type="text/css" href="mingw.css" />
  	<title>MinGW - Mailing Lists &amp; Forums</title>
  </head>
  
  <body>
  <!--#include virtual="ssi/header.html" -->
  
***************
*** 17,24 ****
  
  
! <div id="Content">
  <h1>MinGW - Mailing Lists &amp; Forums</h1>
  <p>
- <p>
  There are several mailing lists available for the MinGW users; the 
  searchable on-line archives provide a very useful resource.  You can either
--- 17,23 ----
  
  
! <div id="mainContent">
  <h1>MinGW - Mailing Lists &amp; Forums</h1>
  <p>
  There are several mailing lists available for the MinGW users; the 
  searchable on-line archives provide a very useful resource.  You can either
***************
*** 48,52 ****
  <a href="http://sourceforge.net/mailarchive/forum.php?forum=mingw-users">
  <strong>archives</strong></a> before posting.
! <a href="http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.user&sort=date">gmane alternative search</a>
  </p>
  
--- 47,51 ----
  <a href="http://sourceforge.net/mailarchive/forum.php?forum=mingw-users">
  <strong>archives</strong></a> before posting.
! <a href="http://search.gmane.org/search.php?query=&amp;email=&amp;group=gmane.comp.gnu.mingw.user&amp;sort=date">gmane alternative search</a>
  </p>
  
***************
*** 57,61 ****
  <a href="http://sourceforge.net/mailarchive/forum.php?forum=mingw-msys">
  <strong>archives</strong></a> before posting.
! <a href="http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.msys&sort=date">gmane alternative search</a>
  </p>
  
--- 56,60 ----
  <a href="http://sourceforge.net/mailarchive/forum.php?forum=mingw-msys">
  <strong>archives</strong></a> before posting.
! <a href="http://search.gmane.org/search.php?query=&amp;email=&amp;group=gmane.comp.gnu.mingw.msys&amp;sort=date">gmane alternative search</a>
  </p>
  
***************
*** 67,71 ****
  <a href="http://sourceforge.net/mailarchive/forum.php?forum=mingw-dvlpr">
  <strong>archives</strong></a>.
! <a href="http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.devel&sort=date">gmane alternative search</a>
  </p>
  
--- 66,70 ----
  <a href="http://sourceforge.net/mailarchive/forum.php?forum=mingw-dvlpr">
  <strong>archives</strong></a>.
! <a href="http://search.gmane.org/search.php?query=&amp;email=&amp;group=gmane.comp.gnu.mingw.devel&amp;sort=date">gmane alternative search</a>
  </p>
  
***************
*** 77,81 ****
  <a href="http://sourceforge.net/mailarchive/forum.php?forum=mingw-patches">
  <strong>archives</strong></a>.
! <a href="http://search.gmane.org/search.php?query=&email=&group=gmane.comp.gnu.mingw.patches&sort=date">gmane alternative search</a>
  </p>
  
--- 76,80 ----
  <a href="http://sourceforge.net/mailarchive/forum.php?forum=mingw-patches">
  <strong>archives</strong></a>.
! <a href="http://search.gmane.org/search.php?query=&amp;email=&amp;group=gmane.comp.gnu.mingw.patches&amp;sort=date">gmane alternative search</a>
  </p>
  
***************
*** 114,159 ****
  <ul>
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286532" 
! target="_blank">Ada</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286529" 
! target="_blank">C/C++</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286531" 
! target="_blank">Fortran</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286644" 
! target="_blank">HowtoPPD</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286533" 
! target="_blank">Java</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286534" 
! target="_blank">Pascal</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=7134" 
! target="_blank">StupidTechiQuestions</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=290275" 
! target="_blank">Unix2Windows2Unix</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286641" 
! target="_blank">Windows API</a>
  </li>
  </ul>
--- 113,149 ----
  <ul>
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286532">Ada</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286529">C/C++</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286531">Fortran</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286644">HowtoPPD</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286533">Java</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286534">Pascal</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=7134">StupidTechiQuestions</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=290275">Unix2Windows2Unix</a>
  </li>
  
  <li>
! <a href="http://sourceforge.net/forum/forum.php?forum_id=286641">Windows API</a>
  </li>
  </ul>
***************
*** 173,177 ****
  </p>
  
- </p>
  </div>
  
--- 163,166 ----

Index: links.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/links.shtml,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -C2 -d -r1.31 -r1.31.2.1
*** links.shtml	2 May 2004 19:03:02 -0000	1.31
--- links.shtml	11 Apr 2006 07:40:13 -0000	1.31.2.1
***************
*** 1,14 ****
! <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
  	<title>MinGW - Related Sites</title>
  </head>
  
  <body>
- <span style="visibility: hidden;">.</span>
  
  <!--#include virtual="ssi/header.html" -->
--- 1,15 ----
! <!DOCTYPE html 
!      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
!   <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
!     <link rel="stylesheet" type="text/css" href="mingw.css" />
  	<title>MinGW - Related Sites</title>
  </head>
  
  <body>
  
  <!--#include virtual="ssi/header.html" -->
***************
*** 17,23 ****
  
  
! <div id="Content">
  <h1>MinGW - Related Sites</h1>
- <p>
                      <h3 class="c1">
                        MinGW
--- 18,23 ----
  
  
! <div id="mainContent">
  <h1>MinGW - Related Sites</h1>
                      <h3 class="c1">
                        MinGW
***************
*** 25,44 ****
                      <ul>
                        <li>
!                         <a target="_nw" href=
                          "http://www.nanotech.wisc.edu/%7Ekhan/software/gnu-win32/">
                          Mumit Khan's MinGW site</a>
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://gcc.gnu.org/">GNU Compiler
                          Collection (GCC)</a>
                        </li>
                        <li>
!                         Colin Peters' site on <a target="_nw"
                              href="http://www12.canvas.ne.jp/peters/colin/gcc.html">
                          MinGW</a> -- this is where it all started.
                        </li>
                        <li>
!                         J.J.vanderHeijden's <a target="_nw"
                              href="http://agnes.dida.physik.uni-essen.de/%7Ejanjaap/mingw32/index.html">
                          GNU mingw32 tools</a>. Contains some useful
--- 25,44 ----
                      <ul>
                        <li>
!                         <a href=
                          "http://www.nanotech.wisc.edu/%7Ekhan/software/gnu-win32/">
                          Mumit Khan's MinGW site</a>
                        </li>
                        <li>
!                         <a href=
                          "http://gcc.gnu.org/">GNU Compiler
                          Collection (GCC)</a>
                        </li>
                        <li>
!                         Colin Peters' site on <a 
                              href="http://www12.canvas.ne.jp/peters/colin/gcc.html">
                          MinGW</a> -- this is where it all started.
                        </li>
                        <li>
!                         J.J.vanderHeijden's <a 
                              href="http://agnes.dida.physik.uni-essen.de/%7Ejanjaap/mingw32/index.html">
                          GNU mingw32 tools</a>. Contains some useful
***************
*** 48,52 ****
                        <li>
                          <a href="mailto:ke...@ca...">Robert
!                         Kern</a>'s instructions for <a target="_nw"
                          href=
                          "http://starship.python.net/crew/kernr/mingw32/Notes.html">
--- 48,52 ----
                        <li>
                          <a href="mailto:ke...@ca...">Robert
!                         Kern</a>'s instructions for <a 
                          href=
                          "http://starship.python.net/crew/kernr/mingw32/Notes.html">
***************
*** 54,66 ****
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://groups.yahoo.com/group/mingw32/">Old
                          Mingw32 mailing list (use for archived
!                         information)</a> hosted by <a target="_nw"
                          href=
                          "http://groups.yahoo.com">groups.yahoo.com</a>.
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://mingwacr.sourceforge.net">The
                          Mingw32 Alternate C Runtime Library</a> is
--- 54,66 ----
                        </li>
                        <li>
!                         <a href=
                          "http://groups.yahoo.com/group/mingw32/">Old
                          Mingw32 mailing list (use for archived
!                         information)</a> hosted by <a
                          href=
                          "http://groups.yahoo.com">groups.yahoo.com</a>.
                        </li>
                        <li>
!                         <a href=
                          "http://mingwacr.sourceforge.net">The
                          Mingw32 Alternate C Runtime Library</a> is
***************
*** 83,87 ****
                      <ul>
                        <li>
!                         <a target="_nw" href=
                          "http://www.iseran.com/Win32/FAQ/section0.html">
                          http://www.iseran.com/Win32/FAQ/section0.html</a>
--- 83,87 ----
                      <ul>
                        <li>
!                         <a href=
                          "http://www.iseran.com/Win32/FAQ/section0.html">
                          http://www.iseran.com/Win32/FAQ/section0.html</a>
***************
*** 91,95 ****
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://www.devzoo.com/editor_win.php">
                          Free Editors for Programming in Windows
--- 91,95 ----
                        </li>
                        <li>
!                         <a href=
                          "http://www.devzoo.com/editor_win.php">
                          Free Editors for Programming in Windows
***************
*** 97,101 ****
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://www.foosyerdoos.fsnet.co.uk">FoosYerDoos
                          Programming</a> is devoted to win32 C++
--- 97,101 ----
                        </li>
                        <li>
!                         <a href=
                          "http://www.foosyerdoos.fsnet.co.uk">FoosYerDoos
                          Programming</a> is devoted to win32 C++
***************
*** 104,108 ****
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://freespace.virgin.net/james.brown7">Catch22
                          Productions</a> is a web-site offering free
--- 104,108 ----
                        </li>
                        <li>
!                         <a href=
                          "http://freespace.virgin.net/james.brown7">Catch22
                          Productions</a> is a web-site offering free
***************
*** 110,114 ****
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://www.winprog.org/tutorial/">theForger's
                          Win32 API Tutorial</a> attempts to get you
--- 110,114 ----
                        </li>
                        <li>
!                         <a href=
                          "http://www.winprog.org/tutorial/">theForger's
                          Win32 API Tutorial</a> attempts to get you
***************
*** 117,121 ****
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://www.wotsit.org/">Wotsit's
                          Format</a> file format information on
--- 117,121 ----
                        </li>
                        <li>
!                         <a href=
                          "http://www.wotsit.org/">Wotsit's
                          Format</a> file format information on
***************
*** 146,150 ****
                        <li>
                          C++ Windows Tutorial, <a href=
!                         "http://www.relisoft.com">http://www.relisoft.com</a><br>
  
                          Also has a directory for programmers trying
--- 146,150 ----
                        <li>
                          C++ Windows Tutorial, <a href=
!                         "http://www.relisoft.com">http://www.relisoft.com</a><br />
  
                          Also has a directory for programmers trying
***************
*** 154,158 ****
                          &nbsp; DevCentral Tutorials, <a href=
                          "http://devcentral.iftech.com/learning/tutorials/">
!                         http://devcentral.iftech.com/learning/tutorials/</a><br>
  
                           C++, Win32 and COM Tutorials.
--- 154,158 ----
                          &nbsp; DevCentral Tutorials, <a href=
                          "http://devcentral.iftech.com/learning/tutorials/">
!                         http://devcentral.iftech.com/learning/tutorials/</a><br />
  
                           C++, Win32 and COM Tutorials.
***************
*** 160,164 ****
                        <li>
                          The Programming Sharehouse,&nbsp;
!                             <a href="http://www.progsharehouse.com">http://www.progsharehouse.com</a><br>
  
                           Tutorials, question and answer boards,
--- 160,164 ----
                        <li>
                          The Programming Sharehouse,&nbsp;
!                             <a href="http://www.progsharehouse.com">http://www.progsharehouse.com</a><br />
  
                           Tutorials, question and answer boards,
***************
*** 171,175 ****
                          http://www.icce.rug.nl/documents/cpp.shtml</a>
                        </li>
!                     </ul>OpenGL Tutorials:<br>
                       
                      <ul>
--- 171,175 ----
                          http://www.icce.rug.nl/documents/cpp.shtml</a>
                        </li>
!                     </ul>OpenGL Tutorials:<br />
                       
                      <ul>
***************
*** 186,190 ****
                          POT (Personal OpenGL Tutorial),
                              <a href="http://home.a-city.de/franco.bez/pot/pot_w32_en.html">
!                         http://home.a-city.de/franco.bez/pot/pot_w32_en.html</a><br>
  
                           Franco Bez recommended this program for
--- 186,190 ----
                          POT (Personal OpenGL Tutorial),
                              <a href="http://home.a-city.de/franco.bez/pot/pot_w32_en.html">
!                         http://home.a-city.de/franco.bez/pot/pot_w32_en.html</a><br />
  
                           Franco Bez recommended this program for
***************
*** 194,198 ****
                          Win32.
                        </li>
!                     </ul>Database Tutorials:<br>
                       
                      <ul>
--- 194,198 ----
                          Win32.
                        </li>
!                     </ul>Database Tutorials:<br />
                       
                      <ul>
***************
*** 200,204 ****
                          ODBC Oracle Example Program, <a href=
                          "ftp://ftp.simtel.net/pub/simtelnet/win95/prog/odbcora8.zip">
!                         ftp://ftp.simtel.net/pub/simtelnet/win95/prog/odbcora8.zip</a><br>
  
                           An example of how to write ODBC code. The
--- 200,204 ----
                          ODBC Oracle Example Program, <a href=
                          "ftp://ftp.simtel.net/pub/simtelnet/win95/prog/odbcora8.zip">
!                         ftp://ftp.simtel.net/pub/simtelnet/win95/prog/odbcora8.zip</a><br />
  
                           An example of how to write ODBC code. The
***************
*** 216,220 ****
                      <ul>
                        <li>
!                         <a target="_nw" href=
                          "http://cygwin.com">Cygwin project</a>. The
                          mailing list archives are on-line, as is
--- 216,220 ----
                      <ul>
                        <li>
!                         <a href=
                          "http://cygwin.com">Cygwin project</a>. The
                          mailing list archives are on-line, as is
***************
*** 223,227 ****
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://www.cs.virginia.edu/%7Elcc-win32/">lcc-win</a>
                          is a Win32 C compiler complete with
--- 223,227 ----
                        </li>
                        <li>
!                         <a href=
                          "http://www.cs.virginia.edu/%7Elcc-win32/">lcc-win</a>
                          is a Win32 C compiler complete with
***************
*** 232,236 ****
                        </li>
                        <li>
!                         <a target="_nw" href=
                          "http://pw32.sourceforge.net/">PW32</a> is
                          <a href=
--- 232,236 ----
                        </li>
                        <li>
!                         <a href=
                          "http://pw32.sourceforge.net/">PW32</a> is
                          <a href=
***************
*** 276,281 ****
                      <ul>
                        <li>
!                         Visual-MinGW, <a target="_nw" href=
!                         "http://visual-mingw.sourceforge.net/">http://visual-mingw.sourceforge.net/</a><br>
  
                           A "Minimalist" Open Source IDE being
--- 276,281 ----
                      <ul>
                        <li>
!                         Visual-MinGW, <a href=
!                         "http://visual-mingw.sourceforge.net/">http://visual-mingw.sourceforge.net/</a><br />
  
                           A "Minimalist" Open Source IDE being
***************
*** 284,288 ****
                        </li>
                        <li>
!                         bloodshed Dev-C++ from <a target="_nw"
                              href="http://www.bloodshed.net/devcpp.html">
                          http://www.bloodshed.net/devcpp.html</a> is
--- 284,288 ----
                        </li>
                        <li>
!                         bloodshed Dev-C++ from <a
                              href="http://www.bloodshed.net/devcpp.html">
                          http://www.bloodshed.net/devcpp.html</a> is
***************
*** 291,297 ****
                        </li>
                        <li>
!                         RSXIDE, <a target="_nw" href=
                          "http://www.mathematik.uni-bielefeld.de/%7Erainer/">
!                         http://www.mathematik.uni-bielefeld.de/~rainer/</a><br>
  
                           Built in support for djgpp, rsxnt,
--- 291,297 ----
                        </li>
                        <li>
!                         RSXIDE, <a href=
                          "http://www.mathematik.uni-bielefeld.de/%7Erainer/">
!                         http://www.mathematik.uni-bielefeld.de/~rainer/</a><br />
  
                           Built in support for djgpp, rsxnt,
***************
*** 302,315 ****
                        </li>
                        <li>
!                         Vide, <a target="_nw" href=
!                         "http://www.objectcentral.com">http://www.objectcentral.com</a><br>
  
                          Tested with mingw.
                        </li>
                        <li>
!                         JFE (Jen's File Editor), <a target="_nw"
                          href=
                          "http://home.t-online.de/home/Jens.Altmann/jfe_eng.htm">
!                         http://home.t-online.de/home/Jens.Altmann/jfe_eng.htm</a><br>
  
                           can be used with mingw. Has some nice
--- 302,315 ----
                        </li>
                        <li>
!                         Vide, <a href=
!                         "http://www.objectcentral.com">http://www.objectcentral.com</a><br />
  
                          Tested with mingw.
                        </li>
                        <li>
!                         JFE (Jen's File Editor), <a 
                          href=
                          "http://home.t-online.de/home/Jens.Altmann/jfe_eng.htm">
!                         http://home.t-online.de/home/Jens.Altmann/jfe_eng.htm</a><br />
  
                           can be used with mingw. Has some nice
***************
*** 322,332 ****
                        <li>
                          Pow! - Programmers Open Workbench,
!                         <a target="_nw" href=
                          "http://www.fim.uni-linz.ac.at/pow/Pow.htm">
                          http://www.fim.uni-linz.ac.at/pow/Pow.htm</a>
                        </li>
                        <li>
!                         ACIDE, <a target="_nw" href=
!                         "http://pages.zoom.co.uk/andyc/">http://pages.zoom.co.uk/andyc/</a><br>
  
                           Can be configured to work with many
--- 322,332 ----
                        <li>
                          Pow! - Programmers Open Workbench,
!                         <a href=
                          "http://www.fim.uni-linz.ac.at/pow/Pow.htm">
                          http://www.fim.uni-linz.ac.at/pow/Pow.htm</a>
                        </li>
                        <li>
!                         ACIDE, <a href=
!                         "http://pages.zoom.co.uk/andyc/">http://pages.zoom.co.uk/andyc/</a><br />
  
                           Can be configured to work with many
***************
*** 336,340 ****
                          Quincy 2000, <a href=
                          "http://csjava.occ.cccd.edu/%7Egilberts/quincy2k.html">
!                         http://csjava.occ.cccd.edu/~gilberts/quincy2k.html</a><br>
  
                           From Al Stevens. Covered in various Dr.
--- 336,340 ----
                          Quincy 2000, <a href=
                          "http://csjava.occ.cccd.edu/%7Egilberts/quincy2k.html">
!                         http://csjava.occ.cccd.edu/~gilberts/quincy2k.html</a><br />
  
                           From Al Stevens. Covered in various Dr.
***************
*** 346,360 ****
                        </li>
                        <li>
!                         Visual Programming Armoury, <a target="_nw"
                          href=
                          "http://www.polymorph.spb.ru/">http://www.polymorph.spb.ru/</a>
                        </li>
                        <li>
!                         Assembler Laboratory, <a target="_nw"
                              href="http://tihlde.org/%7Ekurtg/">http://tihlde.org/~kurtg/</a>
                        </li>
                        <li>
!                         Octopod, <a target="_nw" href=
!                         "http://www.octopod.net">http://www.octopod.net</a><br>
  
                          Commercial IDE.
--- 346,360 ----
                        </li>
                        <li>
!                         Visual Programming Armoury, <a
                          href=
                          "http://www.polymorph.spb.ru/">http://www.polymorph.spb.ru/</a>
                        </li>
                        <li>
!                         Assembler Laboratory, <a
                              href="http://tihlde.org/%7Ekurtg/">http://tihlde.org/~kurtg/</a>
                        </li>
                        <li>
!                         Octopod, <a href=
!                         "http://www.octopod.net">http://www.octopod.net</a><br />
  
                          Commercial IDE.
***************
*** 385,389 ****
                        <li>
                          Scintilla and SciTE, <a href=
!                         "http://www.scintilla.org/">http://www.scintilla.org/</a><br>
  
                          Scintilla is an Open Source editing
--- 385,389 ----
                        <li>
                          Scintilla and SciTE, <a href=
!                         "http://www.scintilla.org/">http://www.scintilla.org/</a><br />
  
                          Scintilla is an Open Source editing
***************
*** 407,413 ****
                          many good options such as edwin and pedit.
                        </li>
!                     </ul><br>
  
- </p>
  </div>
  
--- 407,412 ----
                          many good options such as edwin and pedit.
                        </li>
!                     </ul>
  
  </div>
  

Index: bugs.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/bugs.shtml,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** bugs.shtml	21 Nov 2005 15:10:18 -0000	1.13
--- bugs.shtml	11 Apr 2006 07:40:13 -0000	1.13.2.1
***************
*** 1,15 ****
! <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
! 	<title>MinGW - Reporting Bugs</title>
  </head>
  
  <body>
- <span style="visibility: hidden;">.</span>
- 
  <!--#include virtual="ssi/header.html" -->
  
--- 1,15 ----
! <!DOCTYPE html 
!      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
!   <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
!     <link rel="stylesheet" type="text/css" href="mingw.css" />
!     <title>MinGW - Reporting Bugs</title>
  </head>
  
  <body>
  <!--#include virtual="ssi/header.html" -->
  
***************
*** 17,21 ****
  
  
! <div id="Content">
  <h1>MinGW - Reporting Bugs</h1>
    <p>So you think you have found a bug and want to
--- 17,21 ----
  
  
! <div id="mainContent">
  <h1>MinGW - Reporting Bugs</h1>
    <p>So you think you have found a bug and want to
***************
*** 43,47 ****
    </ul>
    <p>SourceForge gives us nice tools to keep track of your bug reports, so please
!   <a href="https://sourceforge.net/tracker/?group_id=2435&amp;atid=102435" target="_nw">follow this link to file your
        report.</a> You will need a SourceForge
        login account. If you don't have one then
--- 43,47 ----
    </ul>
    <p>SourceForge gives us nice tools to keep track of your bug reports, so please
!   <a href="https://sourceforge.net/tracker/?group_id=2435&amp;atid=102435">follow this link to file your
        report.</a> You will need a SourceForge
        login account. If you don't have one then
***************
*** 78,92 ****
    <ul>
      <li>
!       gcc bug reporting guidelines:<br>
         <a href="http://www.gnu.org/software/gcc/bugs.html">
        http://www.gnu.org/software/gcc/bugs.html</a>
      </li>
      <li>
!       gcc mailing list archives:<br>
         <a href="http://gcc.gnu.org/lists.html">http://gcc.gnu.org/lists.html</a>
      </li>
      <li>
!       cygwin (binutils, gdb and cygwin):<br>
!        <a href="http://sources.redhat.com/lists.html">http://sources.redhat.com/lists.html</a><br>
        </li>
    </ul>
--- 78,92 ----
    <ul>
      <li>
!       gcc bug reporting guidelines:<br />
         <a href="http://www.gnu.org/software/gcc/bugs.html">
        http://www.gnu.org/software/gcc/bugs.html</a>
      </li>
      <li>
!       gcc mailing list archives:<br />
         <a href="http://gcc.gnu.org/lists.html">http://gcc.gnu.org/lists.html</a>
      </li>
      <li>
!       cygwin (binutils, gdb and cygwin):<br />
!        <a href="http://sources.redhat.com/lists.html">http://sources.redhat.com/lists.html</a>
        </li>
    </ul>

Index: history.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/history.shtml,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** history.shtml	2 May 2004 19:03:02 -0000	1.15
--- history.shtml	11 Apr 2006 07:40:13 -0000	1.15.2.1
***************
*** 1,15 ****
! <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
! 	<title>MinGW - History</title>
  </head>
  
  <body>
- <span style="visibility: hidden;">.</span>
- 
  <!--#include virtual="ssi/header.html" -->
  
--- 1,15 ----
! <!DOCTYPE html 
!      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
!   <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
!     <link rel="stylesheet" type="text/css" href="mingw.css" />
!     <title>MinGW - History</title>
  </head>
  
  <body>
  <!--#include virtual="ssi/header.html" -->
  
***************
*** 17,24 ****
  
  
! <div id="Content">
  <h1>MinGW - History</h1>
  <p>
- <p>
  Mingw32 was created by
  <a href="http://www12.canvas.ne.jp/peters/colin/gcc.html">Colin Peters</a>.
--- 17,23 ----
  
  
! <div id="mainContent">
  <h1>MinGW - History</h1>
  <p>
  Mingw32 was created by
  <a href="http://www12.canvas.ne.jp/peters/colin/gcc.html">Colin Peters</a>.
***************
*** 62,66 ****
  developers.
  </p>
- </p>
  </div>
  
--- 61,64 ----

Index: download.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/download.shtml,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C2 -d -r1.29 -r1.29.2.1
*** download.shtml	20 Jun 2005 03:05:26 -0000	1.29
--- download.shtml	11 Apr 2006 07:40:13 -0000	1.29.2.1
***************
*** 1,14 ****
! <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
  	<title>MinGW - Download</title>
  </head>
  
  <body>
- <span style="visibility: hidden;">.</span>
  
  <!--#include virtual="ssi/header.html" -->
--- 1,15 ----
! <!DOCTYPE html 
!      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
!   <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
!     <link rel="stylesheet" type="text/css" href="mingw.css" />
  	<title>MinGW - Download</title>
  </head>
  
  <body>
  
  <!--#include virtual="ssi/header.html" -->
***************
*** 17,23 ****
  
  
! <div id="Content">
  <h1>MinGW - Download</h1>
- <p>
  		    <h2><a name="Contents">
  		      Contents
--- 18,23 ----
  
  
! <div id="mainContent">
  <h1>MinGW - Download</h1>
  		    <h2><a name="Contents">
  		      Contents
***************
*** 35,39 ****
  		    </ul>
  
! 		    <hr>
                      <h2><a href="#Contents" name="hdr1">
                        MinGW and MSYS Distributions
--- 35,39 ----
  		    </ul>
  
! 		    <hr />
                      <h2><a href="#Contents" name="hdr1">
                        MinGW and MSYS Distributions
***************
*** 94,100 ****
                      <p>
                        MinGW packages available for download are hosted by
! 		      <a target="_nw" href="http://www.sf.net/">SourceForge</a>.
  		      SourceForge provides each project with a 
! 		      <a target="_nw" href=
  		      "http://sf.net/project/showfiles.php?group_id=2435">
  		      File Release System</a> 
--- 94,100 ----
                      <p>
                        MinGW packages available for download are hosted by
! 		      <a href="http://www.sf.net/">SourceForge</a>.
  		      SourceForge provides each project with a 
! 		      <a href=
  		      "http://sf.net/project/showfiles.php?group_id=2435">
  		      File Release System</a> 
***************
*** 117,121 ****
                      </p>
  
! 		    <hr>
  		    <h2><a href="#Contents" name="hdr2">
  		      File List
--- 117,121 ----
                      </p>
  
! 		    <hr />
  		    <h2><a href="#Contents" name="hdr2">
  		      File List
***************
*** 127,131 ****
  		    www.mingw.org site.  For the most up to date view of the
  		    data you need to the 
! 		    <a target="_nw"
                         href="http://sf.net/project/showfiles.php?group_id=2435">
  		    SF File Release</a> pages.
--- 127,131 ----
  		    www.mingw.org site.  For the most up to date view of the
  		    data you need to the 
! 		    <a
                         href="http://sf.net/project/showfiles.php?group_id=2435">
  		    SF File Release</a> pages.
***************
*** 133,137 ****
                      <!--#include file="ssi/release.html"-->
                       
! 		    <hr>
                      <h2><a href="#Contents" name="hdr3">
                        Mirror Sites
--- 133,137 ----
                      <!--#include file="ssi/release.html"-->
                       
! 		    <hr />
                      <h2><a href="#Contents" name="hdr3">
                        Mirror Sites
***************
*** 154,158 ****
                      </p>
  
! 		    <hr>
                      <h2><a href="#Contents" name="hdr4">
                        Understanding MinGW Packaging
--- 154,158 ----
                      </p>
  
! 		    <hr />
                      <h2><a href="#Contents" name="hdr4">
                        Understanding MinGW Packaging
***************
*** 192,200 ****
  		    </p>
  
! 		    <hr>
  		    <h2><a href="#Contents" name="hdr5">
  		      Decompression and Unarchiving Utilities</a></h2>
                      <p>
!                      <em><b>WinZip Caution:</b></em><br>
                        Make sure that you first <b>uncheck</b> the
                        "TAR file smart CR/LF conversion" checkbox
--- 192,200 ----
  		    </p>
  
! 		    <hr />
  		    <h2><a href="#Contents" name="hdr5">
  		      Decompression and Unarchiving Utilities</a></h2>
                      <p>
!                      <em><b>WinZip Caution:</b></em><br />
                        Make sure that you first <b>uncheck</b> the
                        "TAR file smart CR/LF conversion" checkbox
***************
*** 203,214 ****
  		    </p>
  		    <p>
! 		      <em><b>An Open Source Win32 style solution:</b></em><br>
!                       <a href="http://www.7-zip.org" target=
!                       "_nw">7-Zip</a> offers an open source compression and
  		      decompression utility that will compress in two formats
  		      and decompress in several formats.
  		    </p>
  
! 		    <hr>
                      <h2><a href="#Contents" name="hdr6">
                        Installing MinGW
--- 203,214 ----
  		    </p>
  		    <p>
! 		      <em><b>An Open Source Win32 style solution:</b></em><br />
!                       <a href="http://www.7-zip.org">7-Zip</a>
!                       offers an open source compression and
  		      decompression utility that will compress in two formats
  		      and decompress in several formats.
  		    </p>
  
! 		    <hr />
                      <h2><a href="#Contents" name="hdr6">
                        Installing MinGW
***************
*** 217,221 ****
  		      How are you going to use MinGW?  That is a question you
  		      need to ask yourself.  If you are a Bourne command line
! 		      wizard and want to use ./configure && make then you want
  		      to install MSYS as well.  If you are an IDE wizard and
  		      have a configurable IDE then you need to determine if the
--- 217,221 ----
  		      How are you going to use MinGW?  That is a question you
  		      need to ask yourself.  If you are a Bourne command line
! 		      wizard and want to use ./configure &amp;&amp; make then you want
  		      to install MSYS as well.  If you are an IDE wizard and
  		      have a configurable IDE then you need to determine if the
***************
*** 248,252 ****
  		    </p>
  
! 		    <hr>
  		    <h2><a href="#Contents" name="hdr7">
  		      Updating MinGW
--- 248,252 ----
  		    </p>
  
! 		    <hr />
  		    <h2><a href="#Contents" name="hdr7">
  		      Updating MinGW
***************
*** 262,266 ****
  		    </p>
  
! 		    <hr>
  		    <h2><a href="#Contents" name="hdr8">
  		      Installing MSYS
--- 262,266 ----
  		    </p>
  
! 		    <hr />
  		    <h2><a href="#Contents" name="hdr8">
  		      Installing MSYS
***************
*** 284,288 ****
  		    </p>
  
! 		    <hr>
  		    <h2><a href="#Contents" name="hdr9">
  		      Updating MSYS
--- 284,288 ----
  		    </p>
  
! 		    <hr />
  		    <h2><a href="#Contents" name="hdr9">
  		      Updating MSYS
***************
*** 303,307 ****
  		    </p>
  
- </p>
  </div>
  
--- 303,306 ----

Index: mingwfaq.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingwfaq.shtml,v
retrieving revision 1.61
retrieving revision 1.61.2.1
diff -C2 -d -r1.61 -r1.61.2.1
*** mingwfaq.shtml	21 Nov 2005 15:10:18 -0000	1.61
--- mingwfaq.shtml	11 Apr 2006 07:40:13 -0000	1.61.2.1
***************
*** 1,15 ****
! <html>
! <head>
!   <meta name="description"
!  content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW.">
!   <meta name="keywords"
!  content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU">
! 	<link rel="stylesheet" type="text/css" href="mingw.css">
  	<title>MinGW - Frequently Asked Questions</title>
  </head>
  
  <body>
- <span style="visibility: hidden;">.</span>
- 
  <!--#include virtual="ssi/header.html" -->
  
--- 1,16 ----
! <!DOCTYPE html 
!      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
!     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
!   <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for Mi...
 
[truncated message content]

Update of /cvsroot/mingw/htdocs/ssi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29116

Modified Files:
      Tag: DVLPR-BRANCH
	footer.html header.html lside.html 
Log Message:
more style related clean up

Index: lside.html
===================================================================
RCS file: /cvsroot/mingw/htdocs/ssi/lside.html,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** lside.html	19 Mar 2006 15:30:29 -0000	1.2.2.1
--- lside.html	10 Apr 2006 21:22:46 -0000	1.2.2.2
***************
*** 1,3 ****
! <div id="LSide" class="sidebar">
  <ul id="Menu">
     <li><a href="licensing.shtml">Licensing Terms</a></li>
--- 1,3 ----
! <div id="sidebar">
  <ul id="Menu">
     <li><a href="licensing.shtml">Licensing Terms</a></li>

Index: footer.html
===================================================================
RCS file: /cvsroot/mingw/htdocs/ssi/footer.html,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** footer.html	19 Mar 2006 15:30:28 -0000	1.8.2.1
--- footer.html	10 Apr 2006 21:22:45 -0000	1.8.2.2
***************
*** 1,3 ****
! <div id="Footer" class="dec">
! Copyright &copy; 2004  www.mingw.org<br /><em>All rights reserved</em>
  </div>
--- 1,3 ----
! <div id="footer">
! <p>Copyright &copy; 2004  www.mingw.org<br /><em>All rights reserved</em></p>
  </div>

Index: header.html
===================================================================
RCS file: /cvsroot/mingw/htdocs/ssi/header.html,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** header.html	2 May 2004 19:13:03 -0000	1.1
--- header.html	10 Apr 2006 21:22:45 -0000	1.1.2.1
***************
*** 1,5 ****
! <div id="Header" class="dec">
! <a href="http://www.mingw.org/" title="Minimalist GNU for Windows">
  MinGW - Minimalist GNU for Windows
! </a>
  </div>
--- 1,5 ----
! <div id="header">
! <h1><a href="http://www.mingw.org/" title="Minimalist GNU for Windows">
  MinGW - Minimalist GNU for Windows
! </a></h1>
  </div>

Update of /cvsroot/mingw/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28738

Modified Files:
      Tag: DVLPR-BRANCH
	mingw.css 
Log Message:
css cleaned up preserving the older 3 columns style.
Tested with firefox (1.5 Linux) and ie6 (in wine, so it could be a good idea to do some additional native tests)

Index: mingw.css
===================================================================
RCS file: /cvsroot/mingw/htdocs/mingw.css,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -d -r1.21 -r1.21.2.1
*** mingw.css	21 Nov 2005 15:10:18 -0000	1.21
--- mingw.css	9 Apr 2006 09:59:16 -0000	1.21.2.1
***************
*** 1,26 ****
! html {
! 	font-family: verdana, arial, helvetica, sans-serif;
  /*	font-size: 12pt; */
  	margin: 0;
- 	margin-bottom: 2em;
  	padding: 0;
- }
- body {
  	background-color: white;
  	color: #333;
! 	margin: 0;
! 	padding: 0;
  }
  h1 {
! 	color:#999;
! 	font-size: larger;
! 	font-weight:900;
  	margin: 0;
! 	padding:0;
! 	text-align:center;
  }
! h2 {
! 	left-margin: 10em;
  }
  a {
  	color:#09c;
--- 1,25 ----
! body {
! 	font-family: verdana, arial, helvetica, "Luxi Sans", sans-serif;
  /*	font-size: 12pt; */
  	margin: 0;
  	padding: 0;
  	background-color: white;
  	color: #333;
!         font-size: 80%; /* Master size: change this for an effext on the whole page */
  }
+ 
  h1 {
! 	color: #999;
! 	font-size: 1.3em;
! 	font-weight: 900;
  	margin: 0;
! 	padding: 0;
! 	text-align: center;
  }
! 
! p {
!     font-size: 1em;
  }
+ 
  a {
  	color:#09c;
***************
*** 35,39 ****
  }
  a:hover {
! 	background-color:#0ff;
  }
  table {
--- 34,38 ----
  }
  a:hover {
! 	background-color: #cce;
  }
  table {
***************
*** 47,90 ****
  }
  
- .dec {
- 	background-color:#eee;
- 	border-bottom: 1px solid black;
- 	border-top: 1px solid black;
- 	font-weight:600;
- 	padding-bottom: 3px;
- 	padding-top: 3px;
- }
- #Footer {
- 	float: left;
- 	font-size: .6em;
- 	margin-top: 1em;
- 	text-align: center;
- 	width: 100%;
- }
- #Header {
- 	float: left;
- 	margin: 0;
- 	margin-bottom: 1em;
- 	padding-left: 1em;
- 	width: 100%;
- }
- .sidebar {
- 	background-color:#eee;
- 	border: 1px dashed #999;
- 	padding: 10px;
- 	margin-top: 2em;
- }
- #LSide {
- 	float: left;
- 	margin-left: 1ex;
- 	width: 11em;
- }
- #RSide {
- 	float: right;
- 	margin-right: 1ex;
- 	overflow: hidden;
- 	width: 20em;
-         font-size: .7em;
- }
  span#Label {
  	font-size: smaller;
--- 46,49 ----
***************
*** 105,194 ****
  }
  
! /*
!   The below is added thanks to:
!  Subject:    	 [Mingw-users] Offtopic: Website prints badly
! From: 	"Kauker, Hubert" <Hub...@tr...>
! Date: 	9:35:40 am 2005-04-04
! */
  
! /* This addition to mingw.css shows the main content onscreen. */
! @media screen {
!   #Content {
!       	margin-left: 	14em auto; 
! 	padding-left:	2em;
!       	width:		auto; 
!       	margin-right: 	1em auto;
! 	padding-right:  2em;
! 	text-align: 	justify;
!   }
!   body>div#Content {
!   /* Mozilla margins here */
! 	margin-left: 	14em auto;
! 	margin-right: 	1em auto;
! 	width:		auto;
! 	text-align:	justify;
!   }
!   ul, dt {
! 	padding-left: 	15em;
!   }
!   h2, h3 {
! 	padding-left: 8em;
!   }
!   p, blockquote {
! 	padding-top: 0;
! 	padding-left: 15em;
!   }
!   div#RSide p {
! 	padding-left: 0em;
!   }
  }
  
! /* This addition to mingw.css print the main content. */
! @media print {
!   #Content {
!     /* Note: the left margin is zero. */
!         padding-right: 	1em; 
!       	margin-left: 	0em; 
! 	width: 		auto; 
! 	margin-right: 	1em;
! 	text-align: 	justify;
!   }
!   p {
! 	padding-top: 0;
! 	padding-left: 5em;
!   }
!   ul {
!         padding-left: 6em;
!   }
  }
  
! /* This addition to mingw.css shows the left sidebar onscreen. */
! @media screen {
!   .sidebar {
!       	border-right: 	#999 1px dashed; 
! 	padding-right: 	1em; 
! 	margin-right:	auto;
! 	border-top: 	#999 1px dashed; 
! 	margin-top: 	2em; 
! 	padding-left: 	1em; 
! 	padding-bottom: 10px;
! 	border-left: 	#999 1px dashed; 
! 	padding-top: 	10px; 
! 	border-bottom: 	#999 1px dashed; 
! 	background-color: #eee
!   }
  }
  
- /* This addition to mingw.css suppresses the left sidebar on print. */
- @media print {
-   .sidebar { 
- 	display: 	none 
-   }
  #RSide {
! 	float: right;
! 	margin-right: 1ex;
! 	overflow: hidden;
! 	width: 20em;
!         font-size: .7em;
  }
  }
--- 64,143 ----
  }
  
! /************
!   CONTAINERS
! *************/
  
! #header, #footer
! {
!     background-color: #eee;
!     border-bottom: 1px solid black;
!     border-top: 1px solid black;
!     padding: 3px 5px;
!     margin-top: 10px;
  }
  
! #footer 
! {
!     clear: both;
!     margin-bottom: 10px;
  }
  
! 
! #sidebar
! {
!     position: absolute;
!     /*float: left;*/
!     width: 160px;
!     margin: 15px;
!     padding: 15px;
!     background-color: #eee;
!     border: 1px dashed #999;
!     left: 0; /*  this makes happy IE6 */
  }
  
  #RSide {
!     position: relative;
!     float: right;
! 	margin: 15px 0;
!         padding: 5px;
!         right: 15px;
! /*	overflow: hidden;*/
! 	width: 180px;
!         font-size: .8em;
!         background-color: #eee;
!     border: 1px dashed #999;
  }
+ 
+ #mainContent
+ {
+     margin: 15px 222px 15px 222px;
+     background-color: #eee;
+     border: 1px dashed #999;
+     padding: 10px;
+     text-align: justify;
+ }
+ 
+ #header h1
+ {
+     text-align: left;
+ }
+ 
+ #footer p
+ {
+     text-align: center;
+     font-size: .8em;
+ }
+ 
+ @media print {
+ 
+     #mainContent {
+         margin: 0;
+         border: none;
+         
+     }
+ 
+ /* Do not print menu bars */
+     #sidebar, #RSide{ 
+         display: none;
+     }
  }

Update of /cvsroot/mingw/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25605

Modified Files:
      Tag: DVLPR-BRANCH
	index.shtml 
Log Message:
minor html polish.
Renamed id Content to mainContent

Index: index.shtml
===================================================================
RCS file: /cvsroot/mingw/htdocs/index.shtml,v
retrieving revision 1.74.2.1
retrieving revision 1.74.2.2
diff -C2 -d -r1.74.2.1 -r1.74.2.2
*** index.shtml	19 Mar 2006 15:30:29 -0000	1.74.2.1
--- index.shtml	9 Apr 2006 09:54:03 -0000	1.74.2.2
***************
*** 4,12 ****
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
    <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
!     <meta name="description" content=
!     "Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content=
!     "mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
      <link rel="stylesheet" type="text/css" href="mingw.css" />
  
--- 4,10 ----
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
    <head>
!     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
!     <meta name="description" content="Home of MinGW -- Minimalist GNU for Windows -- project. Contains information about the MinGW runtime library and GNU/OSS development tools for MinGW." />
!     <meta name="keywords" content="mingw, mingw32, programming, C++, C, C/C++, libraries, software, development tools, editors, IDEs, GNU" />
      <link rel="stylesheet" type="text/css" href="mingw.css" />
  
***************
*** 16,24 ****
    <body>
      <!--#include virtual="ssi/header.html" -->
!      <!--#include virtual="ssi/lside.html" -->
!      <!--include virtual="news-short.html" -->
!      
  
!     <div id="Content">
        <h1>MinGW - Home</h1>
  
--- 14,21 ----
    <body>
      <!--#include virtual="ssi/header.html" -->
!     <!--#include virtual="ssi/lside.html" -->
!     <!--#include virtual="test.html"--><!-- WAS: #include virtual="news-short.html" -->
  
!     <div id="mainContent">
        <h1>MinGW - Home</h1>
  
***************
*** 68,71 ****
--- 65,69 ----
        it may be deleted without being read.</p>
      </div>
+     <!--include virtual="news-short.html" -->
      <!--#include virtual="ssi/footer.html" -->
    </body>

Update of /cvsroot/mingw/portmaker/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22919/template

Modified Files:
	mingwPORT.ini 
Log Message:
	Resolve BLDDIR vs. BUILDDIR variable naming conflict;
	reported by Anatoly Techtonik <tec...@us...>.

	* src/portmaker.sh, template/mingwPORT.ini (BLDDIR): Replace...
	(BUILDDIR): ...with this.


Index: mingwPORT.ini
===================================================================
RCS file: /cvsroot/mingw/portmaker/template/mingwPORT.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mingwPORT.ini	3 Apr 2005 19:45:22 -0000	1.1
--- mingwPORT.ini	8 Apr 2006 17:47:14 -0000	1.2
***************
*** 12,16 ****
  # DOWNLOADURI=http://ftp.gnu.org/gnu/automake
  # SRCDIR=..
! # BLDDIR=./bld
  # PREFIX=/mingw
  # CFLAGS="-O3 -s -mms-bitfields -march=`uname -m`"
--- 12,16 ----
  # DOWNLOADURI=http://ftp.gnu.org/gnu/automake
  # SRCDIR=..
! # BUILDDIR=./bld
  # PREFIX=/mingw
  # CFLAGS="-O3 -s -mms-bitfields -march=`uname -m`"
***************
*** 23,27 ****
  DOWNLOADURI=[downloaduri]
  SRCDIR=[srcdir]
! BLDDIR=[blddir]
  PREFIX=[prefix]
  CFLAGS=[cflags]
--- 23,27 ----
  DOWNLOADURI=[downloaduri]
  SRCDIR=[srcdir]
! BUILDDIR=[blddir]
  PREFIX=[prefix]
  CFLAGS=[cflags]

Update of /cvsroot/mingw/portmaker/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22919/src

Modified Files:
	portmaker.sh 
Log Message:
	Resolve BLDDIR vs. BUILDDIR variable naming conflict;
	reported by Anatoly Techtonik <tec...@us...>.

	* src/portmaker.sh, template/mingwPORT.ini (BLDDIR): Replace...
	(BUILDDIR): ...with this.


Index: portmaker.sh
===================================================================
RCS file: /cvsroot/mingw/portmaker/src/portmaker.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** portmaker.sh	10 Feb 2006 15:18:22 -0000	1.3
--- portmaker.sh	8 Apr 2006 17:47:14 -0000	1.4
***************
*** 18,22 ****
  ask "DOWNLOADURI" "http://ftp.gnu.org/gnu/$PACKAGE" DOWNLOADURI
  ask "SRCDIR" "/usr/src/${PACKAGE}-${VERSION}" SRCDIR
! ask "BLDDIR" "./bld" BLDDIR
  ask "PREFIX" "/mingw" PREFIX
  ask "CFLAGS" "-O3 -s -mms-bitfields -march=\\\`uname -m\\\`" CFLAGS
--- 18,22 ----
  ask "DOWNLOADURI" "http://ftp.gnu.org/gnu/$PACKAGE" DOWNLOADURI
  ask "SRCDIR" "/usr/src/${PACKAGE}-${VERSION}" SRCDIR
! ask "BUILDDIR" "./bld" BUILDDIR
  ask "PREFIX" "/mingw" PREFIX
  ask "CFLAGS" "-O3 -s -mms-bitfields -march=\\\`uname -m\\\`" CFLAGS
***************
*** 37,41 ****
  DOWNLOADURI=$DOWNLOADURI
  SRCDIR=$SRCDIR
! BLDDIR=$BLDDIR
  PREFIX=$PREFIX
  CFLAGS="$CFLAGS"
--- 37,41 ----
  DOWNLOADURI=$DOWNLOADURI
  SRCDIR=$SRCDIR
! BUILDDIR=$BUILDDIR
  PREFIX=$PREFIX
  CFLAGS="$CFLAGS"

Update of /cvsroot/mingw/portmaker
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22919

Modified Files:
	ChangeLog 
Log Message:
	Resolve BLDDIR vs. BUILDDIR variable naming conflict;
	reported by Anatoly Techtonik <tec...@us...>.

	* src/portmaker.sh, template/mingwPORT.ini (BLDDIR): Replace...
	(BUILDDIR): ...with this.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/portmaker/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog	10 Feb 2006 15:18:22 -0000	1.4
--- ChangeLog	8 Apr 2006 17:47:13 -0000	1.5
***************
*** 1,2 ****
--- 1,10 ----
+ 2006-04-08  Keith Marshall  <kei...@us...>
+ 
+ 	Resolve BLDDIR vs. BUILDDIR variable naming conflict;
+ 	reported by Anatoly Techtonik <tec...@us...>.
+ 
+ 	* src/portmaker.sh, template/mingwPORT.ini (BLDDIR): Replace...
+ 	(BUILDDIR): ...with this.
+ 
  2006-02-10  Earnie Boyd  <ea...@us...>
  

Update of /cvsroot/mingw/runtime/samples/simpledll
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/samples/simpledll

Removed Files:
	dll.c dll.cpp dll.def exe.c jamfile makedll.bat 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- dll.def DELETED ---

--- dll.cpp DELETED ---

--- jamfile DELETED ---

--- exe.c DELETED ---

--- makedll.bat DELETED ---

--- dll.c DELETED ---

Update of /cvsroot/mingw/runtime/samples/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/samples/test

Removed Files:
	jamfile test.c 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- test.c DELETED ---

--- jamfile DELETED ---

Update of /cvsroot/mingw/runtime/samples/globbing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/samples/globbing

Removed Files:
	glob.c jamfile noglob.c readme.txt 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- glob.c DELETED ---

--- noglob.c DELETED ---

--- readme.txt DELETED ---

--- jamfile DELETED ---

Update of /cvsroot/mingw/runtime/profile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/profile

Removed Files:
	COPYING CYGWIN_LICENSE Makefile.in configure configure.in 
	gcrt0.c gmon.c gmon.h mcount.c profil.c profil.h profile.h 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- profil.h DELETED ---

--- configure DELETED ---

--- configure.in DELETED ---

--- Makefile.in DELETED ---

--- gcrt0.c DELETED ---

--- mcount.c DELETED ---

--- profil.c DELETED ---

--- profile.h DELETED ---

--- CYGWIN_LICENSE DELETED ---

--- gmon.h DELETED ---

--- COPYING DELETED ---

--- gmon.c DELETED ---

Update of /cvsroot/mingw/runtime/samples/seh
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/samples/seh

Removed Files:
	eh3.c exutil.c exutil.def exutil.h jamfile sehfix.c sehsub.c 
	sehtest.c 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- sehtest.c DELETED ---

--- jamfile DELETED ---

--- sehfix.c DELETED ---

--- exutil.def DELETED ---

--- eh3.c DELETED ---

--- sehsub.c DELETED ---

--- exutil.h DELETED ---

--- exutil.c DELETED ---

Update of /cvsroot/mingw/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590

Modified Files:
	README 
Log Message:
See http://cygwin.com/cvs.html for w32api source

Index: README
===================================================================
RCS file: /cvsroot/mingw/runtime/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	22 Apr 2004 16:21:13 -0000	1.2
--- README	5 Apr 2006 18:50:29 -0000	1.3
***************
*** 1,10 ****
! 	Free Microsoft C Runtime and import library definitions
! 
! 	Maintained by MinGW Developers
! 	Send bug reports and questions to Min...@li...
! 	URL: http://www.mingw.org
! 
! A historical readme.txt exists and is distributed for your edification.  The 
! references within may or may not be correct.  Please do not rely on them.  See
! http://www.mingw.org for a list of valid references.
! 
--- 1 ----
!  For the w32api source see http://cygwin.com/cvs.html.

Update of /cvsroot/mingw/runtime/samples/wintest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/samples/wintest

Removed Files:
	jamfile test.c 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- test.c DELETED ---

--- jamfile DELETED ---

Update of /cvsroot/mingw/runtime/samples/dlltest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/samples/dlltest

Removed Files:
	dll.c dll.def dll.h exe.c exe.exp expexe.c expexe.def jamfile 
	loaddll.c loadexe.c readme.txt silly.cpp silly.def silly.exp 
	silly.h sillydll.cpp 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- dll.def DELETED ---

--- expexe.def DELETED ---

--- jamfile DELETED ---

--- exe.exp DELETED ---

--- exe.c DELETED ---

--- loaddll.c DELETED ---

--- dll.c DELETED ---

--- silly.exp DELETED ---

--- loadexe.c DELETED ---

--- sillydll.cpp DELETED ---

--- silly.h DELETED ---

--- expexe.c DELETED ---

--- silly.def DELETED ---

--- silly.cpp DELETED ---

--- readme.txt DELETED ---

--- dll.h DELETED ---

Update of /cvsroot/mingw/runtime/mingwex/stdio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/mingwex/stdio

Removed Files:
	fopen64.c fseeko64.c ftello64.c lseek64.c snprintf.c 
	snwprintf.c vfscanf.c vfwscanf.c vscanf.c vsnprintf.c 
	vsnwprintf.c vsscanf.c vswscanf.c vwscanf.c 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- fseeko64.c DELETED ---

--- snprintf.c DELETED ---

--- vsnprintf.c DELETED ---

--- ftello64.c DELETED ---

--- vsscanf.c DELETED ---

--- snwprintf.c DELETED ---

--- fopen64.c DELETED ---

--- vwscanf.c DELETED ---

--- vswscanf.c DELETED ---

--- vfscanf.c DELETED ---

--- vsnwprintf.c DELETED ---

--- vfwscanf.c DELETED ---

--- vscanf.c DELETED ---

--- lseek64.c DELETED ---

Update of /cvsroot/mingw/runtime/samples/print
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/samples/print

Removed Files:
	jamfile prntest.c 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- prntest.c DELETED ---

--- jamfile DELETED ---

Update of /cvsroot/mingw/runtime/samples/fmode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/samples/fmode

Removed Files:
	all.c jamfile readme.txt test.c test2.c 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- test2.c DELETED ---

--- all.c DELETED ---

--- test.c DELETED ---

--- jamfile DELETED ---

--- readme.txt DELETED ---

Update of /cvsroot/mingw/runtime/samples/dirent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1590/samples/dirent

Removed Files:
	jamfile test.c wtest.c 
Log Message:
See http://cygwin.com/cvs.html for w32api source

--- test.c DELETED ---

--- wtest.c DELETED ---

--- jamfile DELETED ---