[pkgsrc/trunk]: pkgsrc/graphics/ploticus apply 4 bugfixes from the distributi...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e0f2b51d7c0
branches:  trunk
changeset: 493302:0e0f2b51d7c0
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon May 02 17:58:00 2005 +0000

description:
apply 4 bugfixes from the distribution site (there is no new release yet)

diffstat:

 graphics/ploticus/Makefile         |   4 +-
 graphics/ploticus/distinfo         |   6 ++++-
 graphics/ploticus/patches/patch-ba |  12 +++++++++
 graphics/ploticus/patches/patch-bb |  16 ++++++++++++
 graphics/ploticus/patches/patch-bc |  47 ++++++++++++++++++++++++++++++++++++++
 graphics/ploticus/patches/patch-bd |  21 ++++++++++++++++
 6 files changed, 103 insertions(+), 3 deletions(-)

diffs (140 lines):

diff -r 108611fc6c7e -r 0e0f2b51d7c0 graphics/ploticus/Makefile
--- a/graphics/ploticus/Makefile        Mon May 02 17:42:06 2005 +0000
+++ b/graphics/ploticus/Makefile        Mon May 02 17:58:00 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:08 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/02 17:58:00 drochner Exp $
 
 DISTNAME=      pl231src
-PKGNAME=       ploticus-2.31
+PKGNAME=       ploticus-2.31pl4
 CATEGORIES=    graphics
 MASTER_SITES=  http://ploticus.sourceforge.net/download/
 
diff -r 108611fc6c7e -r 0e0f2b51d7c0 graphics/ploticus/distinfo
--- a/graphics/ploticus/distinfo        Mon May 02 17:42:06 2005 +0000
+++ b/graphics/ploticus/distinfo        Mon May 02 17:58:00 2005 +0000
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 08:45:11 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/05/02 17:58:00 drochner Exp $
 
 SHA1 (pl231src.tar.gz) = 9b7219acb31231efcf1200ad586e526814ae8283
 RMD160 (pl231src.tar.gz) = 379e6c3d2d6482cda2a76726c439b4e6f5395b1f
 Size (pl231src.tar.gz) = 443596 bytes
 SHA1 (patch-aa) = 322dc993492291f74b19f865cf149c8b50c5b9e5
