gcc3 fixes

2 files changed, 329 insertions, 1 deletions

diff --git a/cad/xchiplogo/distinfo b/cad/xchiplogo/distinfo
index 1a465b64e70..17db78bef5b 100644
--- a/cad/xchiplogo/distinfo
+++ b/cad/xchiplogo/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/04/17 04:45:08 fredb Exp $
+$NetBSD: distinfo,v 1.4 2004/03/21 23:40:56 dmcmahill Exp $
 
 SHA1 (xchiplogo.tar.gz) = 2884f2375a389aa5427efecef7d8cf3e74974d98
 Size (xchiplogo.tar.gz) = 46652 bytes
 SHA1 (patch-aa) = 1235622f36c63bdeb5e453ac4fa1bce9bb6ec9c1
+SHA1 (patch-ab) = 30da129fae39be3a772a2d1c7eb58067c0f21c18
diff --git a/cad/xchiplogo/patches/patch-ab b/cad/xchiplogo/patches/patch-ab
new file mode 100644
index 00000000000..c76effd0097
--- /dev/null
+++ b/cad/xchiplogo/patches/patch-ab
@@ -0,0 +1,327 @@
+$NetBSD: patch-ab,v 1.1 2004/03/21 23:40:56 dmcmahill Exp $
+
+--- main.c.orig	Sun Feb 23 02:34:32 1997
++++ main.c
+@@ -203,164 +203,164 @@ void help_text(void)
+  fl_set_browser_fontsize(fdui_help->help_browse,FL_MEDIUM_SIZE);
+  fl_set_browser_fontstyle(fdui_help->help_browse,4);
+  fl_addto_browser(fdui_help->help_browse,
+-"    
+-XCHIPLOGO 
+-
+-     Xchiplogo is an X interface for chiplogo. 
+-
+-FOR THOSE WHO DO NOT WANT TO WAIT ANY MORE
+-
+-     1- open the input file (which should be in the PBM    ascii, 
+-     B&W format).   You can  use the input file browser.  If  you
+-     do not have any input file you can 'Launch XV' to grab some-
+-     thing from the screen and then save it into a file. Remember
+-     that after you generate the input file using XV, you  should
+-     load it in.
+-     
+-     2- Press the 'Generate Output'. If you do not have any spec-
+-     ific name for the outpu file in mind,     xchiplogo will use 
+-     'logo.mag' or 'logo.cif' instead.
+-     
+-     3- Your file is ready. You can have a look at it using  your
+-     favorite layout editor.
+-     
+-     4- If you want to partially correct some of the design  rule
+-     errors, use the options in the 'Partial Error Correction' to
+-     reduce the number of  errors.  Note that every time that you 
+-     change   the parameters,   the 'Generate Output'  should  be 
+-     pressed to generate the  new layout.
+-
+-AND THE REST OF THE STORY
+-
+-     Xchiplogo reads an ascii bitmap file, and converts it into a  
+-     magic  or cif file. It is a handy program for creating logos 
+-     of text or graphics for  putting  on  VLSI  chips.   At  the
+-     moment  it  accepts  the  B&W dithered format of XV as the 
+-     input. It has got quite a few options for resizing and  get-
+-     ting rid of many design rule errors that can be found in the
+-     bitmap file. It has  a smoothing, before and after an  error
+-     correction  step. The error correction step is pretty simple
+-     ,don't expect miracles, but it works quite  fine  and  spe- 
+-     cially for text gives a reasonable output.  
+-
+-     I wrote this program when I saw my friends sitting for hours
+-     to  write  their name;  in a font that we call mikhi in per-
+-     sian 'nail-font'.  I have also seen  many  comercial  layout
+-     editors  which  have  tried  to implement a simple text-logo
+-     generation, which all  are very limited and inflexible. So I
+-     started  Xchiplogo. The input to chiplogo is ascii bitmap.It
+-     really doesn't matter what program has generated the bitmap,
+-     as  long as there are two digits at the begining of the file
+-     which tell the size of the bitmap in pixels,  and  then  the
+-     sequence of the ones and zeros.
+- 
+-     Although the output files may seem a bit  big,  if  you  use
+-     magic after generating the file, magic reduces the size by a
+-     factor of more than 10!!!.   It is simply because each black
+-     pixel  in  the  input file becomes a box in the output magic
+-     file. Magic merges the boxes  so that they  conform  to  its
+-     corner   stitch   style.  I  have found magic to be the best
+-     package for editing the design rule errors of the  generated
+-     layouts.   With other layout editors you may lose your pati-
+-     ence.
+- 
+-OPTIONS, KEYS, and PARAMETERS
+-
+-      CIF layer name
+-        The cif layer that is  to  be  used  for  the  logo.  The
+-        default is CPG (poly).
+-
+-      Micron/Lambda
+-	This parameter tells the scaling factor for a CIF format.
+-	For a 2 micron technology it is 50 (the default). For a 
+-	0.8 micron it should be set to 20, and so on.
+- 
+-      Magic layer name
+-        The magic layer name that is to be used for the logo. The
+-        default is poly.
+- 
+-      Technology name
+-        This option is used with magic option and is  to  specify
+-        the technology.
+- 
+-      Minimum width
+-        The minimum width of the layer. This value is used in all
+-        the  error  correction  and  smoothing  operations.   The
+-        default is 2.
+- 
+-      Minimum spacing
+-        The minimum space of the layer. This value is used in all
+-        the  error  correction  and  smoothing  operations.   The
+-        default is 2.
+- 
+-      Partial error correction
+-        This switch toggles the error  detection  and  correction
+-        stage.  The default is off. When it is turned on the rel-
+- 	evant parameters will be shown in the window.
+- 
+-      Scale factor
+-        The scaling factor, scales the layout by the this factor.
+- 
+-      Threshold before
+-        This option turns on the smoothing operation before error
+-        correction  stage.  The  threshold_before  is used as the
+-        threshold value used  after  the  smoothing.  It  can  be
+-        between  0 to 16. The smoothing function at the moment is
+-        a simple triangular function, and acts over a  neighbour-
+-        hood of minimum_width.
+- 
+-      Threshold after
+-        This option turns on the smoothing operation  before  the
+-        error  correction  stage.  The threshold_after is used as
+-        the threshold value used after the smoothing. It  can  be
+-        between  0 to 16. The smoothing function at the moment is
+-        a simple triangular function, and acts over a  neighbour-
+-        hood of minimum_width
+-
+-      Launch XV (Shortkey CTRL-V)
+-	This  button  launches the XV  for grabbing  a  piece  of 
+-	graphics.
+-
+-      Help  (Shortkey CTRL-H)
+-	To   bring up this  window.  In this window if  you press 
+-	the botton on the bottok saying 'OK, Get rid of this window' 
+-	the window will disappear.
+- 
+-     Generate output (CTRL-G)
+- 	After you have loaded an input file, press this button to 
+-	generate the layout. If no input file is given, or if the
+-	specified input does not  exist it will  warn you of this
+-	problem. But if the output file does not exist, depending
+-	on the output format selected (magic or cif) it will save
+-	the layout in a default file 'logo.mag' or 'logo.cif'.
+-     
+-     Input File (CTRL-I)
+-	You   should  specify  the  input file name. You can also 
+-	browse by  pressing the  browse button next to this input 
+-	field.
+- 
+-     Output File (CTRL-O)
+-	You should  specify the  output file  name.  You can also 
+-	browse	by pressing the browse button next to this  input 
+-	field.
+-
+-     Quite (CTRL-Q)
+-        You guess what this one does!!
+-
+-     About (CTRL-A)
+-        Just the author info.
+- 
+-NOTE
+-     	The format of the input file  SHOULD be  'PBM (ascii)-B&W 
+-	Dithered'. With other formats xchiplogo will hang.
+-
+-AUTHOR
+-     Alireza Moini, 
+-     Department of Electrical and Electronics Engineering,
+-     The University of Adelaide
+-
+-     moini@eleceng.adelaide.edu.au
+-     April 1996
++"    \n\
++XCHIPLOGO \n\
++\n\
++     Xchiplogo is an X interface for chiplogo. \n\
++\n\
++FOR THOSE WHO DO NOT WANT TO WAIT ANY MORE\n\
++\n\
++     1- open the input file (which should be in the PBM    ascii, \n\
++     B&W format).   You can  use the input file browser.  If  you\n\
++     do not have any input file you can 'Launch XV' to grab some-\n\
++     thing from the screen and then save it into a file. Remember\n\
++     that after you generate the input file using XV, you  should\n\
++     load it in.\n\
++     \n\
++     2- Press the 'Generate Output'. If you do not have any spec-\n\
++     ific name for the outpu file in mind,     xchiplogo will use \n\
++     'logo.mag' or 'logo.cif' instead.\n\
++     \n\
++     3- Your file is ready. You can have a look at it using  your\n\
++     favorite layout editor.\n\
++     \n\
++     4- If you want to partially correct some of the design  rule\n\
++     errors, use the options in the 'Partial Error Correction' to\n\
++     reduce the number of  errors.  Note that every time that you \n\
++     change   the parameters,   the 'Generate Output'  should  be \n\
++     pressed to generate the  new layout.\n\
++\n\
++AND THE REST OF THE STORY\n\
++\n\
++     Xchiplogo reads an ascii bitmap file, and converts it into a  \n\
++     magic  or cif file. It is a handy program for creating logos \n\
++     of text or graphics for  putting  on  VLSI  chips.   At  the\n\
++     moment  it  accepts  the  B&W dithered format of XV as the \n\
++     input. It has got quite a few options for resizing and  get-\n\
++     ting rid of many design rule errors that can be found in the\n\
++     bitmap file. It has  a smoothing, before and after an  error\n\
++     correction  step. The error correction step is pretty simple\n\
++     ,don't expect miracles, but it works quite  fine  and  spe- \n\
++     cially for text gives a reasonable output.  \n\
++\n\
++     I wrote this program when I saw my friends sitting for hours\n\
++     to  write  their name;  in a font that we call mikhi in per-\n\
++     sian 'nail-font'.  I have also seen  many  comercial  layout\n\
++     editors  which  have  tried  to implement a simple text-logo\n\
++     generation, which all  are very limited and inflexible. So I\n\
++     started  Xchiplogo. The input to chiplogo is ascii bitmap.It\n\
++     really doesn't matter what program has generated the bitmap,\n\
++     as  long as there are two digits at the begining of the file\n\
++     which tell the size of the bitmap in pixels,  and  then  the\n\
++     sequence of the ones and zeros.\n\
++ \n\
++     Although the output files may seem a bit  big,  if  you  use\n\
++     magic after generating the file, magic reduces the size by a\n\
++     factor of more than 10!!!.   It is simply because each black\n\
++     pixel  in  the  input file becomes a box in the output magic\n\
++     file. Magic merges the boxes  so that they  conform  to  its\n\
++     corner   stitch   style.  I  have found magic to be the best\n\
++     package for editing the design rule errors of the  generated\n\
++     layouts.   With other layout editors you may lose your pati-\n\
++     ence.\n\
++ \n\
++OPTIONS, KEYS, and PARAMETERS\n\
++\n\
++      CIF layer name\n\
++        The cif layer that is  to  be  used  for  the  logo.  The\n\
++        default is CPG (poly).\n\
++\n\
++      Micron/Lambda\n\
++	This parameter tells the scaling factor for a CIF format.\n\
++	For a 2 micron technology it is 50 (the default). For a \n\
++	0.8 micron it should be set to 20, and so on.\n\
++ \n\
++      Magic layer name\n\
++        The magic layer name that is to be used for the logo. The\n\
++        default is poly.\n\
++ \n\
++      Technology name\n\
++        This option is used with magic option and is  to  specify\n\
++        the technology.\n\
++ \n\
++      Minimum width\n\
++        The minimum width of the layer. This value is used in all\n\
++        the  error  correction  and  smoothing  operations.   The\n\
++        default is 2.\n\
++ \n\
++      Minimum spacing\n\
++        The minimum space of the layer. This value is used in all\n\
++        the  error  correction  and  smoothing  operations.   The\n\
++        default is 2.\n\
++ \n\
++      Partial error correction\n\
++        This switch toggles the error  detection  and  correction\n\
++        stage.  The default is off. When it is turned on the rel-\n\
++ 	evant parameters will be shown in the window.\n\
++ \n\
++      Scale factor\n\
++        The scaling factor, scales the layout by the this factor.\n\
++ \n\
++      Threshold before\n\
++        This option turns on the smoothing operation before error\n\
++        correction  stage.  The  threshold_before  is used as the\n\
++        threshold value used  after  the  smoothing.  It  can  be\n\
++        between  0 to 16. The smoothing function at the moment is\n\
++        a simple triangular function, and acts over a  neighbour-\n\
++        hood of minimum_width.\n\
++ \n\
++      Threshold after\n\
++        This option turns on the smoothing operation  before  the\n\
++        error  correction  stage.  The threshold_after is used as\n\
++        the threshold value used after the smoothing. It  can  be\n\
++        between  0 to 16. The smoothing function at the moment is\n\
++        a simple triangular function, and acts over a  neighbour-\n\
++        hood of minimum_width\n\
++\n\
++      Launch XV (Shortkey CTRL-V)\n\
++	This  button  launches the XV  for grabbing  a  piece  of \n\
++	graphics.\n\
++\n\
++      Help  (Shortkey CTRL-H)\n\
++	To   bring up this  window.  In this window if  you press \n\
++	the botton on the bottok saying 'OK, Get rid of this window' \n\
++	the window will disappear.\n\
++ \n\
++     Generate output (CTRL-G)\n\
++ 	After you have loaded an input file, press this button to \n\
++	generate the layout. If no input file is given, or if the\n\
++	specified input does not  exist it will  warn you of this\n\
++	problem. But if the output file does not exist, depending\n\
++	on the output format selected (magic or cif) it will save\n\
++	the layout in a default file 'logo.mag' or 'logo.cif'.\n\
++     \n\
++     Input File (CTRL-I)\n\
++	You   should  specify  the  input file name. You can also \n\
++	browse by  pressing the  browse button next to this input \n\
++	field.\n\
++ \n\
++     Output File (CTRL-O)\n\
++	You should  specify the  output file  name.  You can also \n\
++	browse	by pressing the browse button next to this  input \n\
++	field.\n\
++\n\
++     Quite (CTRL-Q)\n\
++        You guess what this one does!!\n\
++\n\
++     About (CTRL-A)\n\
++        Just the author info.\n\
++ \n\
++NOTE\n\
++     	The format of the input file  SHOULD be  'PBM (ascii)-B&W \n\
++	Dithered'. With other formats xchiplogo will hang.\n\
++\n\
++AUTHOR\n\
++     Alireza Moini, \n\
++     Department of Electrical and Electronics Engineering,\n\
++     The University of Adelaide\n\
++\n\
++     moini@eleceng.adelaide.edu.au\n\
++     April 1996\n\
+ ");
+   
+   fl_set_browser_topline(fdui_help->help_browse,1);