Attachment 112801 Details for Bug 154282 – file.diff

[patch] file.diff

file.diff (text/plain), 9.73 KB, created by John Hein on 2011-01-25 06:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2011-01-25 06:20:09 UTC

Size: 9.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /base/FreeBSD-CVS/ports/finance/opentaxsolver/Makefile,v
>retrieving revision 1.19
>diff -u -p -r1.19 Makefile
>--- Makefile	9 Apr 2010 23:27:39 -0000	1.19
>+++ Makefile	24 Jan 2011 23:38:21 -0000
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	${UPPORTNAME:L}
>-PORTVERSION=	7.07
>+PORTVERSION=	8.01
> CATEGORIES=	finance
>-MASTER_SITES=	SF/${PORTNAME}/OTS_2009/v${PORTVERSION}
>-DISTNAME=	${UPPORTNAME}2009_${PORTVERSION}
>+MASTER_SITES=	SF/${PORTNAME}/OTS_2010/v${PORTVERSION}
>+DISTNAME=	${UPPORTNAME}2010_${PORTVERSION}
> EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	jhein@symmetricom.com
>Index: distinfo
>===================================================================
>RCS file: /base/FreeBSD-CVS/ports/finance/opentaxsolver/distinfo,v
>retrieving revision 1.14
>diff -u -p -r1.14 distinfo
>--- distinfo	9 Apr 2010 23:27:39 -0000	1.14
>+++ distinfo	24 Jan 2011 23:32:07 -0000
>@@ -1,3 +1,2 @@
>-MD5 (OpenTaxSolver2009_7.07.tgz) = 179e21c4264b59d230dc2fe9557c0d4b
>-SHA256 (OpenTaxSolver2009_7.07.tgz) = 40d9268d1e896f7cfaf04b05c96b5b64652abf7458be6f35c152953778e2e01f
>-SIZE (OpenTaxSolver2009_7.07.tgz) = 431773
>+SHA256 (OpenTaxSolver2010_8.01.tgz) = 1933f649cfcded1673d846b59067ff5e830e22f9d679ee2b3574bc2cfffa79c4
>+SIZE (OpenTaxSolver2010_8.01.tgz) = 417378
>Index: pkg-plist
>===================================================================
>RCS file: /base/FreeBSD-CVS/ports/finance/opentaxsolver/pkg-plist,v
>retrieving revision 1.11
>diff -u -p -r1.11 pkg-plist
>--- pkg-plist	18 Mar 2010 01:00:15 -0000	1.11
>+++ pkg-plist	24 Jan 2011 23:34:45 -0000
>@@ -1,46 +1,44 @@
> bin/ots_gui
>-bin/taxsolve_CA_540_2009
>-bin/taxsolve_MA_1_2009
>-bin/taxsolve_NC_D400_2009
>-bin/taxsolve_NJ_1040_2009
>-bin/taxsolve_NY_IT201_2009
>-bin/taxsolve_OH_IT1040_2009
>-bin/taxsolve_PA_40_2009
>-bin/taxsolve_US_1040_2009
>-bin/taxsolve_US_1040_Sched_C_2009
>-bin/taxsolve_VA_760_2009
>+bin/taxsolve_CA_540_2010
>+bin/taxsolve_NC_D400_2010
>+bin/taxsolve_NJ_1040_2010
>+bin/taxsolve_OH_IT1040_2010
>+bin/taxsolve_PA_40_2010
>+bin/taxsolve_US_1040_2010
>+bin/taxsolve_US_1040_Sched_C_2010
>+bin/taxsolve_VA_760_2010
> share/ots/otslogo.ppm
>-share/ots/examples_and_templates/CA_540/CA_540_2009_example.dat
>-share/ots/examples_and_templates/CA_540/CA_540_2009_template.dat
>+share/ots/examples_and_templates/CA_540/CA_540_2010_example.dat
>+share/ots/examples_and_templates/CA_540/CA_540_2010_template.dat
> share/ots/examples_and_templates/CA_540/README_CA_540.txt
> share/ots/examples_and_templates/MA_1/README_MA_1.txt
>-share/ots/examples_and_templates/MA_1/ma_1_2009_example.dat
>-share/ots/examples_and_templates/MA_1/ma_1_2009_template.dat
>-share/ots/examples_and_templates/NC_D400/NC_400_2009_example.dat
>-share/ots/examples_and_templates/NC_D400/NC_400_2009_template.dat
>+share/ots/examples_and_templates/MA_1/ma_1_2010_example.dat
>+share/ots/examples_and_templates/MA_1/ma_1_2010_template.dat
>+share/ots/examples_and_templates/NC_D400/NC_400_2010_example.dat
>+share/ots/examples_and_templates/NC_D400/NC_400_2010_template.dat
> share/ots/examples_and_templates/NC_D400/README_NC_400.txt
>-share/ots/examples_and_templates/NJ_1040/NJ_1040_2009_example.dat
>-share/ots/examples_and_templates/NJ_1040/NJ_1040_2009_template.dat
>+share/ots/examples_and_templates/NJ_1040/NJ_1040_2010_example.dat
>+share/ots/examples_and_templates/NJ_1040/NJ_1040_2010_template.dat
> share/ots/examples_and_templates/NJ_1040/README_NJ_1040.txt
>-share/ots/examples_and_templates/NY_IT201/NY_IT201_2009_example.dat
>-share/ots/examples_and_templates/NY_IT201/NY_IT201_2009_template.dat
>+share/ots/examples_and_templates/NY_IT201/NY_IT201_2010_example.dat
>+share/ots/examples_and_templates/NY_IT201/NY_IT201_2010_template.dat
> share/ots/examples_and_templates/NY_IT201/README_NY_IT201.txt
>-share/ots/examples_and_templates/OH_IT1040/OH_IT1040_2009_example.dat
>-share/ots/examples_and_templates/OH_IT1040/OH_IT1040_2009_template.dat
>+share/ots/examples_and_templates/OH_IT1040/OH_IT1040_2010_example.dat
>+share/ots/examples_and_templates/OH_IT1040/OH_IT1040_2010_template.dat
> share/ots/examples_and_templates/OH_IT1040/README_OH_IT1040.txt
>-share/ots/examples_and_templates/PA_40/PA_40_2009_example.dat
>-share/ots/examples_and_templates/PA_40/PA_40_2009_template.dat
>+share/ots/examples_and_templates/PA_40/PA_40_2010_example.dat
>+share/ots/examples_and_templates/PA_40/PA_40_2010_template.dat
> share/ots/examples_and_templates/PA_40/README_PA_40.txt
> share/ots/examples_and_templates/US_1040/README_US_1040.txt
> share/ots/examples_and_templates/US_1040/US_1040_example.dat
> share/ots/examples_and_templates/US_1040/US_1040_template.dat
> share/ots/examples_and_templates/US_1040_Sched_C/8829_template.dat
> share/ots/examples_and_templates/US_1040_Sched_C/README_US_1040_Sched_C.txt
>-share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2009_example.dat
>-share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2009_template.dat
>+share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2010_example.dat
>+share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2010_template.dat
> share/ots/examples_and_templates/VA_760/README_VA_760.txt
>-share/ots/examples_and_templates/VA_760/VA_760_2009_example.dat
>-share/ots/examples_and_templates/VA_760/VA_760_2009_template.dat
>+share/ots/examples_and_templates/VA_760/VA_760_2010_example.dat
>+share/ots/examples_and_templates/VA_760/VA_760_2010_template.dat
> @dirrm share/ots/examples_and_templates/VA_760
> @dirrm share/ots/examples_and_templates/US_1040_Sched_C
> @dirrm share/ots/examples_and_templates/US_1040
>Index: files/patch-src-GUI-ots_gui.c
>===================================================================
>RCS file: /base/FreeBSD-CVS/ports/finance/opentaxsolver/files/patch-src-GUI-ots_gui.c,v
>retrieving revision 1.3
>diff -u -p -r1.3 patch-src-GUI-ots_gui.c
>--- files/patch-src-GUI-ots_gui.c	18 Mar 2010 01:00:15 -0000	1.3
>+++ files/patch-src-GUI-ots_gui.c	24 Jan 2011 23:32:07 -0000
>@@ -1,15 +1,15 @@
>---- src/GUI/ots_gui.c.orig	2010-03-02 06:46:32.000000000 -0700
>-+++ src/GUI/ots_gui.c	2010-03-08 17:55:11.000000000 -0700
>-@@ -638,7 +638,7 @@
>-  /* Now create enough tabbed-panels to hold all the lines. */
>+--- src/GUI/ots_gui.c.orig	2011-01-16 10:31:20.000000000 -0700
>++++ src/GUI/ots_gui.c	2011-01-24 14:49:02.000000000 -0700
>+@@ -664,7 +664,7 @@
>    npanels = nlines / lines_per_page + 1;
>+   if (npanels < 2) npanels = 2;
>    panelnames = (char **)malloc( (npanels+1) * sizeof(char *));
> -  for (j=0; j<npanels; j++) {panelnames[j] = (char *)malloc(30); sprintf( panelnames[j], "Page %d ", j+1); }
> +  for (j=0; j<npanels; j++) {panelnames[j] = (char *)malloc(30); snprintf(panelnames[j], sizeof(panelnames[j]), "Page %d ", j+1); }
>    Panels = Otk_Tabbed_Panel_New( main_panel, npanels, panelnames, Otk_LightGray, 1, 1, 98, 98, 5 );
>    TabbedPanel = Panels;
>  
>-@@ -698,7 +698,7 @@
>+@@ -724,7 +724,7 @@
>       switch (entry->kind)
>        {
>         case VKIND_FLOAT:  // printf("Formbox: '%s'\n", messg);
>@@ -18,7 +18,7 @@
>  		pos_x = leftmargin;
>  		leftmargin = leftmargin + box_width + 1.5;
>  		pos_y = (float)linenum * 9.0 + 6.5;
>-@@ -986,9 +986,9 @@
>+@@ -1048,9 +1048,9 @@
>     return;   
>    }
>   if (PLATFORM_KIND==Posix_Platform)
>@@ -30,7 +30,7 @@
>  
>   printf("Invoking '%s'\n", cmd );
>   system(cmd);	/* Invoke the TaxSolver. */
>-@@ -1022,7 +1022,7 @@
>+@@ -1086,7 +1086,7 @@
>  
>  void togprntcmd_in(void *x)
>  { 
>@@ -39,7 +39,7 @@
>   Otk_Modify_Text( printerformbox, printer_command );
>  }
>  
>-@@ -1030,7 +1030,7 @@
>+@@ -1094,7 +1094,7 @@
>  { char tmpstr[MaxFname];
>    int k;
>   predict_output_filename(wrkingfname,tmpstr);
>@@ -48,7 +48,7 @@
>   Otk_Modify_Text( printerformbox, printer_command );
>  }
>  
>-@@ -1058,7 +1058,7 @@
>+@@ -1122,7 +1122,7 @@
>   Otk_Add_BoundingBox( printpopup, Otk_Blue, 1.0, 18.0, 16.0, 63.0, 47.0 );
>  
>   if (working_file==0) strcpy(wrkingfname,filename_dat); else strcpy(wrkingfname,working_file);
>@@ -57,7 +57,7 @@
>  
>   OtkMakeTextLabel( printpopup, "Print Command:", Otk_Black, /*scale=*/ 1.5, /*weight=*/ 1, /*x=*/ 4, /*y=*/ 57 );
>   printerformbox = OtkMakeTextFormBox( printpopup, printer_command, 60,  28.5, 55, 68, 18, acceptprinter_command2, 0 );
>-@@ -1117,15 +1117,15 @@
>+@@ -1181,15 +1181,15 @@
>     if (k>0) k--;
>     while ((k>0) && (tmpstr[k]!=slashchr)) k--;
>     if (tmpstr[k]==slashchr)  tmpstr[k+1] = '\0';
>@@ -65,7 +65,7 @@
> -   sprintf(directory_dat,"%sexamples_and_templates%c", tmpstr, slashchr);
> +   else  {snprintf(tmpstr, sizeof(tmpstr), ".%c", slashchr);}
> +   snprintf(directory_dat, sizeof(directory_dat), "%sexamples_and_templates%c", tmpstr, slashchr);
>-    Otk_Browse_Files( "Select TaxSolver:", MaxFname, directory_dat, wildcards_dat, taxsolvestrng, open_taxfile );
>+    Otk_Browse_Files( "Select TaxForm:", MaxFname, directory_dat, wildcards_dat, taxsolvestrng, open_taxfile );
>     return;
>    }
>   else
>@@ -76,7 +76,7 @@
>     printf("Setting Tax Program to be: '%s'\n", tmpstr);
>     taxsolvecmd = strdup(tmpstr);
>     strcpy(taxsolvestrng,tmpstr);
>-@@ -1136,8 +1136,8 @@
>+@@ -1200,8 +1200,8 @@
>     if (k>0) k--;
>     while ((k>0) && (tmpstr[k]!=slashchr)) k--;
>     if (tmpstr[k]==slashchr)  tmpstr[k+1] = '\0';
>@@ -85,9 +85,9 @@
> +   else  {snprintf(tmpstr, sizeof(tmpstr), ".%c", slashchr);}
> +   snprintf(directory_dat, sizeof(directory_dat), "%sexamples_and_templates%c", tmpstr, slashchr);
>  
>-    sel = strstr( strg, "_2009" );
>+    sel = strstr( strg, "_2010" );
>     sel[0] = '\0';
>-@@ -1208,7 +1208,7 @@
>+@@ -1272,7 +1272,7 @@
>     {printf("Unknown command-line parameter '%s'\n", argv[argn]); /* exit(1); */ }
>    argn = argn + 1;
>   }
>@@ -96,7 +96,7 @@
>   invocation_path = strdup(argv[0]);
>   k = strlen(invocation_path)-1;
>   while ((k>0) && (invocation_path[k]!=slashchr)) k--;
>-@@ -1234,7 +1234,7 @@
>+@@ -1298,7 +1298,7 @@
>   main_panel = 
>   OtkMakePanel( bckgrnd, Otk_Raised, Otk_LightGray, 1, 7.5, 98, 87 );	/* Main Panel. */
>   Otk_SetBorderThickness( main_panel, 0.25 );

Actions: View | Diff

Attachments on bug 154282: 112801