+SHA1 (patch-ba) = 69043093a1a77e14b776e3166eb874a508ae11d7
+SHA1 (patch-bb) = cd27de0c5c9d20d7909e0e3b7c0d8d0c662b232f
+SHA1 (patch-bc) = eafd9ec5a0c7856a208df17a0a45e547239b66ac
+SHA1 (patch-bd) = 7f269658b3eefdc26b36b395f657168dac8c25f4
diff -r 108611fc6c7e -r 0e0f2b51d7c0 graphics/ploticus/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ploticus/patches/patch-ba        Mon May 02 17:58:00 2005 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ba,v 1.1 2005/05/02 17:58:00 drochner Exp $
+
+--- ../prefabs/processdata.pl.orig     2005-04-20 21:12:35.000000000 +0200
++++ ../prefabs/processdata.pl
+@@ -1,6 +1,7 @@
+ #musthave action 
+ 
+ #setifnotgiven data = "-"
++#setifnotgiven inlinedata = ""
+ 
+ #include $chunk_read
+ 
diff -r 108611fc6c7e -r 0e0f2b51d7c0 graphics/ploticus/patches/patch-bb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ploticus/patches/patch-bb        Mon May 02 17:58:00 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-bb,v 1.1 2005/05/02 17:58:00 drochner Exp $
+
+--- proc_processdata.c.orig    2005-04-20 21:12:59.000000000 +0200
++++ proc_processdata.c
+@@ -602,9 +602,9 @@ else if( strcmp( action, "stats" )==0 ) 
+               if( n > 1 ) setfloatvar( "SD", sqrt( ( accum[1] - (accum[0]*accum[0]/(double)n )) / ((double)n-1.0) ) );
+               else setcharvar( "SD", "n/a" ); 
+               setfloatvar( "MAX", max );
+-              if( nfld > 1 ) setcharvar( "MAX_ID", breakbuf[0] );
++              if( tagfld >= 0 ) setcharvar( "MAX_ID", breakbuf[0] );
+               setfloatvar( "MIN", min );
+-              if( nfld > 1 ) setcharvar( "MIN_ID", breakbuf[1] );
++              if( tagfld >= 0 ) setcharvar( "MIN_ID", breakbuf[1] );
+               }
+       return( 0 );
+       }
diff -r 108611fc6c7e -r 0e0f2b51d7c0 graphics/ploticus/patches/patch-bc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ploticus/patches/patch-bc        Mon May 02 17:58:00 2005 +0000
@@ -0,0 +1,47 @@
+$NetBSD: patch-bc,v 1.1 2005/05/02 17:58:00 drochner Exp $
+
+--- autorange.c.orig   2005-04-20 21:13:19.000000000 +0200
++++ autorange.c
+@@ -45,10 +45,9 @@ int mininit, maxinit;
+ 
+ /* see what scaletype is being used.. */
+ Egetunits( axis, unittyp );
+-/* for linear, default to automatic determination of reasonable endpoints.. */
+ if( strcmp( unittyp, "linear" )==0 ) strcpy( nearest, "auto" );
+-/* for date, time, and other types, default to exact endpoints.. */
+-else strcpy( nearest, "exact" );
++else if ( GL_smemberi( unittyp, "date time datetime" )) strcpy( nearest, "datematic" );
++else strcpy( nearest, "exact" ); /* categories? */
+ 
+ margin = 0.0;
+ strcpy( dfield, "" );
+@@ -110,7 +109,7 @@ if( ndf == 0 ) return( Eerr( 7194, "auto
+ /* ----------------- */
+ 
+ /* override.. */
+-if( stricmp( nearest, "day" )==0 && stricmp( unittyp, "date" )==0 ) strcpy( nearest, "exact" );
++/* if( stricmp( nearest, "day" )==0 && stricmp( unittyp, "date" )==0 ) strcpy( nearest, "exact" ); */ /* removed scg 4/19/05 */
+ 
+ /* find data min and max.. */
+ 
+@@ -190,8 +189,8 @@ max += margin;
+ 
+ /* degenerate case.. all data the same (bad if it happens to lie on inc boundary, eg: 0) - added scg 9/21/01 */
+ if( min == max ) {
+-      min = min - 1.0;
+-      max = max + 1.0;
++      /* min = min - 1.0; max = max + 1.0; */
++      min -= (min*0.2); max += (max*0.2);  /* changed to work better w/ small magnitude values - scg 3/3/05 */
+       }
+ 
+ 
+@@ -208,7 +207,8 @@ else       {
+ 
+ /******* handle nearest=  ***********/
+ 
+-if( GL_slmember( nearest, "dat*matic" ) || ( stricmp( nearest, "exact" )==0 && GL_smember( unittyp, "datetime time" )) ) {
++if( GL_slmember( nearest, "dat*matic" ) ) {
++      /* || ( stricmp( nearest, "exact" )==0 && GL_smember( unittyp, "datetime time" )) ) { */ /* removed scg 4/19/05 */
+       char foo1[40], foo2[40], foo3[40], foo4[40], foo5[40], foo6[40];
+       double dfoo1, dfoo2;
+       /* get an automatic reasonable "nearest" value.. */
diff -r 108611fc6c7e -r 0e0f2b51d7c0 graphics/ploticus/patches/patch-bd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/ploticus/patches/patch-bd        Mon May 02 17:58:00 2005 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-bd,v 1.1 2005/05/02 17:58:00 drochner Exp $
+
+--- proc_pie.c.orig    2005-05-02 21:46:37.000000000 +0200
++++ proc_pie.c
+@@ -225,7 +225,7 @@ for( j = 0; j < 2; j++ ) { /* first time
+                       
+               first = 1;
+               stheta = theta;
+-              if( j == 1 && strnicmp( outlinedetails, "no", 2 )==0 ) break; /* goto DOLAB; */
++              if( j == 1 && strnicmp( outlinedetails, "no", 2 )==0 ) /* break; */ goto DOLAB;  /* changed again, scg 4/29/05 */
+               for( ; theta > stop; theta -= 0.03 ) {
+                       if( theta - stop < 0.03 ) theta = stop;
+                       x = cx + (radius * cos( theta ));
+@@ -273,6 +273,7 @@ for( j = 0; j < 2; j++ ) { /* first time
+ 
+               /* labeling */  /* if doing legend, handle this during j == 0 because color is available;
+                                  otherwise do labeling during j == 1 to avoid color fill obliterating labels.. */
++              DOLAB:
+               if( ( j == 0 && ilabmode == LEGEND ) || ( j == 1 && ilabmode != 0 ) ) {
+                       strcpy( label, "" );
+